Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

@@ -380,7 +380,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                 if (BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName().equals(regType)) {
                     JgVehicleInformation vehicleInformation = jgVehicleInformationService.getOne(
                             new LambdaQueryWrapper<JgVehicleInformation>()
-                                    .eq(JgVehicleInformation::getUseRegistrationCertificate, useRegistrationCode));
+                                    .eq(JgVehicleInformation::getUseRegistrationCode, useRegistrationCode));
                     sequenceNbr = String.valueOf(vehicleInformation.getSequenceNbr());
                     jgVehicleInformationService.exportVehicleUseRegistrationCertificate(sequenceNbr, response, getPrintTypeCode(printType));
                 } else if (BusinessTypeEnum.JG_USAGE_REGISTRATION.getName().equals(regType)) {

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

@@ -83,6 +83,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -2510,6 +2511,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 jgUseRegistration.setIsXixian(String.valueOf(map.get("isXixian")));
             }
             // 使用地点
+            String useCityName = "";
+            String useCountyName = "";
+            String useStreetName = "";
             // 市
             List<LinkedHashMap> city = (List<LinkedHashMap>) redisUtils.get("CITY");
             // 区
@@ -2520,29 +2524,38 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 城市
             if (!ObjectUtils.isEmpty(map.get("city")) && !ObjectUtils.isEmpty(city)) {
                 JSONObject finalMap = map;
+                AtomicReference<String> atomicUseCity = new AtomicReference<>(useCityName);
                 city.forEach(item -> {
                     if (String.valueOf(item.get("regionCode")).equals(String.valueOf(finalMap.get("city")))) {
+                        atomicUseCity.set("" + item.get("regionName"));
                         jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
                     }
                 });
+                useCityName = atomicUseCity.get();
             }
             // 区县
             if (!ObjectUtils.isEmpty(map.get("county")) && !ObjectUtils.isEmpty(city)) {
                 JSONObject finalMap1 = map;
+                AtomicReference<String> atomicUseCounty = new AtomicReference<>(useCountyName);
                 region.forEach(item -> {
                     if (String.valueOf(item.get("regionCode")).equals(String.valueOf(finalMap1.get("county")))) {
+                        atomicUseCounty.set( "" + item.get("regionName"));
                         jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
                     }
                 });
+                useCountyName = atomicUseCounty.get();
             }
             // 街道
             if (!ObjectUtils.isEmpty(map.get("factoryUseSiteStreet")) && !ObjectUtils.isEmpty(city)) {
                 JSONObject finalMap2 = map;
+                AtomicReference<String> atomicUseStreet = new AtomicReference<>(useStreetName);
                 street.forEach(item -> {
                     if (String.valueOf(item.get("regionCode")).equals(String.valueOf(finalMap2.get("factoryUseSiteStreet")))) {
+                        atomicUseStreet.set( "" + item.get("regionName"));
                         jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
                     }
                 });
+                useStreetName = atomicUseStreet.get();
             }
             jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + map.get("address"));
 
@@ -2579,11 +2592,21 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 TaskV2Model taskV2Model = new TaskV2Model();
                 taskV2Model.setRoutePath("");
 
+                //监督管理信息
+                LambdaQueryWrapper<IdxBizJgSupervisionInfo> lambdaSup = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda();
+                lambdaSup.eq(IdxBizJgSupervisionInfo::getRecord, jgRelationEquip.getEquId());
+                IdxBizJgSupervisionInfo supervisionInfo = idxBizJgSupervisionInfoMapper.selectOne(lambdaSup);
+                supervisionInfo.setOrgBranchCode(String.valueOf(map.get("orgBranchCode")).split("_")[0]);
+                supervisionInfo.setOrgBranchName(String.valueOf(map.get("orgBranchCode")).split("_")[1]);
+                idxBizJgSupervisionInfoMapper.updateById(supervisionInfo);
+
                 // 注册信息
                 LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
                 lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, jgRelationEquip.getEquId());
                 IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
                 registerInfo.setUseOrgCode(jgUseRegistration.getUseRegistrationCode());
+                String equCode = this.getEquCode(registerInfo, jgUseRegistration.getReceiveCompanyCode());
+                registerInfo.setEquCode(equCode);// 设备代码
                 idxBizJgRegisterInfoMapper.updateById(registerInfo);
 
                 // 查询设备制造信息
@@ -2601,12 +2624,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 useInfo.setUseUnitName(String.valueOf(map.get("useUnitName")));
                 useInfo.setProvince("610000");
                 useInfo.setProvinceName("陕西省");
-                useInfo.setCity(String.valueOf(map.get("city")).split("_")[0]);
-                // useInfo.setCityName(String.valueOf(map.get("city")).split("_")[1]);
-                useInfo.setCounty(String.valueOf(map.get("county")).split("_")[0]);
-                // useInfo.setCountyName(String.valueOf(map.get("county")).split("_")[1]);
-                useInfo.setFactoryUseSiteStreet(String.valueOf(map.get("factoryUseSiteStreet")).split("_")[0]);
-                // useInfo.setStreetName(String.valueOf(map.get("factoryUseSiteStreet")).split("_")[1]);
+                useInfo.setCity(String.valueOf(map.get("city")));
+                useInfo.setCityName(useCityName);
+                useInfo.setCounty(String.valueOf(map.get("county")));
+                useInfo.setCountyName(useCountyName);
+                useInfo.setFactoryUseSiteStreet(String.valueOf(map.get("factoryUseSiteStreet")));
+                useInfo.setStreetName(useStreetName);
                 useInfo.setAddress(String.valueOf(map.get("address")));
                 useInfo.setIsNotXiXian(String.valueOf(map.get("isXixian")));
                 useInfo.setEstateUnitCreditCode(String.valueOf(map.get("estateUnitName")).split("_")[0]);
@@ -2621,7 +2644,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 this.createCode(map, jgUseRegistration, registerInfo, useInfo, otherInfo);
 
                 // 更新es
-                updateEsData(usePlace, map, otherInfo, jgUseRegistration, map);
+                this.updateEsData(usePlace, map, otherInfo, jgUseRegistration, map);
 
                 // 设备安装信息更新
                 this.historyEquUpdateInstallInfo(map);
@@ -2630,7 +2653,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 this.historyEquUpdateMaintenanceInfo(map);
 
                 // 历史设备 生成证书管理表记录 & 生成安装 维保等操作记录
-                historyEquGenManageRelated(map,jgUseRegistration, registerInfo,idxBizJgFactoryInfo);
+                this.historyEquGenManageRelated(map,jgUseRegistration, registerInfo,idxBizJgFactoryInfo);
 
             }
             return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory.json

@@ -86,18 +86,6 @@
       "name": "报废",
       "code": "BF_ZX",
       "image": "upload/tzs/common/image/注销报废.png"
-    },
-    {
-      "name": "设备启用",
-      "code": "SB_QY",
-      "image": "upload/tzs/common/image/设备启用.png",
-      "disabled": true
-    },
-    {
-      "name": "设备停用",
-      "code": "SB_TY",
-      "image": "upload/tzs/common/image/设备停用.png",
-      "disabled": true
     }
   ],
   "XZSB": [

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory0715.json

+{
+  "YWCJ": [
+    {
+      "dictDataKey": "0",
+      "dictDataValue": "按设备种类",
+      "dictDataDesc": "upload/tzs/common/image/按照设备种类选择.png"
+    },
+    {
+      "dictDataKey": "1",
+      "dictDataValue": "按应用场景",
+      "dictDataDesc": "upload/tzs/common/image/按照应用场景选择.png"
+    }
+  ],
+  "SGGZ": [
+    {
+      "name": "安装告知",
+      "code": "GZ_AZ",
+      "image": "upload/tzs/common/image/安装告知.png"
+    },
+    {
+      "name": "改造告知",
+      "code": "GZ_GZ",
+      "image": "upload/tzs/common/image/改造告知.png"
+    },
+    {
+      "name": "维修告知",
+      "code": "GZ_WX",
+      "image": "upload/tzs/common/image/维修告知.png"
+    },
+    {
+      "name": "移装告知",
+      "code": "GZ_YZ",
+      "image": "upload/tzs/common/image/移装告知.png"
+    }
+  ],
+  "DJGL": [
+    {
+      "name": "使用登记",
+      "code": "DJ_SY",
+      "image": "upload/tzs/common/image/使用登记.png"
+    },
+    {
+      "name": "改造变更登记",
+      "code": "DJ_GZ",
+      "image": "upload/tzs/common/image/改造变更登记.png"
+    },
+    {
+      "name": "移装变更登记",
+      "code": "DJ_YZ",
+      "image": "upload/tzs/common/image/移装变更登记.png"
+    },
+    {
+      "name": "单位变更登记",
+      "code": "DJ_DW",
+      "image": "upload/tzs/common/image/单位变更登记.png"
+    },
+    {
+      "name": "更名变更登记",
+      "code": "DJ_GM",
+      "image": "upload/tzs/common/image/更名变更登记.png"
+    }
+  ],
+  "WBBA": [
+    {
+      "name": "维保备案",
+      "code": "WB_BA",
+      "image": "upload/tzs/common/image/维保备案.png"
+    }
+  ],
+  "SBYJ": [
+    {
+      "name": "设备移交",
+      "code": "SB_YJ",
+      "image": "upload/tzs/common/image/设备移交.png"
+    }
+  ],
+  "QTBF": [
+    {
+      "name": "设备启用",
+      "code": "SB_QY",
+      "image": "upload/tzs/common/image/设备启用.png"
+    },
+    {
+      "name": "设备停用",
+      "code": "SB_TY",
+      "image": "upload/tzs/common/image/设备停用.png"
+    },
+    {
+      "name": "注销",
+      "code": "BF_YZ",
+      "image": "upload/tzs/common/image/移装报废.png"
+    },
+    {
+      "name": "报废",
+      "code": "BF_ZX",
+      "image": "upload/tzs/common/image/注销报废.png"
+    }
+  ],
+  "XZSB": [
+    {
+      "name": "新增设备",
+      "code": "SB_XZ",
+      "image": "upload/tzs/common/image/新增设备.png"
+    },
+    {
+      "name": "批量导入",
+      "code": "PL_DR",
+      "image": "upload/tzs/common/image/新增设备.png"
+    }
+  ]
+}
\ No newline at end of file