fix:(jg):安装单位只能添加非撬装类压力容器，安装单位细分管道上传模版

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/common/DataDockTemplateVersionUtils.java

@@ -64,7 +64,9 @@ public class DataDockTemplateVersionUtils {
         VERSION_MAP.put("历史有证_游乐设施设备", "V1.0.0");
         VERSION_MAP.put("新设备_场内机动车辆", "V1.0.0");
         VERSION_MAP.put("新设备_电梯设备", "V1.0.1");
-        VERSION_MAP.put("新设备_管道设备", "V1.0.1");
+        VERSION_MAP.put("新设备_管道设备-工业", "V1.0.2");
+        VERSION_MAP.put("新设备_管道设备-长输", "V1.0.2");
+        VERSION_MAP.put("新设备_管道设备-公用", "V1.0.2");
         VERSION_MAP.put("新设备_锅炉设备", "V1.0.0");
         VERSION_MAP.put("新设备_起重机械设备", "V1.0.0");
         VERSION_MAP.put("新设备_索道设备", "V1.0.0");

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

@@ -93,6 +93,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.alibaba.fastjson.JSON.toJSONString;
+import static com.yeejoin.amos.boot.module.common.api.constant.TZSCommonConstant.EQU_CATEGORY_CODE_GDYLRQ;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl.toCamelCase;
 
 @Slf4j
@@ -217,6 +218,7 @@ public class DataDockServiceImpl {
         try {
             // transactionTemplate.execute(status -> {
             String equList = String.valueOf(equ.get("equList"));
+            String equCategory = String.valueOf(equ.get("equCategory"));
             String isCompleteXa = String.valueOf(equ.get("isCompleteXa"));
             // 压力管道保存 工程装置表信息  必须在saveUseInfo之前进行，需要提前生成工程装置id
             //saveProjectContraption(equ, equList, company, dataSource);
@@ -224,7 +226,7 @@ public class DataDockServiceImpl {
             saveUseInfo(equ, record, dataSource, remark, company);
             saveDesignInfo(equ, record);
             saveFactoryInfo(equ, record);
-            saveRegisterInfo(equ, record, equList);
+            saveRegisterInfo(equ, record, equCategory, company);
             saveSupervisionInfo(equ, record);
             saveOtherInfo(equ, record, equList);
             saveInspectInfo(equ, record);
@@ -489,8 +491,8 @@ public class DataDockServiceImpl {
      * @param equ
      * @param record
      */
-    private IdxBizJgRegisterInfo saveRegisterInfo(Map<String, Object> equ, String record, String equList) {
-        log.error("数据===>{}", toJSONString(equ));
+    private IdxBizJgRegisterInfo saveRegisterInfo(Map<String, Object> equ, String record, String equCategory,CompanyBo company) {
+        log.info("数据===>{}", toJSONString(equ));
         IdxBizJgRegisterInfo oldRegisterInfo = idxBizJgRegisterInfoServiceImpl.lambdaQuery()
                 .eq(IdxBizJgRegisterInfo::getRecord, record).one();
         IdxBizJgRegisterInfo registerInfo = JSON.parseObject(toJSONString(equ), IdxBizJgRegisterInfo.class);
@@ -503,6 +505,10 @@ public class DataDockServiceImpl {
             registerInfo.setRegisterState("6045");
             registerInfo.setIsCompleteXa("1");
             registerInfo.setInInspectionPeriod("1");
+            if (company != null&& "安装改造维修单位".equals(company.getCompanyType())
+                    && EQU_CATEGORY_CODE_GDYLRQ.equals(equCategory)) {
+                registerInfo.setWhetherSkidMountedPressureVessel("0");
+            }
             idxBizJgRegisterInfoServiceImpl.saveOrUpdateData(registerInfo);
         }
         return registerInfo;
@@ -1128,7 +1134,7 @@ public class DataDockServiceImpl {
                 if (!isSpecialGasCylinder) { // 不是特种气瓶
                     data.setWhetherVehicleCylinder("");
                     //checkNotBlank(data.getInformationSituation(), "信息化管理情况不能为空；", rowError);
-                    if (!org.apache.commons.lang3.ObjectUtils.isEmpty(data.getInformationSituation())) {
+                    if (!ObjectUtils.isEmpty(data.getInformationSituation())) {
                         //checkNotBlank(data.getInformationManageCode(), "二维码或者电子标签编号不能为空；", rowError);
                     }
                 }
@@ -1136,7 +1142,7 @@ public class DataDockServiceImpl {
                     checkNotBlank(data.getWhetherVehicleCylinder(), "是否车用气瓶不能为空；", rowError);
                     if (!isCarGasCylinder) {// 不是车用气瓶
                         //checkNotBlank(data.getInformationSituation(), "信息化管理情况不能为空；", rowError);
-                        if (!org.apache.commons.lang3.ObjectUtils.isEmpty(data.getInformationSituation())) {
+                        if (!ObjectUtils.isEmpty(data.getInformationSituation())) {
                             //checkNotBlank(data.getInformationManageCode(), "二维码或者电子标签编号不能为空；", rowError);
                         }
                     }
@@ -2673,6 +2679,7 @@ public class DataDockServiceImpl {
         Map<String, String> errorResult = Maps.newConcurrentMap();
         String record = Optional.ofNullable(equ.get("record")).map(String::valueOf).orElse(UUID.randomUUID().toString());
         String equList = Optional.ofNullable(equ.get("equList")).map(String::valueOf).orElse("");
+        String equCategory = Optional.ofNullable(equ.get("equCategory")).map(String::valueOf).orElse("");
         String businessId = Optional.ofNullable(equ.get("businessId")).map(String::valueOf).orElse("");
         String isCompleteXa = Optional.ofNullable(equ.get("isCompleteXa")).map(String::valueOf).orElse("");
         String useRegistrationCode = Optional.ofNullable(equ.get("useOrgCode")).map(String::valueOf).orElse("").trim();
@@ -2698,7 +2705,7 @@ public class DataDockServiceImpl {
                 IdxBizJgUseInfo useInfo = this.saveUseInfo(equ, record, dataSource, remark, null);
                 this.saveDesignInfo(equ, record);
                 this.saveFactoryInfo(equ, record);
-                IdxBizJgRegisterInfo registerInfo = this.saveRegisterInfo(equ, record, equList);
+                IdxBizJgRegisterInfo registerInfo = this.saveRegisterInfo(equ, record, equCategory, null);
                 // 西安导入电梯属地监管部门处理
                 this.handleSupervisionOffice(equ);
                 this.saveSupervisionInfo(equ, record);

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

@@ -216,7 +216,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     }
 
     @Transactional(rollbackFor = Exception.class)
-    @GlobalTransactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 600000)
     public void flowExecute(Long id, String instanceId, String operate, String comment, Boolean update, String nextTaskId, JSONObject map) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
@@ -682,7 +682,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         });
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate, ProcessTaskDTO processTaskDTO) {
         List<String> roleListNext = new ArrayList<>();
         List<String> roleListAll = new ArrayList<>();