修改ip

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

@@ -353,13 +353,22 @@ public class FzssServiceImpl implements IFzssService {
                     }
                 } else {
                     // 删除不符合条件的地块
-                    List<String> tableIds = analyseUtilsDBService.intersectsTableWkt(rawTable, null, calculateEwkt);
                     if (factorSpatialVo.getDefaultType().equals("lt") || factorSpatialVo.getDefaultType().equals("let")) {
                         // 删除不包含的地块
-                        tableDateService.delOutIds(rawTable, tableIds);
+                        if (calculateEwkt.equals("")) {
+                            iLogService.saveLog(taskId, "辅助选址", factorUseDTO.getFactorName() + "因子影响分析完成,未找到符合要求地块", "info");
+                            updateFzxzStatus(taskId, Rwzt.getNoJX());
+                            return "";
+                        } else {
+                            List<String> tableIds = analyseUtilsDBService.intersectsTableWkt(rawTable, null, calculateEwkt);
+                            tableDateService.delOutIds(rawTable, tableIds);
+                        }
                     } else {
-                        // 删除包含的地块
-                        tableDateService.delInIds(rawTable, tableIds);
+                        if (!calculateEwkt.equals("")) {
+                            // 删除包含的地块
+                            List<String> tableIds = analyseUtilsDBService.intersectsTableWkt(rawTable, null, calculateEwkt);
+                            tableDateService.delInIds(rawTable, tableIds);
+                        }
                     }
                 }
             }

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

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