add:省厅应用域常口库

src/main/java/com/rshy/project/hy/manager/impl/RshyJkManagerImpl.java

@@ -15,6 +15,7 @@ import com.rshy.project.hy.model.dto.NucleicAcidDTO;
 import com.rshy.project.hy.model.enums.*;
 import com.rshy.project.hy.server.FaceRetrievaServer;
 import com.rshy.project.hy.server.ItfwServer;
+import com.rshy.project.hy.server.VIIDServer;
 import com.rshy.project.hy.server.dto.*;
 import com.rshy.project.hy.server.param.RshyParam;
 import com.rshy.project.hy.server.param.RshyQuickParam;
@@ -48,6 +49,8 @@ public class RshyJkManagerImpl implements RshyJkManager {
     @Autowired
     private ItfwServer itfwServer;
     @Autowired
+    private VIIDServer viidServer;
+    @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
     @Override
@@ -81,7 +84,6 @@ public class RshyJkManagerImpl implements RshyJkManager {
         }
 
         rshyParam.setTimeout((int) (rshyParam.getTimeout() - DateUtil.between(beginDate, DateTime.now(), DateUnit.MS)));
-
         List<Runnable> taskList = null;
         if(barCodes == null || PassStatusEnum.GREEN_CODE.getDesc().equals(barCodes.getCOLOR_CODE_LABEL())) {
             taskList = new ArrayList<Runnable>() {
@@ -96,7 +98,7 @@ public class RshyJkManagerImpl implements RshyJkManager {
                     add(() -> resultDTO.setPctrchlDTO(itfwServer.getPctrchl(rshyParam.getSfzh(), rshyParam.getTimeout())));
                     add(() -> resultDTO.setPctymDataDTOS(itfwServer.getPctym(rshyParam.getSfzh(), rshyParam.getTimeout())));
                     add(() -> resultDTO.setPcthsResultDTO(itfwServer.getPcths(rshyParam.getSfzh(), rshyParam.getTimeout())));
-
+                    add(() -> resultDTO.setPersonIdentifyDTO(viidServer.personIdentify(rshyParam.getPhoto(), rshyParam.getTimeout())));
                 }
             };
         }else{
@@ -104,6 +106,7 @@ public class RshyJkManagerImpl implements RshyJkManager {
                 {
                     add(() -> resultDTO.setPctymDataDTOS(itfwServer.getPctym(rshyParam.getSfzh(), rshyParam.getTimeout())));
                     add(() -> resultDTO.setPcthsResultDTO(itfwServer.getPcths(rshyParam.getSfzh(), rshyParam.getTimeout())));
+                    add(() -> resultDTO.setPersonIdentifyDTO(viidServer.personIdentify(rshyParam.getPhoto(), rshyParam.getTimeout())));
                 }
             };
         }
@@ -125,7 +128,6 @@ public class RshyJkManagerImpl implements RshyJkManager {
         rshyVo.setXb(SexEnum.codeOf(IdcardUtil.getGenderByIdCard(rshyParam.getSfzh())).getDesc());
         Date date = DateUtil.parse(IdcardUtil.getBirthByIdCard(rshyParam.getSfzh()));
         rshyVo.setBirthday(DateUtil.format(date, "yyyy-M-d"));
-        rshyVo.setTts(barCodes != null ? barCodes.getCOLOR_CODE_LABEL() : null);
         PctrchlDTO pctrchlDTO = resultDTO.getPctrchlDTO();
         resultDTO.setPctrchlDTO(null);
         String hcjg = "";
@@ -133,16 +135,18 @@ public class RshyJkManagerImpl implements RshyJkManager {
             hcjg = pctrchlDTO.getHcjg();
         }
 
-        if (barCodes != null && PassStatusEnum.RED_CODE.getDesc().equalsIgnoreCase(barCodes.getCOLOR_CODE_LABEL())) {
-            rshyVo.setPass(PassStatusEnum.RED_CODE.getCode()).setTimes(times(rshyParam.getSfzh())).setTts(PassStatusEnum.RED_CODE.getDesc()).setDisplayMsg(PassStatusEnum.RED_CODE.getDesc()).setWarning(PassStatusEnum.RED_CODE.getDesc()).setKind("健康码" + PassStatusEnum.RED_CODE.getDesc());
+        if(resultDTO.getPersonIdentifyDTO() != null && !rshyParam.getSfzh().equals(resultDTO.getPersonIdentifyDTO().getIdNumber())){
+            rshyVo.setPass(PassStatusEnum.NO_PASSING.getCode()).setTimes(times(rshyParam.getSfzh())).setTts(PassStatusEnum.NO_PASSING.getTts()).setDisplayMsg(PassStatusEnum.NO_PASSING.getDesc()).setWarning(PassStatusEnum.NO_PASSING.getDesc()).setKind("人证不一致");
+        } else if (barCodes != null && PassStatusEnum.RED_CODE.getDesc().equalsIgnoreCase(barCodes.getCOLOR_CODE_LABEL())) {
+            rshyVo.setPass(PassStatusEnum.RED_CODE.getCode()).setTimes(times(rshyParam.getSfzh())).setTts(PassStatusEnum.RED_CODE.getTts()).setDisplayMsg(PassStatusEnum.RED_CODE.getDesc()).setWarning(PassStatusEnum.RED_CODE.getDesc()).setKind("健康码" + PassStatusEnum.RED_CODE.getDesc());
         } else if (barCodes != null && PassStatusEnum.YELLOW_CODE.getDesc().equalsIgnoreCase(barCodes.getCOLOR_CODE_LABEL())) {
-            rshyVo.setPass(PassStatusEnum.YELLOW_CODE.getCode()).setTimes(times(rshyParam.getSfzh())).setTts(PassStatusEnum.YELLOW_CODE.getDesc()).setDisplayMsg(PassStatusEnum.YELLOW_CODE.getDesc()).setWarning(PassStatusEnum.YELLOW_CODE.getDesc()).setKind("健康码" + PassStatusEnum.YELLOW_CODE.getDesc());
+            rshyVo.setPass(PassStatusEnum.YELLOW_CODE.getCode()).setTimes(times(rshyParam.getSfzh())).setTts(PassStatusEnum.YELLOW_CODE.getTts()).setDisplayMsg(PassStatusEnum.YELLOW_CODE.getDesc()).setWarning(PassStatusEnum.YELLOW_CODE.getDesc()).setKind("健康码" + PassStatusEnum.YELLOW_CODE.getDesc());
         } else if (resultDTO.getPctztDTO() != null || StrUtil.containsAnyIgnoreCase(hcjg, "抓捕")) {
-            rshyVo.setPass(PassStatusEnum.NO_PASSING.getCode()).setTts(PassStatusEnum.NO_PASSING.getDesc()).setDisplayMsg(PassStatusEnum.NO_PASSING.getDesc()).setWarning(new StringBuilder().append("在逃人员:").append(resultDTO.getPctztDTO().getJyaq()).toString()).setKind(resultDTO.getPctztDTO().getZtrylxmc());
+            rshyVo.setPass(PassStatusEnum.NO_PASSING.getCode()).setTts(PassStatusEnum.NO_PASSING.getTts()).setDisplayMsg(PassStatusEnum.NO_PASSING.getDesc()).setWarning(new StringBuilder().append("在逃人员:").append(resultDTO.getPctztDTO().getJyaq()).toString()).setKind(resultDTO.getPctztDTO().getZtrylxmc());
         } else if (ObjectUtils.allFieldIsNULL(resultDTO) || StrUtil.containsAnyIgnoreCase(hcjg, "通过")) {
-            rshyVo.setPass(PassStatusEnum.NORMAL_TRAFFIC.getCode()).setDisplayMsg(PassStatusEnum.NORMAL_TRAFFIC.getDesc()).setTts(PassStatusEnum.NORMAL_TRAFFIC.getDesc());
+            rshyVo.setPass(PassStatusEnum.NORMAL_TRAFFIC.getCode()).setDisplayMsg(PassStatusEnum.NORMAL_TRAFFIC.getDesc()).setTts(PassStatusEnum.NORMAL_TRAFFIC.getTts());
         } else {
-            rshyVo.setPass(PassStatusEnum.RIGHT_WAY.getCode()).setKind(kind(resultDTO)).setWarning(warning(resultDTO)).setDisplayMsg(PassStatusEnum.RIGHT_WAY.getDesc()).setTts(PassStatusEnum.RIGHT_WAY.getDesc());
+            rshyVo.setPass(PassStatusEnum.RIGHT_WAY.getCode()).setKind(kind(resultDTO)).setWarning(warning(resultDTO)).setDisplayMsg(PassStatusEnum.RIGHT_WAY.getDesc()).setTts(PassStatusEnum.RIGHT_WAY.getTts());
         }
 
         if (rshyVo.getHealthCode() != null) {

src/main/java/com/rshy/project/hy/server/ItfwServer.java

@@ -696,18 +696,18 @@ public class ItfwServer {
             return null;
         }
 
-        String cacheKey = idNumber + ':' + ItfwConstant.PCTHS_KEY;
-        String cacheValue = stringRedisTemplate.opsForValue().get(cacheKey);
-        if (StrUtil.isNotEmpty(cacheValue)) {
-            log.info("核酸接口数据服务走缓存读取，响应内容： {}", cacheValue);
-            return JSON.parseObject(cacheValue, PcthsResultDTO.class);
-        }
-
-        String cacheStatusKey = ItfwConstant.PCTHS_STATUS_KEY;
-        String cacheStatusValue = stringRedisTemplate.opsForValue().get(cacheStatusKey);
-        if (StrUtil.isNotEmpty(cacheStatusValue)) {
-            return null;
-        }
+//        String cacheKey = idNumber + ':' + ItfwConstant.PCTHS_KEY;
+//        String cacheValue = stringRedisTemplate.opsForValue().get(cacheKey);
+//        if (StrUtil.isNotEmpty(cacheValue)) {
+//            log.info("核酸接口数据服务走缓存读取，响应内容： {}", cacheValue);
+//            return JSON.parseObject(cacheValue, PcthsResultDTO.class);
+//        }
+//
+//        String cacheStatusKey = ItfwConstant.PCTHS_STATUS_KEY;
+//        String cacheStatusValue = stringRedisTemplate.opsForValue().get(cacheStatusKey);
+//        if (StrUtil.isNotEmpty(cacheStatusValue)) {
+//            return null;
+//        }
 
         PcthsProperties properties = new PcthsProperties();
         BeanUtil.copyProperties(pcthsProperties, properties);
@@ -718,9 +718,9 @@ public class ItfwServer {
         try {
             body = this.baseAgentApi(properties, timeout);
         } catch (Exception e) {
-            if (times(cacheStatusKey) > WebConstant.TIMEOUT_TIMES) {
-                stringRedisTemplate.opsForValue().set(cacheStatusKey, cacheStatusKey, WebConstant.STATUS_TIMEOUT, TimeUnit.MINUTES);
-            }
+//            if (times(cacheStatusKey) > WebConstant.TIMEOUT_TIMES) {
+//                stringRedisTemplate.opsForValue().set(cacheStatusKey, cacheStatusKey, WebConstant.STATUS_TIMEOUT, TimeUnit.MINUTES);
+//            }
 
             log.error("核酸接口数据服务接口异常：{}", e.getMessage());
             e.printStackTrace();
@@ -728,20 +728,20 @@ public class ItfwServer {
         }
 
         log.info("核酸接口数据服务响应信息:{}", body);
-        Set<String> keys = stringRedisTemplate.keys(cacheStatusKey + "*");
-        stringRedisTemplate.delete(keys);
+//        Set<String> keys = stringRedisTemplate.keys(cacheStatusKey + "*");
+//        stringRedisTemplate.delete(keys);
 
         if (StrUtil.isEmpty(body) || !StrUtil.containsAnyIgnoreCase(body, "datas")) {
             return null;
         }
         PcthsVO pcthsVO = JSON.parseObject(body, PcthsVO.class);
         if (CollectionUtil.isEmpty(pcthsVO.getData().getResult())) {
-            stringRedisTemplate.opsForValue().set(cacheKey, JSON.toJSONString(null), DateUtil.endOfDay(DateUtil.date()).getTime() - DateUtil.date().getTime(), TimeUnit.MILLISECONDS);
+//            stringRedisTemplate.opsForValue().set(cacheKey, JSON.toJSONString(null), DateUtil.endOfDay(DateUtil.date()).getTime() - DateUtil.date().getTime(), TimeUnit.MILLISECONDS);
             return null;
         }
 
         PcthsResultDTO pcthsResultDTO = pcthsVO.getData().getResult().stream().findFirst().get();
-        stringRedisTemplate.opsForValue().set(cacheKey, JSON.toJSONString(pcthsResultDTO), DateUtil.endOfDay(DateUtil.date()).getTime() - DateUtil.date().getTime(), TimeUnit.MILLISECONDS);
+//        stringRedisTemplate.opsForValue().set(cacheKey, JSON.toJSONString(pcthsResultDTO), DateUtil.endOfDay(DateUtil.date()).getTime() - DateUtil.date().getTime(), TimeUnit.MILLISECONDS);
         return pcthsResultDTO;
     }
 

src/main/java/com/rshy/project/hy/server/VIIDServer.java

@@ -0,0 +1,52 @@
+package com.rshy.project.hy.server;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.google.common.collect.Lists;
+import com.rshy.project.hy.baseRe.BaseException;
+import com.rshy.project.hy.server.dto.PersonIdentifyBodyDTO;
+import com.rshy.project.hy.server.dto.PersonIdentifyDTO;
+import com.rshy.project.hy.server.dto.PersonIdentifyImageDTO;
+import com.rshy.project.hy.server.vo.PersonIdentifyVO;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author: lileilei
+ * @date: 2022/5/2 10:15
+ * @description: 省厅应用域常口库接口
+ */
+@Component
+public class VIIDServer {
+    /**
+     * 授权凭证请求头
+     */
+    private static final String HEADERS_KEY = "User-Identify";
+
+    @Value("${viid.url}")
+    private String url;
+    @Value("${viid.header.userIdentify}")
+    private String userIdentify;
+
+    /**
+     *
+     * @param photo base64 图片
+     * @param timeout
+     * @return
+     */
+    public PersonIdentifyDTO personIdentify(String photo, Integer timeout){
+        PersonIdentifyBodyDTO bodyDTO = new PersonIdentifyBodyDTO().setProfileID("10111").setPriority("1");
+        bodyDTO.setFaceImageList(Lists.newArrayList(new PersonIdentifyImageDTO().setImageID("1").setData(photo).setShotTime(String.valueOf(System.currentTimeMillis())).setDeviceID("010101")));
+        String body = HttpRequest.post(url).header(HEADERS_KEY, userIdentify).body(JSON.toJSONString(bodyDTO)).timeout(timeout).execute().body();
+        PersonIdentifyVO personIdentifyVO = JSON.parseObject(body, PersonIdentifyVO.class);
+
+        if (personIdentifyVO != null && !"0".equals(personIdentifyVO.getCode())) {
+            throw new BaseException(personIdentifyVO.getMsg());
+        }
+
+        return CollectionUtil.isEmpty(personIdentifyVO.getResults()) ? null : personIdentifyVO.getResults().stream().findFirst().get();
+    }
+}

src/main/java/com/rshy/project/hy/server/dto/PersonIdentifyBodyDTO.java

@@ -0,0 +1,21 @@
+package com.rshy.project.hy.server.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @author: lileilei
+ * @date: 2022/5/2 10:26
+ * @description:
+ */
+@Data
+@Accessors(chain = true)
+public class PersonIdentifyBodyDTO {
+    private String ProfileID;
+
+    private String Priority;
+
+    private List<PersonIdentifyImageDTO> FaceImageList;
+}

src/main/java/com/rshy/project/hy/server/dto/PersonIdentifyDTO.java

@@ -0,0 +1,33 @@
+package com.rshy.project.hy.server.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * @author: lileilei
+ * @date: 2022/5/2 10:23
+ * @description:
+ */
+@Data
+@Accessors(chain = true)
+public class PersonIdentifyDTO {
+    /**
+     * 姓名
+     */
+    private String Name;
+
+    /**
+     * 身份证
+     */
+    private String IdNumber;
+
+    /**
+     *
+     */
+    private String PhotoData;
+
+
+    private BigDecimal SimilarityDegree;
+}

src/main/java/com/rshy/project/hy/server/dto/PersonIdentifyImageDTO.java

@@ -0,0 +1,21 @@
+package com.rshy.project.hy.server.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author: lileilei
+ * @date: 2022/5/2 10:27
+ * @description:
+ */
+@Data
+@Accessors(chain = true)
+public class PersonIdentifyImageDTO {
+    private String ImageID;
+
+    private String Data;
+
+    private String ShotTime;
+
+    private String DeviceID;
+}

src/main/java/com/rshy/project/hy/server/dto/ResultDTO.java

@@ -32,4 +32,6 @@ public class ResultDTO {
     private List<PctymDataDTO> pctymDataDTOS;
 
     private PcthsResultDTO pcthsResultDTO;
+
+    private PersonIdentifyDTO personIdentifyDTO;
 }

src/main/java/com/rshy/project/hy/server/vo/PersonIdentifyVO.java

@@ -0,0 +1,29 @@
+package com.rshy.project.hy.server.vo;
+
+import com.rshy.project.hy.server.dto.PersonIdentifyDTO;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @author: lileilei
+ * @date: 2022/5/2 10:19
+ * @description:
+ */
+@Data
+@Accessors(chain = true)
+public class PersonIdentifyVO {
+    /**
+     * 0成功，其他失败
+     */
+    private String code;
+
+    private String msg;
+
+    private List<PersonIdentifyDTO> results;
+
+    private String orgCode;
+
+    private String finalResult;
+}

src/main/java/com/rshy/project/hy/web/controller/RshyController.java

@@ -1,5 +1,6 @@
 package com.rshy.project.hy.web.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.rshy.project.hy.baseRe.Ret;
 import com.rshy.project.hy.manager.RshyJkManager;
 import com.rshy.project.hy.server.param.RshyParam;
@@ -38,6 +39,10 @@ public class RshyController {
             return Ret.error(10001,"身份证不合法");
         }
 
+        if(StrUtil.isEmpty(rshyParam.getPhoto())){
+            return Ret.error(10001, "人员照片必传");
+        }
+
         return Ret.success(rshyJkManager.getRshyInfo(rshyParam));
     }
 

src/main/resources/application-dev.yml

@@ -113,3 +113,9 @@ face:
     loginUrl: http://41.196.217.203:11180/business/api/login
     repositoryUrl: http://41.196.217.203:11180/business/api/repository
     retrievalUrl: http://41.196.217.203:11180/business/api/retrieval_repository
+
+#省厅应用域常口库接口
+viid:
+  url: http://41.190.16.94:8089/VIID/PersonIdentify
+  header:
+    userIdentify: fa91fac6536f48198b426f2fe5339ef7

src/main/resources/application-local.yml

@@ -109,3 +109,9 @@ face:
     loginUrl: http://41.196.217.203:11180/business/api/login
     repositoryUrl: http://41.196.217.203:11180/business/api/repository
     retrievalUrl: http://41.196.217.203:11180/business/api/retrieval_repository
+
+#省厅应用域常口库接口
+viid:
+  url: http://41.190.16.94:8089/VIID/PersonIdentify
+  header:
+    userIdentify: fa91fac6536f48198b426f2fe5339ef7

src/main/resources/application-prod.yml

@@ -114,6 +114,12 @@ face:
     repositoryUrl: http://41.196.217.203:11180/business/api/repository
     retrievalUrl: http://41.196.217.203:11180/business/api/retrieval_repository
 
+#省厅应用域常口库接口
+viid:
+  url: http://41.190.16.94:8089/VIID/PersonIdentify
+  header:
+    userIdentify: fa91fac6536f48198b426f2fe5339ef7
+