修改url

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

@@ -15,11 +15,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.60.2:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.60.2:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -19,11 +19,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.60.2:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.60.2:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -34,13 +34,13 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 192.168.60.2:8718
+        dashboard: 127.0.0.1:8718
 
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 192.168.60.2:8848
+            server-addr: 127.0.0.1:8848
             dataId: sentinel-onemap-gateway
             groupId: DEFAULT_GROUP
             data-type: json

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/FzssServiceImpl.java

@@ -353,7 +353,7 @@ public class FzssServiceImpl implements IFzssService {
                         // 地块与因子求交集
                         rawTable = createUtilsDBService.intersectionTableWkt(rawTable, null, calculateEwkt);
                     } else {
-                        // TODO：永久基本农田暂时不做处理
+                        // TODO：永久基本农田暂时不做处理(太慢需要优化)
                         if(factorUseDTO.getFactorName().equals("永久基本农田"))continue;
                         // 地块与因子求差集
                         rawTable = createUtilsDBService.differenceTableWkt(rawTable, null, calculateEwkt);

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

@@ -20,11 +20,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.60.2:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.60.2:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -13,7 +13,7 @@ import java.util.Map;
 public interface LandIdleConfirmMapper extends BaseMapper<LandIdleConfirmDTO> {
     List<Map> getIdleLandList(IdleLandListVo idleLandListVo);
 
-    Integer getIdleLandListCount(IdleLandListVo idleLandListVo);
+    Map<String,Object> getIdleLandListInfo(IdleLandListVo idleLandListVo);
 
     LandIdleConfirmDTO getByLandId(String landId);
 }

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

@@ -14,6 +14,9 @@ import java.util.Map;
 public interface TdgyMapper extends BaseMapper<TdgySjDTO> {
     List<Map<String, Object>> getSuspectedIdleLand(@Param("key") String key, @Param("xzqh") String xzqh, @Param("limit") Integer limit, @Param("offset") Integer offset);
 
+    Map<String, Object> getSuspectedIdleInfo(@Param("key") String key, @Param("xzqh") String xzqh);
+
+
     @Slave
     Map<String, Object> getLandCountArea();
 
@@ -21,25 +24,18 @@ public interface TdgyMapper extends BaseMapper<TdgySjDTO> {
     Map<String, Object> getCountAreaSuspected();
 
     @Slave
-    Map<String, Object> getCountAreaConfirm(@Param("startTime") String startTime,
-                                            @Param("endTime") String endTime,
-                                            @Param("districtCode") String districtCode);
+    Map<String, Object> getCountAreaConfirm(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("districtCode") String districtCode);
 
     @Slave
-    Map<String, Object> getCountAreaDisposal(@Param("startTime") String startTime,
-                                             @Param("endTime") String endTime,
-                                             @Param("districtCode") String districtCode);
+    Map<String, Object> getCountAreaDisposal(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("districtCode") String districtCode);
 
     // 根据行政区划统计数据
     @Slave
-    List<Map<String, Object>> getAreaByDistrict(@Param("startTime") String startTime,
-                                                @Param("endTime") String endTime);
+    List<Map<String, Object>> getAreaByDistrict(@Param("startTime") String startTime, @Param("endTime") String endTime);
 
     // 根据闲置原因划统计数据
     @Slave
-    List<Map<String, Object>> getAreaByReason(@Param("startTime") String startTime,
-                                              @Param("endTime") String endTime,
-                                              @Param("districtCode") String districtCode);
+    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/TdgyServiceImp.java

@@ -122,11 +122,12 @@ public class TdgyServiceImp implements TdgyService {
     @Override
     public RequestResult getSuspectedIdleLand(String key, String xzqh, Integer limit, Integer offset) {
         List<Map<String, Object>> list = tdgyMapper.getSuspectedIdleLand(key, xzqh, limit, offset);
+        Map<String, Object> infoMap = tdgyMapper.getSuspectedIdleInfo(key, xzqh);
+
         Map<String, Object> map = new HashMap<>();
         map.put("list", list);
-        // TODO 总数，总面积
-        map.put("count", list.size());
-        map.put("area", 100);
+        map.put("count", infoMap.get("total"));
+        map.put("area", infoMap.get("area"));
         return RequestResult.success(map);
     }
 
@@ -190,13 +191,12 @@ public class TdgyServiceImp implements TdgyService {
         idleLandListVo.setLimit(idleLandListVo.getPageSize());
         idleLandListVo.setOffset((idleLandListVo.getPageNum() - 1) * idleLandListVo.getPageSize());
         List<Map> mapList = landIdleConfirmMapper.getIdleLandList(idleLandListVo);
-        Integer count = landIdleConfirmMapper.getIdleLandListCount(idleLandListVo);
+        Map<String,Object> infoMap = landIdleConfirmMapper.getIdleLandListInfo(idleLandListVo);
 
         Map<String, Object> map = new HashMap<>();
         map.put("list", mapList);
-        map.put("count", count);
-        // TODO 总面积
-        map.put("area", 100);
+        map.put("count", infoMap.get("total"));
+        map.put("area", infoMap.get("area"));
         return RequestResult.success(map);
     }
 

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

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

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

@@ -28,8 +28,8 @@
         ORDER BY td.id
         LIMIT #{limit} OFFSET #{offset}
     </select>
-    <select id="getIdleLandListCount" resultType="Integer">
-        SELECT COUNT(td.id)
+    <select id="getIdleLandListInfo" resultType="Integer">
+        SELECT COUNT(td.id) as total, COALESCE(SUM(td.crmj::NUMERIC), 0) as area
         FROM base.t_land_idle_confirm AS confirm
         JOIN vector.tdgy_sj AS td ON confirm.land_id = td.id::VARCHAR
         WHERE confirm.is_idle = #{isConfirm} AND confirm.is_disposal = #{isDisposal}

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

@@ -20,6 +20,21 @@
         LIMIT #{limit} OFFSET #{offset};
     </select>
 
+    <select id="getSuspectedIdleInfo" resultType="map">
+        SELECT count(*) 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)
+        AND ts.sfkg != true
+        AND ts.id::varchar NOT IN (SELECT land_id FROM base.t_land_idle_confirm)
+        <if test="key != null and key != ''">
+            AND (ts.xmmc LIKE '%' || #{key} || '%' OR ts.srf LIKE '%' || #{key} || '%')
+        </if>
+        <if test="xzqh != null and xzqh != ''">
+            AND ts.xzqh LIKE #{xzqh}|| '%'
+        </if>
+    </select>
+
     <select id="getLandCountArea" resultType="map">
         select count(*) as total, COALESCE(sum(ts.crmj::NUMERIC), 0) as area
         from tdgy_sj ts

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

@@ -34,11 +34,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.60.2:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.60.2:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

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

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

@@ -20,11 +20,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.60.2:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.60.2:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -15,11 +15,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.60.2:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.60.2:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置