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/dto/EquipRequestParamsDto.java

@@ -54,4 +54,5 @@ public class EquipRequestParamsDto {
     private String useDate;
     private String startLatitudeLongitude;
     private String endLatitudeLongitude;
+    private String equState;
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipmentInfoDto.java

@@ -23,6 +23,7 @@ public class EquipmentInfoDto {
     private String receiveOrgCode;
     private String receiveOrgName;
     private String possession;
+    private String equState;
 
     /**
      * 属地监管部门：orgCode_名称

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

@@ -374,7 +374,12 @@ public class DataDockServiceImpl {
             useInfo.setIsNotEs("1");
             useInfo.setIsIntoManagement(Boolean.FALSE);
             useInfo.setRemark(remark);
-            //useInfo.setEquState(EquimentEnum.ZAIYONG.getCode()+"");
+            if (Arrays.asList("jg_his","jg_his_black","jg_his_xa","jg_his_black_pl","jg_his_pl").contains(dataSource)){
+                String equState = Optional.ofNullable(equ.get("EQU_STATE"))
+                        .map(Object::toString)
+                        .orElse(String.valueOf(EquimentEnum.ZAIYONG.getCode()));
+                useInfo.setEquState(equState);
+            }
             useInfo.setProjectContraptionId(Objects.toString(equ.get("projectContraptionId"), ""));
             useInfo.setIsNotXiXian("0");
             idxBizJgUseInfoService.save(useInfo);
@@ -1859,6 +1864,7 @@ public class DataDockServiceImpl {
         String address = Objects.toString(equipInfo.get("address"), null);
         String usePlace = Objects.toString(equipInfo.get("usePlace"), null);
         String useDate = Objects.toString(equipInfo.get("useDate"), null);
+        String equState = Objects.toString(equipInfo.get("EQU_STATE"), null);
         return new EquipRequestParamsDto().setCompanyCode(company.getCompanyCode().split("_")[0])
                 .setProvince(province)
                 .setProvinceName("陕西省")
@@ -1916,6 +1922,7 @@ public class DataDockServiceImpl {
                 .setInspectUnitName(inspectUnitName)
                 .setStartLatitudeLongitude(toJSONString(equipInfo.get("startLatitudeLongitude")))
                 .setEndLatitudeLongitude(toJSONString(equipInfo.get("endLatitudeLongitude")))
+                .setEquState(equState)
                 .setEquCode(installationNoticeService.generateEquCode(equListCode, equCategoryCode, equDefineCode, new Date(), receiveOrgCode));
     }
 
@@ -2002,7 +2009,7 @@ public class DataDockServiceImpl {
             useInfo.setCreateDate(new Date());
             useInfo.setDataSource(paramsDto.getDataSource());
             useInfo.setIsIntoManagement(Boolean.TRUE);
-            useInfo.setEquState(EquimentEnum.ZAIYONG.getCode().toString());
+            useInfo.setEquState(Optional.ofNullable(paramsDto.getEquState()).orElse(String.valueOf(EquimentEnum.ZAIYONG.getCode())));
             useInfo.setUseUnitCreditCode(paramsDto.getCompanyCode());
             useInfo.setUseUnitName(paramsDto.getCompanyName());
             useInfo.setProjectContraption(paramsDto.getProjectContraption());
@@ -2110,7 +2117,8 @@ public class DataDockServiceImpl {
             esEquipmentDto.setEQU_DEFINE_CODE(paramsDto.getEquDefineCode());
             esEquipmentDto.setEQU_DEFINE(paramsDto.getEquDefineName());
             esEquipmentDto.setSTATUS("已认领");
-            esEquipmentDto.setEQU_STATE(EquimentEnum.ZAIYONG.getCode());
+            esEquipmentDto.setEQU_STATE(Optional.ofNullable(paramsDto.getEquState())
+                            .map(Integer::valueOf).orElse(EquimentEnum.ZAIYONG.getCode()));
             esEquipmentDto.setUSC_UNIT_CREDIT_CODE(pipeline.getUscUnitCreditCode());
             esEquipmentDto.setUSC_UNIT_NAME(pipeline.getUscUnitName());
             esEquipmentDto.setPROJECT_CONTRAPTION(paramsDto.getProjectContraption());

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

@@ -3875,7 +3875,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     @Override
-    @GlobalTransactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
     public Object savePressureVesselData(Map<String, Object> paramMap) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         CompanyBo company = reginParams.getCompany();
@@ -3950,10 +3950,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             useInfo.setCreateDate(new Date());
             String source = equipInfoDto.getDataSource();
             useInfo.setDataSource("his".equals(source) ? "jg_his" : "black".equals(source) ? "jg_his_black" : "jg");// 区分历史设备和新增设备
-            useInfo.setEquState(null);
             useInfo.setIsIntoManagement("his".equals(equipInfoDto.getDataSource()));// 历史气瓶导入为已纳管设备
+
             // 历史气瓶导入设备状态为在用
-            useInfo.setEquState("his".equals(equipInfoDto.getDataSource()) ? EquimentEnum.ZAIYONG.getCode().toString() : EquimentEnum.WEIDENGJI.getCode().toString());
+            String equState = "his".equals(equipInfoDto.getDataSource())
+                    ? (Optional.ofNullable(equipInfoDto.getEquState())
+                    .filter(s -> !s.isEmpty())
+                    .orElse(String.valueOf(EquimentEnum.ZAIYONG.getCode())))
+                    : String.valueOf(EquimentEnum.WEIDENGJI.getCode());
+            useInfo.setEquState(equState);
             // 使用单位信息
             if ("个人主体".equals(company.getCompanyType())) {
                 useInfo.setUseUnitCreditCode(company.getCompanyCode().split("_")[1]);
@@ -4085,7 +4090,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             esEquipmentDto.setEQU_DEFINE(equipInfoDto.getEquDefine());
             esEquipmentDto.setINFORMATION_SITUATION(otherInfo.getInformationSituation());
             esEquipmentDto.setSTATUS("已认领");
-            esEquipmentDto.setEQU_STATE("his".equals(equipInfoDto.getDataSource()) ? EquimentEnum.ZAIYONG.getCode() : EquimentEnum.WEIDENGJI.getCode());
+            esEquipmentDto.setEQU_STATE(Integer.valueOf(equState));
 
             // 使用单位信息
             if ("个人主体".equals(company.getCompanyType())) {
@@ -4395,9 +4400,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if ("his".equals(equipmentInfoForm.get("DATA_SOURCE"))) {
             dto.setReceiveOrgCode(((String) equipmentInfoForm.get("RECEIVE_ORG_CODE")).split("_")[0]);
             dto.setReceiveOrgName(((String) equipmentInfoForm.get("RECEIVE_ORG_CODE")).split("_")[1]);
-            dto.setOrgBranchCode(equipmentInfoForm.getOrDefault("orgBranchCode","").toString());
+            dto.setOrgBranchCode(Optional.ofNullable(equipmentInfoForm.get("orgBranchCode")).map(Object::toString).orElse(""));
+            dto.setEquState(Optional.ofNullable(equipmentInfoForm.get("EQU_STATE")).map(Object::toString).orElse(""));
         }
-        dto.setPossession((String) equipmentInfoForm.get("VEHICLE_APANAGE"));
+        dto.setPossession(Optional.ofNullable(equipmentInfoForm.get("VEHICLE_APANAGE")).map(Object::toString).orElse(""));
         return dto;
     }
 

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

@@ -1889,7 +1889,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         param.put("ADDRESS", dataMap.getOrDefault("address", ""));
         param.put("USE_PLACE", usePlace);
         param.put("STATUS", "已认领");
-        param.put("EQU_STATE", 1);
+        param.put("EQU_STATE", Arrays.asList("1", "2").contains(jgUseRegistration.getRegType())
+                && useInfo.getEquState() != null ? useInfo.getEquState() : 1);
         // 更新es的下次检验日期
         param.put("NEXT_INSPECT_DATE", this.castDate2TimeStr(dataMap.getString("nextInspectDate")));
         param.put("USE_INNER_CODE", useInfo.getUseInnerCode());
@@ -4279,7 +4280,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     useInfo.setORegDate(String.valueOf(map.get("oRegDate")));
                     useInfo.setORegUnit(String.valueOf(map.get("oRegUnit")));
                     // 历史平台登记，将设备状态改为在用
+                    if(!map.containsKey("EQU_STATE")){
                         useInfo.setEquState(EquimentEnum.ZAIYONG.getCode().toString());
+                    }
                     usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() + "/" + useInfo.getStreetName();
                     useInfoMapper.updateById(useInfo);
                 }