人员赋码携带具体信息

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/BizMessage.java

@@ -23,5 +23,4 @@ public class BizMessage {
      */
     String dataSource;
     private String traceId2;
-    private String extAttr2;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/CustomizeItems.java

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * 自定义扩展内容项
+ */
+@Data
+public class CustomizeItems {
+    /**
+     * 自定义的问题名称
+     */
+    private String questionName;
+    /**
+     * 自定义的问题内容
+     */
+    private String questionContent;
+
+    /**
+     * 自定义的预警内容 content
+     */
+    private String warningContent;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/RiskBizInfoVo.java

@@ -21,4 +21,5 @@ public class RiskBizInfoVo {
     private String type;
     private List<RiskDynamicDetailsVo> dynamicDetails;
     private String warningObjectType;
+    private CustomizeItems customizeItems;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -149,7 +149,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
     }
 
 
-    public RiskBizInfoVo fetchData(PersonBasic personBasic, PersonAccount personAccount) {
+    public RiskBizInfoVo fetchData(PersonBasic personBasic, PersonAccount personAccount, String content) {
         RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
         riskBizInfoVo.setWarningObjectName(personAccount.getProjectName() + personBasic.getPostName() + personAccount.getName());
         riskBizInfoVo.setWarningObjectCode(String.valueOf(personBasic.getSequenceNbr()));
@@ -161,6 +161,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         dynamicDetailsVo.setTabName("预警详情");
         detailsVos.add(dynamicDetailsVo);
         riskBizInfoVo.setDynamicDetails(detailsVos);
+        CustomizeItems customizeItems = new CustomizeItems();
+        customizeItems.setWarningContent(content);
+        riskBizInfoVo.setCustomizeItems(customizeItems);
         return riskBizInfoVo;
     }
 
@@ -232,12 +235,18 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         List<String> strings = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(overCertificateList)) {
             strings.add("过期证书：" + String.join("，" , overCertificateList));
+        } else {
+            strings.add("过期证书：无");
         }
         if (CollectionUtils.isNotEmpty(inMonthCertificateList)) {
             strings.add("临期证书：" + String.join("，" , inMonthCertificateList));
+        } else {
+            strings.add("临期证书：无");
         }
         if (CollectionUtils.isNotEmpty(noCertificateList)) {
             strings.add("缺少证书：" + String.join("，" , noCertificateList));
+        } else {
+            strings.add("缺少证书：无");
         }
         String join = "";
         if (CollectionUtils.isNotEmpty(strings)) {
@@ -279,10 +288,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
             BizMessage bizMessage = new BizMessage();
             bizMessage.setIndexKey("RYFM");
             bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc());
-            RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount);
+            RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, personBasic.getPostName() + personBasic.getQrcodeDesc() + join);
             bizMessage.setBizInfo(riskBizInfoVo);
             bizMessage.setTraceId(String.valueOf(personBasic.getSequenceNbr()));
-            bizMessage.setExtAttr2(join);
             try {
                 emqKeeper.getMqttClient().publish(RYFM_DATA_MQTT_TOPIC, JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false);
             } catch (MqttException e) {
@@ -460,12 +468,18 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         List<String> strings = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(overCertificateList)) {
             strings.add("过期证书：" + String.join("，" , overCertificateList));
+        } else {
+            strings.add("过期证书：无");
         }
         if (CollectionUtils.isNotEmpty(inMonthCertificateList)) {
             strings.add("临期证书：" + String.join("，" , inMonthCertificateList));
+        } else {
+            strings.add("临期证书：无");
         }
         if (CollectionUtils.isNotEmpty(noCertificateList)) {
             strings.add("缺少证书：" + String.join("，" , noCertificateList));
+        } else {
+            strings.add("缺少证书：无");
         }
 
         String join = "";
@@ -568,10 +582,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
                 BizMessage bizMessage = new BizMessage();
                 bizMessage.setIndexKey("RYFM");
                 bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc());
-                RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount);
+                RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, personBasic.getPostName() + personBasic.getQrcodeDesc() + join);
                 bizMessage.setBizInfo(riskBizInfoVo);
                 bizMessage.setDataSource("人员赋码");
-                bizMessage.setExtAttr2(join);
                 try {
                     emqKeeper.getMqttClient().publish(PersonBasicServiceImpl.RYFM_DATA_MQTT_TOPIC, JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false);
                 } catch (MqttException e) {