|
@@ -186,7 +186,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
|
|
|
|
|
|
@Override
|
|
|
public List<TreeAnalyse> getStatistics() {
|
|
|
- // todo
|
|
|
+ // todo 通过接口调用全部数据
|
|
|
// 鄂尔多斯 1506
|
|
|
// 通过分页获取全部的数据
|
|
|
// sbSearchService.getLandMyAttendsData(2, 1, 10, " 1506", "");
|
|
@@ -227,7 +227,6 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
|
|
|
nodeMap.put(recordsDTO.getNodeName(), nodeList);
|
|
|
townNodeMap.put(townCode, nodeMap);
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
|
|
@@ -244,6 +243,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
|
|
|
|
|
|
|
|
|
TreeAnalyse treeAnalyse = new TreeAnalyse();
|
|
|
+ treeAnalyse.setLevel(2);
|
|
|
treeAnalyse.setId(tusexzqhDTO.getCode());
|
|
|
treeAnalyse.setXzqh(tusexzqhDTO.getTownship());//行政区划
|
|
|
treeAnalyse.setXzczs(villageNum);//行政村总数
|
|
@@ -306,7 +306,10 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
|
|
|
//组织区县数据
|
|
|
List<TreeAnalyse> countyTreeList = new ArrayList<>();
|
|
|
for (TusexzqhDTO tusexzqhDTO : countyList) {
|
|
|
+ if(tusexzqhDTO.getCounty().equals("市辖区"))continue;
|
|
|
+
|
|
|
TreeAnalyse treeAnalyse = new TreeAnalyse();
|
|
|
+ treeAnalyse.setLevel(1);
|
|
|
treeAnalyse.setId(tusexzqhDTO.getCode());
|
|
|
treeAnalyse.setXzqh(tusexzqhDTO.getCounty());//行政区划
|
|
|
if (townMap.containsKey(tusexzqhDTO.getCode())) {
|
|
@@ -337,6 +340,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
|
|
|
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);
|