diff --git a/setup-project-manager/src/main/java/com/mortals/xhx/daemon/task/CheckProjectStatusTaskImpl.java b/setup-project-manager/src/main/java/com/mortals/xhx/daemon/task/CheckProjectStatusTaskImpl.java index ad08627e3c886eb78a6e12ae2b682602322c7791..414aa8b1ecdc2caf1b5781c9e3f0cb90146e85b6 100644 --- a/setup-project-manager/src/main/java/com/mortals/xhx/daemon/task/CheckProjectStatusTaskImpl.java +++ b/setup-project-manager/src/main/java/com/mortals/xhx/daemon/task/CheckProjectStatusTaskImpl.java @@ -48,7 +48,10 @@ public class CheckProjectStatusTaskImpl implements ITaskExcuteService { log.info("妫€娴嬮」鐩繍琛岀姸鎬佷换鍔″畬姣曪紒"); //鏇存柊椤圭洰鏈嶅姟ip - List<SetupProjectEntity> setupProjectEntities = setupProjectService.find(new SetupProjectQuery().clientToServerIpStatus(YesNoEnum.NO.getValue())); + List<SetupProjectEntity> setupProjectEntities = setupProjectService.find(new SetupProjectQuery() + .projectType(ProjectTypeEnum.鍚庣.getValue()) + .projectStatus(ProjectStatusEnum.杩愯涓�.getValue()) + .clientToServerIpStatus(YesNoEnum.NO.getValue())); for (SetupProjectEntity setupProjectEntity : setupProjectEntities) { if (!ObjectUtils.isEmpty(setupProjectEntity.getClientToServerIp()) && setupProjectEntity.getProjectCode().equals(ProductDisEnum.鍩虹鏈嶅姟鍚庣.getValue())) { diff --git a/setup-project-manager/src/main/java/com/mortals/xhx/module/setup/web/SetupProjectController.java b/setup-project-manager/src/main/java/com/mortals/xhx/module/setup/web/SetupProjectController.java index d698f8473f17523d71a259b5c72ef4faaaa749a0..6fd54c434e79c6b3cabe3057a5302f5a95768283 100644 --- a/setup-project-manager/src/main/java/com/mortals/xhx/module/setup/web/SetupProjectController.java +++ b/setup-project-manager/src/main/java/com/mortals/xhx/module/setup/web/SetupProjectController.java @@ -236,6 +236,7 @@ public class SetupProjectController extends BaseCRUDJsonBodyMappingController<Se if (!ipv4) { throw new AppException("璇疯緭鍏ユ纭殑ip鍦板潃"); }*/ +/* HashMap<String, Object> params = new HashMap<>(); params.put("serverIp", clientToServerIp); @@ -251,6 +252,7 @@ public class SetupProjectController extends BaseCRUDJsonBodyMappingController<Se if (YesNoEnum.NO.getValue() == rest.getCode()) { throw new AppException(rest.getMsg()); } +*/ //鏇存柊php 缁堢璁块棶鍦板潃 todo diff --git a/setup-project-manager/src/test/java/httpclient/system.http b/setup-project-manager/src/test/java/httpclient/system.http index 86606490ea0504d2a16bec88ef58cf9f8a3ebfde..43cb81b3ad8415d82d805716d5eecf92fbce4f85 100644 --- a/setup-project-manager/src/test/java/httpclient/system.http +++ b/setup-project-manager/src/test/java/httpclient/system.http @@ -95,6 +95,16 @@ Content-Type: application/json } +###鏇存柊缁堢璁块棶鏈嶅姟绔痠p +POST {{baseUrl}}/serverIp/update +Content-Type: application/json + +{ + "clientToServerIp": "192.168.0.98" +} + + + ###鍖哄煙鏍戞祴璇� POST {{baseUrl}}/base/area/treeselect Content-Type: application/json