添加乡镇统计

onemap-auth/src/main/resources/bootstrap.yml

@@ -16,10 +16,10 @@ spring:
       password: nacos
       discovery:
         # 服务注册地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-gateway/src/main/resources/bootstrap.yml

@@ -20,10 +20,10 @@ spring:
       password: nacos
       discovery:
         # 服务注册地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -39,7 +39,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 192.168.60.20:8848
+            server-addr: 127.0.0.1:8848
             dataId: sentinel-onemap-gateway
             groupId: DEFAULT_GROUP
             data-type: json

onemap-modules/onemap-analyse/src/main/resources/bootstrap.yml

@@ -19,10 +19,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-api/src/main/resources/bootstrap.yml

@@ -30,10 +30,10 @@ spring:
       password: nacos
       discovery:
         # 服务注册地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/res/TreeTownAnalyse.java

@@ -0,0 +1,25 @@
+package com.onemap.apply.domain.res;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class TreeTownAnalyse {
+    String id; //id
+    int level; //层级
+    String xzqh; //行政区划
+    int xzczs; //行政村总数
+//    int qxysbczs; //旗县已上报的村庄数
+    int ybaczs; //应备案村庄数
+    int sbdstczs; //上报到省厅村庄数
+    int wbscjd; //文本审查节点(补正)
+    int slsjbz; //矢量数据审查节点(机审)
+    int ybas; //已备案数(用地审查节点)
+    String bal; //备案率(%)(已备案数行政村总数)
+    int qxwsbczs;//旗县未上报的村庄数到省厅
+    List<String> wsbczs = new ArrayList<>(); //未上报村庄
+
+    List<TreeTownAnalyse> children;
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/sbjk/XzczghcgsbServiceImpl.java

@@ -10,6 +10,7 @@ import com.onemap.apply.domain.cggl.TCgglSjbzmlwjDto;
 import com.onemap.apply.domain.res.LandMyAttend;
 import com.onemap.apply.domain.res.LandMyAttendRes;
 import com.onemap.apply.domain.res.TreeAnalyse;
+import com.onemap.apply.domain.res.TreeTownAnalyse;
 import com.onemap.apply.domain.sbjk.TusexzqhDTO;
 import com.onemap.apply.domain.sbjk.XxghcgsbDTO;
 import com.onemap.apply.domain.sbjk.XzczghcgsbDTO;
@@ -410,9 +411,9 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
     }
 
     @Override
-    public List<TreeAnalyse> getTownshipStatistics() {
+    public List<TreeTownAnalyse> getTownshipStatistics() {
         int current = 1;
-        List<LandMyAttend.RecordsDTO> list = getAllLandMyAttendsData1(7, current, 60, "1506");
+        List<LandMyAttend.RecordsDTO> list = getAllLandMyAttendsData(7, current, 40, "1506");
         // 12位到村，9位乡镇，6位旗县
         // 根据divisionCode的前6位进行divisionCode分组数量
         Map<String, List<String>> qxCountMap = new HashMap<>();
@@ -463,15 +464,15 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
         List<TusexzqhDTO> countyList = tuseXzqhMapper.getAllCounty();
         List<TusexzqhDTO> cityList = tuseXzqhMapper.getAllCity();
         //组织旗县数据
-        List<TreeAnalyse> qxTreeList = new ArrayList<>();
+        List<TreeTownAnalyse> qxTreeList = new ArrayList<>();
         for (TusexzqhDTO tusexzqhDTO : countyList) {
             Integer townshipNum = tuseXzqhMapper.getAllTownshipNumByPid(tusexzqhDTO.getCode());
             Integer qxReportAllNum = tuseXzqhMapper.getCountyReportAllNum(tusexzqhDTO.getCode());//颖备案数
 
-            TreeAnalyse treeAnalyse = new TreeAnalyse();
+            TreeTownAnalyse treeAnalyse = new TreeTownAnalyse();
             treeAnalyse.setLevel(1);
             treeAnalyse.setId(tusexzqhDTO.getCode());
-            treeAnalyse.setXzqh(tusexzqhDTO.getTownship());//行政区划
+            treeAnalyse.setXzqh(tusexzqhDTO.getCounty());//行政区划
             treeAnalyse.setXzczs(townshipNum);//乡镇总数
 //            treeAnalyse.setQxysbczs(townReportNum);//旗县已上报的村庄数
             treeAnalyse.setYbaczs(qxReportAllNum);//应备案乡镇数
@@ -520,17 +521,17 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
 
 
 //        //按照区县编码组织成map结构
-//        Map<String, List<TreeAnalyse>> townMap = new HashMap<>();
-//        for (TreeAnalyse treeAnalyse : townTreeList) {
+//        Map<String, List<TreeAnalyse>> qxMap = new HashMap<>();
+//        for (TreeAnalyse treeAnalyse : qxTreeList) {
 //            String id = treeAnalyse.getId();
 //            // 截取前6位
 //            String key = id.substring(0, 6);
-//            if (townMap.containsKey(key)) {
-//                townMap.get(key).add(treeAnalyse);
+//            if (qxMap.containsKey(key)) {
+//                qxMap.get(key).add(treeAnalyse);
 //            } else {
 //                List<TreeAnalyse> treeAnalyses = new ArrayList<>();
 //                treeAnalyses.add(treeAnalyse);
-//                townMap.put(key, treeAnalyses);
+//                qxMap.put(key, treeAnalyses);
 //            }
 //        }
         //组织区县数据
@@ -573,43 +574,42 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
 //            }
 //            countyTreeList.add(treeAnalyse);
 //        }
-        //组织市数据
-//        List<TreeAnalyse> cityTreeList = new ArrayList<>();
-//        for (TusexzqhDTO tusexzqhDTO : cityList) {
-//            TreeAnalyse treeAnalyse = new TreeAnalyse();
-//            treeAnalyse.setLevel(0);
-//            treeAnalyse.setId(tusexzqhDTO.getCode());
-//            treeAnalyse.setXzqh(tusexzqhDTO.getCity());//行政区划
-//            treeAnalyse.setChildren(countyTreeList);
-//            for (TreeAnalyse analyse : countyTreeList) {
-//                //行政村总数
-//                treeAnalyse.setXzczs(analyse.getXzczs() + treeAnalyse.getXzczs());
-////                //旗县已上报的村庄数
-////                treeAnalyse.setQxysbczs(analyse.getQxysbczs() + treeAnalyse.getQxysbczs());
-//                //上报到省厅村庄数
-//                treeAnalyse.setSbdstczs(analyse.getSbdstczs() + treeAnalyse.getSbdstczs());
-//                //应备案村庄数
-//                treeAnalyse.setYbaczs(analyse.getYbaczs() + treeAnalyse.getYbaczs());
-//                //补正，机审，用地审查节点
-//                treeAnalyse.setWbscjd(analyse.getWbscjd() + treeAnalyse.getWbscjd());
-//                treeAnalyse.setSlsjbz(analyse.getSlsjbz() + treeAnalyse.getSlsjbz());
-//                treeAnalyse.setYbas(analyse.getYbas() + treeAnalyse.getYbas());
-//                //未上报村庄
-//                treeAnalyse.setQxwsbczs(analyse.getQxwsbczs() + treeAnalyse.getQxwsbczs());
-//            }
-//            // 备案率
-//            if (treeAnalyse.getYbaczs() == 0) {
-//                treeAnalyse.setBal("--");
-//            } else {
-//                float bal = (float) treeAnalyse.getYbas() / (float) treeAnalyse.getYbaczs();
-//                DecimalFormat df = new DecimalFormat("0.0%");
-//                treeAnalyse.setBal(df.format(bal));
-//            }
-//
-//            cityTreeList.add(treeAnalyse);
-//        }
-//        return cityTreeList;
-            return null;
+//        组织市数据
+        List<TreeTownAnalyse> cityTreeList = new ArrayList<>();
+        for (TusexzqhDTO tusexzqhDTO : cityList) {
+            TreeTownAnalyse treeAnalyse = new TreeTownAnalyse();
+            treeAnalyse.setLevel(0);
+            treeAnalyse.setId(tusexzqhDTO.getCode());
+            treeAnalyse.setXzqh(tusexzqhDTO.getCity());//行政区划
+            treeAnalyse.setChildren(qxTreeList);
+            for (TreeTownAnalyse analyse : qxTreeList) {
+                //行政村总数
+                treeAnalyse.setXzczs(analyse.getXzczs() + treeAnalyse.getXzczs());
+//                //旗县已上报的村庄数
+//                treeAnalyse.setQxysbczs(analyse.getQxysbczs() + treeAnalyse.getQxysbczs());
+                //上报到省厅村庄数
+                treeAnalyse.setSbdstczs(analyse.getSbdstczs() + treeAnalyse.getSbdstczs());
+                //应备案村庄数
+                treeAnalyse.setYbaczs(analyse.getYbaczs() + treeAnalyse.getYbaczs());
+                //补正，机审，用地审查节点
+                treeAnalyse.setWbscjd(analyse.getWbscjd() + treeAnalyse.getWbscjd());
+                treeAnalyse.setSlsjbz(analyse.getSlsjbz() + treeAnalyse.getSlsjbz());
+                treeAnalyse.setYbas(analyse.getYbas() + treeAnalyse.getYbas());
+                //未上报村庄
+                treeAnalyse.setQxwsbczs(analyse.getQxwsbczs() + treeAnalyse.getQxwsbczs());
+            }
+            // 备案率
+            if (treeAnalyse.getYbaczs() == 0) {
+                treeAnalyse.setBal("--");
+            } else {
+                float bal = (float) treeAnalyse.getYbas() / (float) treeAnalyse.getYbaczs();
+                DecimalFormat df = new DecimalFormat("0.0%");
+                treeAnalyse.setBal(df.format(bal));
+            }
+
+            cityTreeList.add(treeAnalyse);
+        }
+        return cityTreeList;
     }
 
     /**

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/sbjk/XzczghcgsbService.java

@@ -2,6 +2,7 @@ package com.onemap.apply.service.sbjk;
 
 
 import com.onemap.apply.domain.res.TreeAnalyse;
+import com.onemap.apply.domain.res.TreeTownAnalyse;
 import com.onemap.apply.domain.sbjk.XzczghcgsbDTO;
 import com.onemap.common.core.web.domain.AjaxResult;
 import com.onemap.common.core.web.domain.RequestResult;
@@ -34,7 +35,7 @@ public interface XzczghcgsbService {
     /**
      * 获取乡镇上报统计
      */
-    public List<TreeAnalyse> getTownshipStatistics();
+    public List<TreeTownAnalyse> getTownshipStatistics();
     /**
      * 新增记录
      *

onemap-modules/onemap-apply/src/main/resources/bootstrap.yml

@@ -31,10 +31,10 @@ spring:
       password: nacos
       discovery:
         # 服务注册地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-file/src/main/resources/bootstrap.yml

@@ -35,10 +35,10 @@ spring:
       password: nacos
       discovery:
         # 服务注册地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-gen/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-job/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-system/src/main/resources/bootstrap.yml

@@ -16,10 +16,10 @@ spring:
       password: nacos
       discovery:
         # 服务注册地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-vector/src/main/resources/bootstrap.yml

@@ -36,10 +36,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-visual/onemap-monitor/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 192.168.60.20:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置