1.修改设备详情使用地址字段为区域

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -2534,6 +2534,7 @@ public class JGDPStatisticsServiceImpl {
         String county = "";
         String street = "";
         String fullAddress = "";
+        String fullArea = "";
 
         // 设备问题信息（大屏二级页面使用）
         LambdaQueryWrapper<SafetyProblemTracing> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -2553,14 +2554,17 @@ public class JGDPStatisticsServiceImpl {
             if (!ValidationUtil.isEmpty(useInfo.getProvince()) && !ValidationUtil.isEmpty(useInfo.getProvinceName())) {
                 province = useInfo.getProvince() + "_" + useInfo.getProvinceName();
                 fullAddress += useInfo.getProvinceName();
+                fullArea += useInfo.getProvinceName()+"/";
             }
             if (!ValidationUtil.isEmpty(useInfo.getCity()) && !ValidationUtil.isEmpty(useInfo.getCityName())) {
                 city = useInfo.getCity() + "_" + useInfo.getCityName();
                 fullAddress += useInfo.getCityName();
+                fullArea += useInfo.getCityName()+"/";
             }
             if (!ValidationUtil.isEmpty(useInfo.getCounty()) && !ValidationUtil.isEmpty(useInfo.getCountyName())) {
                 county = useInfo.getCounty() + "_" + useInfo.getCountyName();
                 fullAddress += useInfo.getCountyName();
+                fullArea += useInfo.getCountyName()+"/";
             }
             if (!ValidationUtil.isEmpty(useInfo.getFactoryUseSiteStreet()) && !ValidationUtil.isEmpty(useInfo.getStreetName())) {
                 street = useInfo.getFactoryUseSiteStreet() + "_" + useInfo.getStreetName();
@@ -2589,6 +2593,9 @@ public class JGDPStatisticsServiceImpl {
                 if (!ValidationUtil.isEmpty(fullAddress)) {
                     useInfoMap.put("fullAddress", fullAddress);
                 }
+                if(!ValidationUtil.isEmpty(fullArea)){
+                    useInfoMap.put("FULLAREA", fullArea.substring(0,fullArea.length()-1));
+                }
                 useInfoMap.put("useinfoSeq", useInfo.getSequenceNbr());
                 if (!ValidationUtil.isEmpty(useInfo.getLongitudeLatitude())) {
                     useInfoMap.put("longitudeLatitude", JSON.parseObject(useInfo.getLongitudeLatitude()));
@@ -2615,6 +2622,9 @@ public class JGDPStatisticsServiceImpl {
                 if (!ValidationUtil.isEmpty(fullAddress)) {
                     useInfoMap.put("FULLADDRESS", fullAddress);
                 }
+                if(!ValidationUtil.isEmpty(fullArea)){
+                    useInfoMap.put("FULLAREA", fullArea.substring(0,fullArea.length()-1));
+                }
                 useInfoMap.put("USEINFO_SEQ", useInfo.getSequenceNbr());
                 useInfoMap.put("USE_PLACE", useInfo.getUsePlace());
                 if (!ValidationUtil.isEmpty(useInfo.getLongitudeLatitude())) {

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_1000.json

@@ -153,7 +153,8 @@
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
-        { "key": "FULLADDRESS", "label": "区域" },
+        { "key": "FULLAREA", "label": "所属区域" },
+        { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
         { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_2000.json

@@ -157,7 +157,8 @@
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
-        { "key": "FULLADDRESS", "label": "区域" },
+        { "key": "FULLAREA", "label": "所属区域" },
+        { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
         { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },
@@ -168,7 +169,8 @@
         { "key": "EQU_CATEGORY", "label": "设备类别", "source": "param"  },
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
-        { "key": "FULLADDRESS", "label": "区域" },
+        { "key": "FULLAREA", "label": "所属区域" },
+        { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
         { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },
@@ -178,7 +180,8 @@
         { "key": "EQU_LIST", "label": "气瓶品种" },
         { "key": "PRODUCT_NAME", "label": "产品名称" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
-        { "key": "FULLADDRESS", "label": "区域" },
+        { "key": "FULLAREA", "label": "所属区域" },
+        { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
         { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_3000.json

@@ -153,7 +153,8 @@
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
-        { "key": "FULLADDRESS", "label": "区域" },
+        { "key": "FULLAREA", "label": "所属区域" },
+        { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
         { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_4000.json

@@ -149,7 +149,8 @@
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
-        { "key": "FULLADDRESS", "label": "区域" },
+        { "key": "FULLAREA", "label": "所属区域" },
+        { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
         { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_5000.json

@@ -145,7 +145,8 @@
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
-        { "key": "FULLADDRESS", "label": "区域" },
+        { "key": "FULLAREA", "label": "所属区域" },
+        { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
         { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_6000.json

@@ -139,7 +139,8 @@
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
-        { "key": "FULLADDRESS", "label": "区域" },
+        { "key": "FULLAREA", "label": "所属区域" },
+        { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
         { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_8000.json

@@ -145,7 +145,8 @@
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
-        { "key": "FULLADDRESS", "label": "区域" },
+        { "key": "FULLAREA", "label": "所属区域" },
+        { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
         { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },
@@ -156,7 +157,8 @@
         { "key": "EQU_CATEGORY", "label": "设备类别", "source": "param"  },
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
-        { "key": "FULLADDRESS", "label": "区域" },
+        { "key": "FULLAREA", "label": "所属区域" },
+        { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
         { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_9000.json

@@ -145,7 +145,8 @@
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
-        { "key": "FULLADDRESS", "label": "区域" },
+        { "key": "FULLAREA", "label": "所属区域" },
+        { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
         { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },