人员赋码问题处理

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/emqx/PersonYardMessage.java

@@ -68,19 +68,26 @@ public class PersonYardMessage extends EmqxListener {
     };
 
     public void jxIopUpdate(JSONObject analysisResult) {
+        try {
+            Thread.sleep(10000); // 等待3秒
+
         log.info("人员赋码数据：{}", analysisResult);
         String warningObjectCode = String.valueOf(analysisResult.get("warningObjectCode"));
         String codeColor = String.valueOf(analysisResult.get("codeColor"));
         PersonBasic personBasic = personBasicMapper.selectById(warningObjectCode);
-        if (ObjectUtils.isEmpty(personBasic)) {
-            try {
-                emqKeeper.getMqttClient().publish("ryfm/warning/coding", analysisResult.toJSONString().getBytes(), 2, Boolean.FALSE);
-            } catch (MqttException e) {
-                e.printStackTrace();
-            }
-        } else {
+        log.info("人员基础信息：{}", JSON.toJSONString(personBasic));
+//        if (ObjectUtils.isEmpty(personBasic)) {
+//            try {
+//                emqKeeper.getMqttClient().publish("ryfm/warning/coding", analysisResult.toJSONString().getBytes(), 2, Boolean.FALSE);
+//            } catch (MqttException e) {
+//                e.printStackTrace();
+//            }
+//        } else {
             personBasic.setQrcodeColor(codeColor);
             personBasicMapper.updateById(personBasic);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
         }
+//        }
     }
 }

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

@@ -228,10 +228,17 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
 //            personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
             personBasic.setQrcodeDesc("证书临期");
         }
-        this.baseMapper.insert(personBasic);
         CompanyModel companyModel = new CompanyModel();
         //单位
         companyModel = this.getCompanyModel(personAccount.getProjectId());
+        personBasic.setProjectOrgCode(companyModel.getOrgCode());
+
+
+        if (personUser.getNativePlace()!=null) {
+            personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
+        }
+        this.baseMapper.insert(personBasic);
+
         if ("证书不全".equals(personBasic.getQrcodeDesc()) || "证书临期".equals(personBasic.getQrcodeDesc())) {
             personBasic.setProjectOrgCode(companyModel.getOrgCode());
             personAccount.setProjectName(companyModel.getCompanyName());
@@ -308,15 +315,15 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
             //personBasic.setProjectOrgCode(departmentModel.getOrgCode());
             personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
         }
-            personBasic.setProjectOrgCode(companyModel.getOrgCode());
-
-
-        if (personUser.getNativePlace()!=null) {
-            personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
-        }
+//            personBasic.setProjectOrgCode(companyModel.getOrgCode());
+//
+//
+//        if (personUser.getNativePlace()!=null) {
+//            personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
+//        }
         personAccount.setPuserId(agencyUserModel.getUserId());
         personAccount.setProjectName(companyModel.getCompanyName());
-        this.personBasicMapper.updateById(personBasic);
+//        this.personBasicMapper.updateById(personBasic);
         this.personAccountService.updateById(personAccount);
 
         PersonAccountFed personAccountFed = new PersonAccountFed();
@@ -413,47 +420,17 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
             personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode());
             personBasic.setQrcodeDesc("证书齐全");
         } else if (CollectionUtils.isEmpty(list) && isOver == 1) {
-//            personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
+            personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
             personBasic.setQrcodeDesc("证书不全");
         } else if (CollectionUtils.isEmpty(list) && isOver == 0 && isInMonth == 1) {
-//            personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
+            personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
             personBasic.setQrcodeDesc("证书临期");
         }
         personBasic.setProjectOrgCode(companyModel.getOrgCode());
         personAccount.setProjectName(companyModel.getCompanyName());
 
 
-        if (!qrcodeDescOld.equals(personBasic.getQrcodeDesc())) {
-            personBasic.setRecDate(new Date());
-            this.personBasicMapper.updateById(personBasic);
-            if (("证书不全".equals(personBasic.getQrcodeDesc()) ||
-                    "证书临期".equals(personBasic.getQrcodeDesc()))) {
-                BizMessage bizMessage = new BizMessage();
-                bizMessage.setIndexKey("RYFM");
-                bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc());
-                RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount);
-                bizMessage.setBizInfo(riskBizInfoVo);
-                bizMessage.setDataSource("人员赋码");
-                try {
-                    emqKeeper.getMqttClient().publish(PersonBasicServiceImpl.RYFM_DATA_MQTT_TOPIC, JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false);
-                } catch (MqttException e) {
-                    e.printStackTrace();
-                }
-            } else if ("证书齐全".equals(personBasic.getQrcodeDesc())) {
-                HashMap<String, String> personMap = new HashMap<>();
-                personMap.put("objectId", String.valueOf(personBasic.getSequenceNbr()));
-                personMap.put("qrCodeColor", qrcodeColorOld);
-                personMap.put("warningObjectType", "RYFM");
-                personMap.put("sourceAttribution", personBasic.getProjectOrgCode());
-                personMap.put("sourceAttributionDesc", personAccount.getProjectName());
-                personMap.put("warningSourceType", "人员赋码");
-                try {
-                    emqKeeper.getMqttClient().publish(PersonBasicServiceImpl.RYFM_GREEN, JSON.toJSONString(personMap).getBytes(StandardCharsets.UTF_8), 2, false);
-                } catch (MqttException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
+
 
         //人员账号信息
         personAccount.setPersonId(sequenceNbr);
@@ -512,7 +489,40 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
             personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
         }
         personAccount.setProjectName(companyModel.getCompanyName());
-        this.personBasicMapper.updateById(personBasic);
+
+        if (!qrcodeDescOld.equals(personBasic.getQrcodeDesc())) {
+            personBasic.setRecDate(new Date());
+            this.personBasicMapper.updateById(personBasic);
+            if (("证书不全".equals(personBasic.getQrcodeDesc()) ||
+                    "证书临期".equals(personBasic.getQrcodeDesc()))) {
+                BizMessage bizMessage = new BizMessage();
+                bizMessage.setIndexKey("RYFM");
+                bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc());
+                RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount);
+                bizMessage.setBizInfo(riskBizInfoVo);
+                bizMessage.setDataSource("人员赋码");
+                try {
+                    emqKeeper.getMqttClient().publish(PersonBasicServiceImpl.RYFM_DATA_MQTT_TOPIC, JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false);
+                } catch (MqttException e) {
+                    e.printStackTrace();
+                }
+            } else if ("证书齐全".equals(personBasic.getQrcodeDesc())) {
+                HashMap<String, String> personMap = new HashMap<>();
+                personMap.put("objectId", String.valueOf(personBasic.getSequenceNbr()));
+                personMap.put("qrCodeColor", qrcodeColorOld);
+                personMap.put("warningObjectType", "RYFM");
+                personMap.put("sourceAttribution", personBasic.getProjectOrgCode());
+                personMap.put("sourceAttributionDesc", personAccount.getProjectName());
+                personMap.put("warningSourceType", "人员赋码");
+                try {
+                    emqKeeper.getMqttClient().publish(PersonBasicServiceImpl.RYFM_GREEN, JSON.toJSONString(personMap).getBytes(StandardCharsets.UTF_8), 2, false);
+                } catch (MqttException e) {
+                    e.printStackTrace();
+                }
+            }
+        } else {
+            this.personBasicMapper.updateById(personBasic);
+        }
         personAccountService.updateById(personAccount);
 
         PersonAccountFed personAccountFed = new PersonAccountFed();