fix(JG)：监管系统业务，压力管道-工业管道-工艺管道，安装告知书编号生成规则错误

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

@@ -404,7 +404,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 noticeDto.setNoticeStatusDesc(noticeStatusDesc);
             }
             return noticeDto;
-        }).collect(java.util.stream.Collectors.toList());
+        }).collect(Collectors.toList());
         noticeDtoPage.setRecords(records);
 
         return noticeDtoPage;
@@ -874,7 +874,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             JgInstallationNotice jgInstallationNotice = this.getById(dto.getSequenceNbr());
             jgInstallationNotice.setProcessAdvice(dto.getProcessAdvice());
             // 组装设备注册代码
-            StringBuilder stringBuffer = new StringBuilder();
             String ym = null;
             try {
                 ym = DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM);
@@ -898,9 +897,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     LambdaQueryWrapper<IdxBizJgRegisterInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                     queryWrapper2.eq(IdxBizJgRegisterInfo::getRecord,jgRelationEquip.getEquId());
                     IdxBizJgRegisterInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                    stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgInstallationNotice.getReceiveOrgCreditCode()).append(ym);
-                    String equCode = stringBuffer.toString();
-                    ResponseModel<String> responseModel  = tzsServiceFeignClient.deviceRegistrationCode(equCode);
+                    String equCode = Optional.ofNullable(tzsJgRegistrationInfo.getEquDefine())
+                            .orElse(tzsJgRegistrationInfo.getEquCategory());
+                    String registrationCode = equCode + jgInstallationNotice.getReceiveOrgCreditCode() + ym;
+                    ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
                     String deviceRegistrationCode = responseModel.getResult();
                     Map<String, Object> map = new HashMap<>();
                     map.put("code96333",tzsJgOtherInfo.getCode96333());

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

@@ -767,7 +767,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             commonService.checkForExecuteFlow(nextTaskId, instanceId);
             JgMaintainNotice jgMaintainNotice = this.jgMaintainNoticeMapper.selectById(dto.getSequenceNbr());
             // 组装设备注册代码
-            StringBuilder stringBuffer = new StringBuilder();
             String ym = null;
             try {
                 ym = DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM);
@@ -791,12 +790,12 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                     LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                     queryWrapper2.eq(RegistrationInfo::getRecord, jgRelationEquip.getEquId());
                     RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                    stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgMaintainNotice.getReceiveCompanyCode()).append(ym);
-                    String equCode = stringBuffer.toString();
-                    ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(equCode);
+                    String equCode = Optional.ofNullable(tzsJgRegistrationInfo.getEquDefine())
+                            .orElse(tzsJgRegistrationInfo.getEquCategory());
+                    String registrationCode = equCode + jgMaintainNotice.getReceiveCompanyCode() + ym;
+                    ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
                     String deviceRegistrationCode = responseModel.getResult();
                     jgMaintainNotice.setInformNumber(deviceRegistrationCode);
-
                     jgMaintainNotice.setAcceptDate(new Date());
                     jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                     jgMaintainNotice.setPromoter("");

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

@@ -710,7 +710,6 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
             jgReformNotice.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
             // 组装设备注册代码
-            StringBuilder stringBuffer = new StringBuilder();
             String ym = null;
             try {
                 ym = DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM);
@@ -745,13 +744,12 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                     LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                     queryWrapper2.eq(RegistrationInfo::getRecord, jgRelationEquip.getEquId());
                     RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                    stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgReformNotice.getReceiveCompanyCode()).append(ym);
-                    String equCode = stringBuffer.toString();
-
-                    ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(equCode);
+                    String equCode = Optional.ofNullable(tzsJgRegistrationInfo.getEquDefine())
+                            .orElse(tzsJgRegistrationInfo.getEquCategory());
+                    String registrationCode = equCode + jgReformNotice.getReceiveCompanyCode() + ym;
+                    ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
                     String deviceRegistrationCode = responseModel.getResult();
                     jgReformNotice.setInformNumber(deviceRegistrationCode);
-
                     jgReformNotice.setAcceptDate(new Date());
                     jgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                     jgReformNotice.setPromoter("");

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

@@ -712,7 +712,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             commonService.checkExpectedStatus(jgTransferNotice.getNoticeStatus());
 
             // 组装设备注册代码
-            StringBuilder stringBuffer = new StringBuilder();
             String ym = null;
             try {
                 ym = DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM);
@@ -735,13 +734,12 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                     queryWrapper2.eq(RegistrationInfo::getRecord, jgTransferNoticeEq.getEquId());
                     RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                    stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgTransferNotice.getReceiveCompanyCode()).append(ym);
-                    String equCode = stringBuffer.toString();
-                    ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(equCode);
+                    String equCode = Optional.ofNullable(tzsJgRegistrationInfo.getEquDefine())
+                            .orElse(tzsJgRegistrationInfo.getEquCategory());
+                    String registrationCode = equCode + jgTransferNotice.getReceiveCompanyCode() + ym;
+                    ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
                     String deviceRegistrationCode = responseModel.getResult();
-
                     jgTransferNotice.setInformNumber(deviceRegistrationCode);
-
                     jgTransferNotice.setPromoter("");
                     jgTransferNotice.setHandleDate(new Date());
                     jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));