From 9ceec267ba036ad81caadace7cec9dc6f338a239 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 十月 2023 17:28:05 +0800
Subject: [PATCH] 修改地块同步数据功能

---
 src/main/java/com/smartearth/poiexcel/controller/DkController.java |    2 +-
 src/main/java/com/smartearth/poiexcel/service/DkService.java       |   36 ++++++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/smartearth/poiexcel/controller/DkController.java b/src/main/java/com/smartearth/poiexcel/controller/DkController.java
index b8c08b9..e976452 100644
--- a/src/main/java/com/smartearth/poiexcel/controller/DkController.java
+++ b/src/main/java/com/smartearth/poiexcel/controller/DkController.java
@@ -96,7 +96,7 @@
     public ResponseMsg<Object> updateByCoord() {
         try {
             QueryWrapper<DkEntity> wrapper = new QueryWrapper<>();
-            wrapper.apply("length(dikuaibianhao) > 0");
+            wrapper.apply("point_area is null and lng is not null and lat is not null");
 
             List<DkEntity> list = dkMapper.selectList(wrapper);
             if (null == list || list.isEmpty()) {
diff --git a/src/main/java/com/smartearth/poiexcel/service/DkService.java b/src/main/java/com/smartearth/poiexcel/service/DkService.java
index 247a62f..59408b3 100644
--- a/src/main/java/com/smartearth/poiexcel/service/DkService.java
+++ b/src/main/java/com/smartearth/poiexcel/service/DkService.java
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.smartearth.poiexcel.entity.DkEntity;
 import com.smartearth.poiexcel.utils.RestHelper;
+import com.smartearth.poiexcel.utils.StringHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -24,7 +25,7 @@
 
     private final static String GET_INFO_URL = "%s/poisearch/guihuacon/getInfo?ydbm=%s";
 
-    private final static String GET_ENT_BASE_INFO = "%s/yqfwg/api/project/getEntBaseInfoForOtherSysListPage?ctoken=%s&showCount=%d&currentPage=%d";
+    private final static String GET_COORD_URL = "/geowinmap_xncs/ds?r=0.9158559377752831&serviceproviderid=map.vectorserviceprovider&serviceid=queryfeature&featcls=225鑼冨洿鍒嗗尯瑙勫垝.geojson&geom=true&requesttype=json";
 
     /**
      * 鏍规嵁缂栧彿鏇存柊
@@ -60,12 +61,12 @@
                 dk.setYdbh(yd.getString("ydbh"));
                 dk.setXmmc(yd.getString("xmmc"));
                 dk.setYdlx(yd.getString("ydlx"));
-                dk.setYdmj(getDouble(yd,"ydmj"));
+                dk.setYdmj(getDouble(yd, "ydmj"));
                 dk.setXmdz(yd.getString("xmdz"));
-                dk.setRjl(getDouble(yd,"rjl"));
+                dk.setRjl(getDouble(yd, "rjl"));
                 dk.setYdlxmc(yd.getString("ydlxmc"));
                 dk.setCyfx(yd.getString("cyfx"));
-                dk.setJzxg(getDouble(yd,"jzxg"));
+                dk.setJzxg(getDouble(yd, "jzxg"));
             }
 
             return true;
@@ -73,7 +74,7 @@
             log.error(ex.getMessage(), ex);
             return false;
         }
-  }
+    }
 
     private Integer getInteger(JSONObject obj, String key) {
         try {
@@ -96,7 +97,30 @@
      */
     public boolean updateByCoord(DkEntity dk) {
         try {
-            //
+            String url = host + GET_COORD_URL + "&lng=" + dk.getLng() + "&lat=" + dk.getLat();
+
+            RestTemplate rest = RestHelper.getRestTemplate();
+            String str = rest.getForObject(url, String.class);
+            if (StringHelper.isEmpty(str)) {
+                return false;
+            }
+            JSONObject obj = JSONObject.parseObject(str);
+            if (null == obj) {
+                return false;
+            }
+
+            dk.setArea(getDouble(obj, "area"));
+            dk.setNo(obj.getString("NO"));
+            dk.setJzgd(getDouble(obj, "寤虹瓚楂樺害锛�"));
+            dk.setPT2(obj.getString("PT2"));
+            dk.setGhrjl(getDouble(obj, "瑙勫垝瀹圭Н鐜�"));
+            dk.setQymc(obj.getString("QYMC"));
+            dk.setZt(getInteger(obj, "ZT"));
+            dk.setYdxz(obj.getString("鐢ㄥ湴鎬ц川"));
+            dk.setType(obj.getString("TYPE"));
+            dk.setJzgh(getDouble(obj, "瑙勫垝寤虹瓚瑙�"));
+            dk.setLtype(obj.getString("lType"));
+            dk.setPoint_area(obj.getString("geometry"));
 
             return true;
         } catch (Exception ex) {

--
Gitblit v1.9.3