1.计量开门信号

health-code.iml

@@ -13,6 +13,15 @@
         </sourceRoots>
       </configuration>
     </facet>
+    <facet type="jpa" name="JPA">
+      <configuration>
+        <setting name="validation-enabled" value="true" />
+        <datasource-mapping>
+          <factory-entry name="health-code" />
+        </datasource-mapping>
+        <naming-strategy-map />
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
@@ -25,7 +34,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.4.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.5" level="project" />
@@ -127,7 +135,6 @@
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
     <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.68" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.68" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.2.8" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
@@ -194,5 +201,7 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jai-imageio:jai-imageio-core:1.4.0" level="project" />
     <orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
     <orderEntry type="library" name="Maven: cn.superfw:crypto-gmsm:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-ext-jdk15on:1.60" level="project" />
   </component>
 </module>

src/main/java/com/yixin/ms/server/JiliangUniversityServer.java

@@ -82,7 +82,7 @@ public class JiliangUniversityServer {
      * @param dto
      * @return
      */
-    public String canPass(JiliangCanPassDataDTO dto){
+    public JiliangCanPassVO canPass(JiliangCanPassDataDTO dto){
         Map<String, String> headers = Maps.newHashMap();
         headers.put("x-access-token", this.getToken());
         HealthResultVO<JiliangCanPassVO> resultVO = null;
@@ -97,6 +97,6 @@ public class JiliangUniversityServer {
             throw new ServiceException("学校开放接口服务异常，请联系工作人员");
         }
 
-        return resultVO.getData().getCanPass();
+        return resultVO.getData();
     }
 }

src/main/java/com/yixin/ms/server/vo/JiliangCanPassVO.java

@@ -17,4 +17,7 @@ public class JiliangCanPassVO {
 
     @ApiModelProperty("身份证号")
     private String idCard;
+
+    @ApiModelProperty("语音播报内容")
+    private String message;
 }

src/main/java/com/yixin/ms/service/impl/HealthCodeServiceImpl.java

@@ -26,6 +26,7 @@ import com.yixin.ms.server.HealthCodeServer;
 import com.yixin.ms.server.JiliangUniversityServer;
 import com.yixin.ms.server.dto.JiliangCanPassDataDTO;
 import com.yixin.ms.server.vo.HealthCodeVO;
+import com.yixin.ms.server.vo.JiliangCanPassVO;
 import com.yixin.ms.service.HealthCodeService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -100,9 +101,20 @@ public class HealthCodeServiceImpl implements HealthCodeService {
             }
         }
 
-        String canPass = jiliangUniversityServer.canPass(new JiliangCanPassDataDTO().setIdCard(shortTermDTO.getIdNumber()).setOpTime(DateUtil.date()).setSn(shortTermDTO.getSn()));
-        if(canPass.equals(CanPassEnum.NOT_THROUGH.getCode())){
-            return RestResponse.error("暂无通行权限，请联系工作人员");
+        JiliangCanPassVO jiliangCanPassVO = jiliangUniversityServer.canPass(new JiliangCanPassDataDTO().setIdCard(shortTermDTO.getIdNumber()).setOpTime(DateUtil.date()).setSn(shortTermDTO.getSn()));
+        jiliangCanPassVO.setCanPass(CanPassEnum.NOT_THROUGH.getCode());
+        if(jiliangCanPassVO.getCanPass().equals(CanPassEnum.NOT_THROUGH.getCode())){
+            HealtCodeUserVO userVO = new HealtCodeUserVO();
+            userVO.setIsOpen(HealthOpenEnum.NO_THOROUGHFARE.getCode());
+            userVO.setOpenMsg(jiliangCanPassVO.getMessage());
+            userVO.setOpenVoiceMsg(jiliangCanPassVO.getMessage());
+            userVO.setUsername(StrUtil.isEmpty(shortTermDTO.getName()) ? StrUtil.EMPTY : DesensitizedUtil.chineseName(shortTermDTO.getName()));
+            userVO.setIdNumber(StrUtil.isEmpty(shortTermDTO.getIdNumber()) ? StrUtil.EMPTY : DesensitizedUtil.idCardNum(shortTermDTO.getIdNumber(), 4, 4));
+            userVO.setBackgroundColor(ColorEnum.WHITE.getValue());
+            userVO.setVaccineNumColor(ColorEnum.WHITE.getValue());
+            userVO.setVaccineIconUrl(NucleicStatusEnum.NOT_AVAILABLE.getUrl());
+            userVO.setTravelValidationIconUrl(TravelValidationEnum.HAVE_BEEN_TO.getUrl());
+            return RestResponse.ok(userVO);
         }
 
         /**