Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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/EquipClaimServiceImpl.java

@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.CodeGenerateDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.EquipRequestParamsDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
@@ -27,6 +28,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationMapper;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
+import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
@@ -138,6 +140,9 @@ public class EquipClaimServiceImpl {
     private final JgCertificateChangeRecordServiceImpl certificateChangeRecordService;
     private final JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
     private final DataDockServiceImpl dockService;
+    private final IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoServiceImpl;
+    private final CodeUtil codeUtil;
+    private final ProduceInfoMapper produceInfoMapper;
 
 
     /**
@@ -833,7 +838,7 @@ public class EquipClaimServiceImpl {
         // 1. 本单位下无该工程装置
         if (!hasThisProCon) {
             List<Map<String, Object>> pipelineList = (List<Map<String, Object>>) equipInfo.get(PIPELINE_LIST);
-
+            String[] splitOrgBranchCode = Objects.toString(equipInfo.getString("orgBranchCode"), "").split("_");
             // 工程装置
             IdxBizJgProjectContraption projectContraption = JSON.parseObject(toJSONString(equipInfo), IdxBizJgProjectContraption.class);
             projectContraption.setDataSource(JG_HIS_XA_CLAIM);
@@ -859,13 +864,19 @@ public class EquipClaimServiceImpl {
             projectContraption.setUseUnitCreditCode(company.getCompanyCode());
             projectContraption.setIsFirstMerge(false);
             projectContraption.setCreateDate(new Date());
+            projectContraption.setOrgCode(splitOrgBranchCode[0]);
+            projectContraption.setOrgName(splitOrgBranchCode[1]);
+            // 监管码
+            if (!ObjectUtils.isEmpty(equipInfo.get(USE_REGISTRATION_CODE))) {
+                projectContraption.setSupervisoryCode(idxBizJgRegisterInfoServiceImpl.getSupervisoryCode(Objects.toString(equipInfo.get("city"), null), equipInfo.get("EQU_CATEGORY").toString()));
+            }
             idxBizJgProjectContraptionService.updateById(projectContraption);
             // 设备
-            this.addOrUpdatePipeEquip(equipInfo, false);
+            this.addOrUpdatePipeEquip(equipInfo, projectContraption, false);
 
             // 历史管道登记
             if (!ObjectUtils.isEmpty(equipInfo.get(USE_REGISTRATION_CODE))) {
-                this.pipeHistoryRegister(equipInfo);
+                this.pipeHistoryRegister(equipInfo, projectContraption);
             }
         }
 
@@ -890,7 +901,7 @@ public class EquipClaimServiceImpl {
             BigDecimal totalPipeLengthBd = oldPipeLengthBd.add(newPipeLengthBd);
             oldProCon.setPipelineLength(totalPipeLengthBd.doubleValue());
             // 更新设备
-            this.addOrUpdatePipeEquip(equipInfo, true);
+            this.addOrUpdatePipeEquip(equipInfo, oldProCon, true);
 
             // 2.1 已经有的工程装置【已登记】
             String useRegistrationCode1 = oldProCon.getUseRegistrationCode();
@@ -920,7 +931,7 @@ public class EquipClaimServiceImpl {
      *
      * @param equipInfo
      */
-    public void pipeHistoryRegister(JSONObject equipInfo) {
+    public void pipeHistoryRegister(JSONObject equipInfo, IdxBizJgProjectContraption projectContraption) {
         CompanyBo company = getSelectedOrgInfo().getCompany();
         AgencyUserModel userModel = getSelectedOrgInfo().getUserModel();
         String proConName = equipInfo.getString("PROJECT_CONTRAPTION");
@@ -936,6 +947,7 @@ public class EquipClaimServiceImpl {
         useReg.setUseUnitCreditCode(company.getCompanyCode())
                 .setUseUnitName(company.getCompanyName())
                 .setApplyNo(applyNo)
+                .setSupervisoryCode(projectContraption.getSupervisoryCode())
                 .setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName())
                 .setStatus(FlowStatusEnum.TO_BE_FINISHED.getName())
                 .setReceiveOrgName(splitMaintenanceUnitCode[1])
@@ -1091,7 +1103,17 @@ public class EquipClaimServiceImpl {
     //     return jsonObject;
     // }
 
-    public void addOrUpdatePipeEquip(JSONObject equipInfo, Boolean isIntoManagement) {
+    public String getEquCode(String equListCode, String equCategoryCode, String equDefineCode, Date now, String receiveCompanyCode) {
+        CodeGenerateDto codeGenerateDto = new CodeGenerateDto();
+        codeGenerateDto.setEquList(equListCode);
+        codeGenerateDto.setEquCategory(equCategoryCode);
+        codeGenerateDto.setEquDefine(equDefineCode);
+        codeGenerateDto.setProduceDate(now);
+        codeGenerateDto.setReceiveCompanyCode(receiveCompanyCode);
+        return codeUtil.generateEquipmentCode(codeGenerateDto);
+    }
+
+    public void addOrUpdatePipeEquip(JSONObject equipInfo, IdxBizJgProjectContraption projectContraption, Boolean isIntoManagement) {
         Date nowDate = new Date();
         List<Map<String, Object>> pipelineList = (List<Map<String, Object>>) equipInfo.get(PIPELINE_LIST);
         CompanyBo company = getSelectedOrgInfo().getCompany();
@@ -1118,7 +1140,7 @@ public class EquipClaimServiceImpl {
         List<IdxBizJgTechParamsPipeline> toUpdateParamsPipelineList = initializeList();
         List<IdxBizJgTechParamsPipeline> toAddParamsPipelineList = initializeList();
         List<ESEquipmentCategoryDto> esEquipmentCategoryList = initializeList();
-
+        String equCode = this.getEquCode(equipInfo.get("EQU_LIST").toString(), equipInfo.get("EQU_CATEGORY").toString(), equipInfo.get("EQU_DEFINE").toString(), new Date(), Objects.toString(equipInfo.getString("receiveOrgCode"), "").split("_")[0]);
         // 设备信息
         for (Map<String, Object> pipeline : pipelineList) {
             boolean hasRecord = !ObjectUtils.isEmpty(pipeline.get("record"));
@@ -1156,7 +1178,7 @@ public class EquipClaimServiceImpl {
             useInfo.setUseUnitName(company.getCompanyName());
             useInfo.setEquState("");
             useInfo.setProjectContraption(proConName);
-            useInfo.setProjectContraptionId(proConNo);
+            useInfo.setProjectContraptionId(projectContraption.getSequenceNbr().toString());
             if (hasRecord) {
                 toUpdateUseInfoList.add(useInfo);
             } else {
@@ -1218,7 +1240,7 @@ public class EquipClaimServiceImpl {
             otherInfo.setSequenceNbr(null);
             otherInfo.setClaimStatus("已认领");
             otherInfo.setRecDate(nowDate);
-            otherInfo.setSupervisoryCode("");
+            otherInfo.setSupervisoryCode(projectContraption.getSupervisoryCode());
             otherInfo.setCylinderStampAttachment("");
             otherInfo.setInformationSituation("");
             otherInfo.setInformationManageCode("");
@@ -1248,8 +1270,8 @@ public class EquipClaimServiceImpl {
             registerInfo.setRecDate(nowDate);
             registerInfo.setSequenceNbr(null);
             registerInfo.setEquCodeType("2");
+            registerInfo.setEquCode(equCode);
             registerInfo.setRegisterState(jgRegisterInfoService.getRegCode());
-            registerInfo.setEquCode(ObjectUtils.isEmpty(registerInfo.getEquCode()) ? "" : registerInfo.getEquCode());
             registerInfo.setProductName(pipelineInfo.getPipeName());
             if (hasRecord) {
                 toUpdateRegisterInfoList.add(registerInfo);