fix(jg)：使用登记完成时补充es数据

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -110,7 +110,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return this.baseMapper.getEquipListPage(page, factoryNum, equList, equCategory);
     }
 
-    public void updateEquipMessage(String currentDocumentId, JgUseRegistration jgUseRegistration) {
+    public void updateEquipMessage(String currentDocumentId, JgUseRegistration jgUseRegistration,JSONObject map,IdxBizJgRegisterInfo registerInfo,IdxBizJgOtherInfo otherInfo) {
         String useOrgCode = jgUseRegistration.getUseRegistrationCode();
         // 市
         List<LinkedHashMap> city = (List<LinkedHashMap>) redisUtils.get("CITY");
@@ -118,10 +118,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         List<LinkedHashMap> region = (List<LinkedHashMap>) redisUtils.get("REGION");
         // 街道
         List<LinkedHashMap> street = (List<LinkedHashMap>) redisUtils.get("STREET");
-        LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
-        lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
-        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
-        JSONObject map = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
+
         map.remove("status");
         map.remove("instanceId");
         // 安全管理员
@@ -202,8 +199,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
         // 更新设备使用登记证
         idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(String.valueOf(map.get("equipId")), useOrgCode);
-        // 更新es
-        createCode(String.valueOf(map.get("equipId")), map, useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() + useInfo.getStreetName(), jgUseRegistration);
+        // 生成监管码、96333码
+        createCode( map, jgUseRegistration, registerInfo, useInfo, otherInfo);
     }
 
     /**
@@ -502,14 +499,35 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 流程结束
             jgUseRegistration.setStatus(taskCode);
             jgUseRegistration.setNextExecuteUserIds("");
+
+            LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
+            lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr));
+            JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
+            JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
+
+            // 其他信息
+            LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
+            lambdaOth.eq(IdxBizJgOtherInfo::getRecord, String.valueOf(mapData.get("equipId")));
+            IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(lambdaOth);
+            // 使用信息
+            LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
+            lambda.eq(IdxBizJgUseInfo::getRecord, String.valueOf(mapData.get("equipId")));
+            IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambda);
+            // 注册信息
+            LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
+            lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, String.valueOf(mapData.get("equipId")));
+            IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
             // 更新设备信息
-            updateEquipMessage(String.valueOf(sequenceNbr), jgUseRegistration);
+            updateEquipMessage(String.valueOf(sequenceNbr), jgUseRegistration,mapData, registerInfo, otherInfo);
+            // 生成使用登记证编号
             if (!ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode())) {
-                // 生成使用登记证编号
                 String code = commonServiceImpl.generateRegistrationCode(jgUseRegistration.getSupervisoryCode(), jgUseRegistration.getReceiveCompanyCode());
                 jgUseRegistration.setUseRegistrationCode(code);
                 jgUseRegistration.setAuditPassDate(new Date());
             }
+            // 更新es
+            updateEsData(useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() + useInfo.getStreetName(),
+                    mapData,otherInfo,jgUseRegistration);
             // 更新代办状态
             HashMap<String, Object> params = new HashMap<>();
             params.put("relationId", jgUseRegistration.getInstanceId());
@@ -528,6 +546,27 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     }
 
+    public void updateEsData(String usePlace,JSONObject dataMap,IdxBizJgOtherInfo otherInfo,JgUseRegistration jgUseRegistration){
+        // 属地监管部门拆分
+        String orgBranch = (String) dataMap.getOrDefault("orgBranchCode", "_");
+        String[] split = orgBranch.split("_");
+        // 更新es
+        HashMap<String, Map<String, Object>> objMap = new HashMap<>();
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("SUPERVISORY_CODE", otherInfo.getSupervisoryCode());
+        param.put("CODE96333", otherInfo.getCode96333());
+        param.put("USE_UNIT_CREDIT_CODE", dataMap.get("useUnitCreditCode"));
+        param.put("USE_UNIT_NAME", dataMap.get("useUnitName"));
+        param.put("ADDRESS", dataMap.getOrDefault("address", ""));
+        param.put("USE_PLACE", usePlace);
+        param.put("STATUS", "已认领");
+        param.put("EQU_STATE", 1);
+        param.put("ORG_BRANCH_CODE", split[0]);
+        param.put("ORG_BRANCH_NAME", split[1]);
+        param.put("USE_ORG_CODE", jgUseRegistration.getUseRegistrationCode());
+        objMap.put((String) dataMap.get("equipId"), param);
+        tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
+    }
 
     public void buildTask(JgUseRegistration jgUseRegistration, WorkflowResultDto workflowResultDto) {
         // 代办消息
@@ -831,22 +870,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     /**
      * 生成监管码、96333码
      *
-     * @param record
      */
-    public void createCode(String record, JSONObject dataMap, String usePlace, JgUseRegistration jgUseRegistration) {
-        // 其他信息
-        LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
-        lambdaOth.eq(IdxBizJgOtherInfo::getRecord, record);
-        IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(lambdaOth);
-        // 使用信息
-        LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
-        lambda.eq(IdxBizJgUseInfo::getRecord, record);
-        IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambda);
-        // 注册信息
-        LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
-        lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, record);
-        IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
-
+    public void createCode(JSONObject dataMap,JgUseRegistration jgUseRegistration,IdxBizJgRegisterInfo registerInfo,IdxBizJgUseInfo useInfo,IdxBizJgOtherInfo otherInfo) {
         if (ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
             // 生成监管码、96333码
             Map<String, Object> map = new HashMap<>();
@@ -866,17 +891,5 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 jgUseRegistration.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
             }
         }
-        // 更新es
-        HashMap<String, Map<String, Object>> objMap = new HashMap<>();
-        HashMap<String, Object> param = new HashMap<>();
-        param.put("SUPERVISORY_CODE", otherInfo.getSupervisoryCode());
-        param.put("CODE96333", otherInfo.getCode96333());
-        param.put("USE_UNIT_CREDIT_CODE", dataMap.get("useUnitCreditCode"));
-        param.put("USE_UNIT_NAME", dataMap.get("useUnitName"));
-        param.put("ADDRESS", dataMap.getOrDefault("address", ""));
-        param.put("USE_PLACE", usePlace);
-        param.put("STATUS", "已认领");
-        objMap.put(record, param);
-        tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
     }
 }
\ No newline at end of file