镇域字段判断优化。

src/main/java/com/skyversation/poiaddr/addquery/AddressQueryEngine.java

@@ -269,7 +269,7 @@ public class AddressQueryEngine {
         } else {
             AreaService areaService = AreaService.getInstance();
             for (AddressResult.ContentBean content : result.getData()) {
-                if ((content.getAdname() == null || content.getCityname() == null) && content.getLat() != null && content.getLon() != null) {
+                if ((content.getAdname() == null || content.getAdname().isEmpty() || content.getCityname() == null || content.getCityname().isEmpty()) && content.getLat() != null && content.getLon() != null) {
                     GeoJsonBean adBean = areaService.isInadPolygon(content.getLon(), content.getLat());
                     content.setAdJson(adBean == null ? new JSONObject() : adBean.getProperties());
                     GeoJsonBean townBean = areaService.isInTownPolygon(content.getLon(), content.getLat());

src/main/java/com/skyversation/poiaddr/service/AreaService.java

@@ -135,7 +135,7 @@ public class AreaService {
 
     public GeoJsonBean isInadPolygon(double lon, double lat) {
         try {
-            Geometry point = reader.read("POINT (" + lon + " " + lat + ")");
+            Geometry point = reader.read("POINT (" + lat + " " + lon + ")");
             for (GeoJsonBean bean : shAllAdministrativeDivisionPolygonList) {
                 if (bean.getMultiPolygon().contains(point)) {
                     return bean;
@@ -149,7 +149,7 @@ public class AreaService {
 
     public GeoJsonBean isInTownPolygon(double lon, double lat) {
         try {
-            Geometry point = reader.read("POINT (" + lon + " " + lat + ")");
+            Geometry point = reader.read("POINT (" + lat + " " + lon + ")");
             for (GeoJsonBean bean : shAllToensPolygonList) {
                 if (bean.getMultiPolygon().contains(point)) {
                     return bean;

src/main/java/com/skyversation/poiaddr/service/impl/SjArrDzbzhSjWcbryDzxxServiceImpl.java

@@ -229,12 +229,12 @@ public class SjArrDzbzhSjWcbryDzxxServiceImpl {
                                             String lng = contentBean.getLon() + "";
                                             String lat = contentBean.getLat() + "";
                                             item.setInTheArea("是");
-                                            if (contentBean.getAdname() != null) {
+                                            if (contentBean.getAdname() != null && !contentBean.getAdname().isEmpty()) {
                                                 item.setTwon(contentBean.getAdname());
                                             } else if (contentBean.getTownJson().getString("name") != null) {
                                                 item.setTwon(contentBean.getTownJson().getString("name"));
                                             }
-                                            if (contentBean.getCityname() != null) {
+                                            if (contentBean.getCityname() != null && !contentBean.getCityname().isEmpty()) {
                                                 item.setAdministrativeDivision(contentBean.getCityname());
                                             } else if (contentBean.getAdJson().getString("name") != null) {
                                                 item.setAdministrativeDivision(contentBean.getAdJson().getString("name"));

src/main/java/com/skyversation/poiaddr/util/tasks/ScheduledTasks.java

@@ -15,7 +15,7 @@ public class ScheduledTasks {
     /**
      * 全量跑C表数据
      */
-    @Scheduled(cron = "0 0 1 * * *")
+    @Scheduled(cron = "0 20 11 * * *")
     public void executeAtOneOClock() {
         System.out.println("定时开始执行，当前时间：" + new Date());
         // 在这里编写具体的业务逻辑