添加行政区划名称

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/tdgy/TdgyMapper.java

@@ -40,4 +40,7 @@ public interface TdgyMapper extends BaseMapper<TdgySjDTO> {
     List<Map<String, Object>> getAreaByReason(@Param("startTime") String startTime,
                                               @Param("endTime") String endTime,
                                               @Param("districtCode") String districtCode);
+
+    @Slave
+    List<Map<String, Object>> getDistrict();
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/tdgy/TdtjServiceImp.java

@@ -65,12 +65,22 @@ public class TdtjServiceImp implements TdtjService {
         List<Map<String, Object>> listRes = new ArrayList<>();
         List<Map<String, Object>> districtMaps = tdgyMapper.getAreaByDistrict(startTime, endTime);
 
+        // 获取行政区划数据
+        List<Map<String, Object>> xzqhs = tdgyMapper.getDistrict();
+        Map<String,String> xzqhMap=new HashMap<>();
+        for (Map<String, Object> itemMap : xzqhs) {
+            xzqhMap.put(itemMap.get("id").toString(),itemMap.get("name").toString());
+        }
+
+
         // 循环totalMap
         for (Map<String, Object> districtMap : districtMaps) {
             String districtCode = districtMap.get("districtCode").toString();
 
             Map<String, Object> mapInfo = new HashMap<>();
-            mapInfo.put("districtName", "");
+            if(xzqhMap.containsKey(districtCode)){
+                mapInfo.put("districtName", xzqhMap.get(districtCode));
+            }
             mapInfo.put("districtCode", districtCode);
             mapInfo.put("totalArea", districtMap.get("totalArea"));
             mapInfo.put("confirmAre", districtMap.get("confirmArea"));

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/tdgy/TdgyMapper.xml

@@ -21,12 +21,12 @@
     </select>
 
     <select id="getLandCountArea" resultType="map">
-        select count(*) as total, COALESCE(sum(ts.crmj::NUMERIC),0) as area
+        select count(*) as total, COALESCE(sum(ts.crmj::NUMERIC), 0) as area
         from tdgy_sj ts
     </select>
 
     <select id="getCountAreaSuspected" resultType="map">
-        SELECT count(ts.id) AS total, COALESCE(sum(ts.crmj::NUMERIC),0) AS area
+        SELECT count(ts.id) AS total, COALESCE(sum(ts.crmj::NUMERIC), 0) AS area
         FROM tdgy_sj ts
         WHERE (ts.sfjg != true OR ts.sfjg IS NULL)
           AND (NOW() > ts.ydkgsj)
@@ -105,4 +105,8 @@
         GROUP BY confirm.idle_reason
     </select>
 
+    <select id="getDistrict" resultType="map">
+        SELECT id, name
+        from vector.xzqh
+    </select>
 </mapper>