From 92a10b6dbdc5a785a74b4377f64ecfc07798a6ca Mon Sep 17 00:00:00 2001 From: zeaslity Date: Mon, 23 Oct 2023 16:58:34 +0800 Subject: [PATCH] =?UTF-8?q?[=20Server=20]=20[=20Executor=20]=20-=20?= =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=9E=E7=8E=B0=E6=B5=8B=E8=AF=95=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../func/auto/service/BaseFuncScheduler.java | 4 +- .../controller/ProjectServerController.java | 22 ++++++++- .../server/controller/ServerController.java | 2 +- .../coreService/CoreProjectServerService.java | 2 + .../server/coreService/CoreServerService.java | 2 +- .../impl/CoreProjectServerServiceImpl.java | 23 +++++++++- .../impl/CoreProjectServiceImpl.java | 5 +-- .../impl/CoreServerServiceImpl.java | 8 ++-- .../wdd/server/controller/ServerInfoTest.java | 2 +- .../server/func/TestBaseFuncScheduler.java | 45 +++++++++++++++++++ 10 files changed, 101 insertions(+), 14 deletions(-) create mode 100644 server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java diff --git a/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java b/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java index 4fd5034..b01cc97 100644 --- a/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java +++ b/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java @@ -37,7 +37,7 @@ public class BaseFuncScheduler { private void afterRunProcedure() { // 检查是否安装完成, 对安装环境进行判定 - + log.debug("afterRunProcedure complete!"); } private void doRunProcedure(ProjectDeployContext projectDeployContext) { @@ -75,6 +75,8 @@ public class BaseFuncScheduler { // 打印施工信息 + log.debug("beforeRunProcedure complete!"); + } private boolean MasterNodeProcedure(String masterTopicName) { diff --git a/server/src/main/java/io/wdd/server/controller/ProjectServerController.java b/server/src/main/java/io/wdd/server/controller/ProjectServerController.java index 16aa341..1ecad61 100644 --- a/server/src/main/java/io/wdd/server/controller/ProjectServerController.java +++ b/server/src/main/java/io/wdd/server/controller/ProjectServerController.java @@ -52,7 +52,7 @@ public class ProjectServerController { @PostMapping("/create") - @ApiOperation("Project-Server-创建一个Project-Server半丁关系") + @ApiOperation("Project-Server-创建一个Project-Server绑定关系") public R projectServerCreate( @RequestParam(value = "projectId", name = "projectId") @ApiParam(value = "projectId") Long projectId, @@ -72,6 +72,26 @@ public class ProjectServerController { return R.ok(result); } + @PostMapping("/create/multi") + @ApiOperation("Project-Server-创建一对多的Project-Server绑定关系") + public R projectServerCreateMulti( + @RequestParam(value = "projectId", name = "projectId") + @ApiParam(value = "projectId") Long projectId, + @RequestParam(value = "serverIdList", name = "serverIdList") + @ApiParam(value = "serverIdList") List serverIdList + ) { + + String result = "创建Project-Server成功！"; + + if (!coreProjectServerService.projectServerCreateMulti( + projectId, + serverIdList + )) { + result = "创建Project-Server失败！"; + } + return R.ok(result); + } + @PostMapping("/update") @ApiOperation("Project-Server-更新一个Project-Server") public R projectServerUpdate( diff --git a/server/src/main/java/io/wdd/server/controller/ServerController.java b/server/src/main/java/io/wdd/server/controller/ServerController.java index 855830f..4cdca55 100644 --- a/server/src/main/java/io/wdd/server/controller/ServerController.java +++ b/server/src/main/java/io/wdd/server/controller/ServerController.java @@ -31,7 +31,7 @@ public class ServerController { @PostMapping("/all") @ApiOperation("获取服务器信息-web") - public R> serverGetAllByPage( + public R> serverGetAllByPage( @RequestBody ServerQueryEntity serverQueryEntity ) { diff --git a/server/src/main/java/io/wdd/server/coreService/CoreProjectServerService.java b/server/src/main/java/io/wdd/server/coreService/CoreProjectServerService.java index 69a87f3..7fb52a9 100644 --- a/server/src/main/java/io/wdd/server/coreService/CoreProjectServerService.java +++ b/server/src/main/java/io/wdd/server/coreService/CoreProjectServerService.java @@ -16,6 +16,8 @@ public interface CoreProjectServerService { boolean projectServerCreate(Long projectId, Long serverId); + boolean projectServerCreateMulti(Long projectId, List serverIdList); + boolean projectServerUpdate(Long projectId, Long serverId); boolean projectServerDelete(Long projectId, Long serverId); diff --git a/server/src/main/java/io/wdd/server/coreService/CoreServerService.java b/server/src/main/java/io/wdd/server/coreService/CoreServerService.java index eb2a282..27496c3 100644 --- a/server/src/main/java/io/wdd/server/coreService/CoreServerService.java +++ b/server/src/main/java/io/wdd/server/coreService/CoreServerService.java @@ -19,7 +19,7 @@ public interface CoreServerService { /** * 查询主机信息，但是是条件查询 */ - Page serverGetByPage(ServerQueryEntity serverQueryEntity); + Page serverGetByPage(ServerQueryEntity serverQueryEntity); List serverGetAllIncludeDelete(); diff --git a/server/src/main/java/io/wdd/server/coreService/impl/CoreProjectServerServiceImpl.java b/server/src/main/java/io/wdd/server/coreService/impl/CoreProjectServerServiceImpl.java index aa4bae5..673a34a 100644 --- a/server/src/main/java/io/wdd/server/coreService/impl/CoreProjectServerServiceImpl.java +++ b/server/src/main/java/io/wdd/server/coreService/impl/CoreProjectServerServiceImpl.java @@ -138,10 +138,29 @@ public class CoreProjectServerServiceImpl implements CoreProjectServerService { return projectServerRelationService.save(projectServerRelationPO); } + @Override + public boolean projectServerCreateMulti(Long projectId, List serverIdList) { + + for (Long serverId : serverIdList) { + if (!this.projectServerCreate( + projectId, + serverId + )) { + + log.error("绑定失败！"); + return false; + } + } + + return true; + } + @Override public boolean projectServerUpdate(Long projectId, Long serverId) { - return this.projectServerCreate(projectId, - serverId); + return this.projectServerCreate( + projectId, + serverId + ); } @Override diff --git a/server/src/main/java/io/wdd/server/coreService/impl/CoreProjectServiceImpl.java b/server/src/main/java/io/wdd/server/coreService/impl/CoreProjectServiceImpl.java index 65931c2..7445d77 100644 --- a/server/src/main/java/io/wdd/server/coreService/impl/CoreProjectServiceImpl.java +++ b/server/src/main/java/io/wdd/server/coreService/impl/CoreProjectServiceImpl.java @@ -46,19 +46,18 @@ public class CoreProjectServiceImpl implements CoreProjectService { ); new LambdaQueryChainWrapper(projectInfoService.getBaseMapper()) - .likeLeft( + .likeRight( StringUtils.isNotBlank(projectQueryEntity.getProjectName()), ProjectInfoPO::getProjectName, projectQueryEntity.getProjectName() ) - .likeLeft( + .likeRight( StringUtils.isNotBlank(projectQueryEntity.getProjectProvince()), ProjectInfoPO::getProjectProvince, projectQueryEntity.getProjectProvince() ) .page(poPage); - return poPage; } diff --git a/server/src/main/java/io/wdd/server/coreService/impl/CoreServerServiceImpl.java b/server/src/main/java/io/wdd/server/coreService/impl/CoreServerServiceImpl.java index 3f2e5fa..f29e5fb 100644 --- a/server/src/main/java/io/wdd/server/coreService/impl/CoreServerServiceImpl.java +++ b/server/src/main/java/io/wdd/server/coreService/impl/CoreServerServiceImpl.java @@ -85,7 +85,7 @@ public class CoreServerServiceImpl implements CoreServerService { } @Override - public Page serverGetByPage(ServerQueryEntity serverQueryEntity) { + public Page serverGetByPage(ServerQueryEntity serverQueryEntity) { // 默认数值处理 if (serverQueryEntity == null || serverQueryEntity.getPageSize() == null || serverQueryEntity.getPageNumber() == null) { @@ -129,7 +129,7 @@ public class CoreServerServiceImpl implements CoreServerService { // 将查询结果中的User对象转换为UserVO对象 - Page serverInfoVOPage = new Page<>( + /*Page serverInfoVOPage = new Page<>( serverInfoPOPage.getCurrent(), serverInfoPOPage.getSize() ); @@ -139,9 +139,9 @@ public class CoreServerServiceImpl implements CoreServerService { serverInfoPOPage.getRecords(), (serverQueryEntity.getPageNumber() - 1) * serverQueryEntity.getPageSize() ) - ); + );*/ - return serverInfoVOPage; + return serverInfoPOPage; } @Override diff --git a/server/src/test/java/io/wdd/server/controller/ServerInfoTest.java b/server/src/test/java/io/wdd/server/controller/ServerInfoTest.java index 00a305c..91c0ae6 100644 --- a/server/src/test/java/io/wdd/server/controller/ServerInfoTest.java +++ b/server/src/test/java/io/wdd/server/controller/ServerInfoTest.java @@ -27,7 +27,7 @@ public class ServerInfoTest { ServerQueryEntity serverQueryEntity = new ServerQueryEntity(); // Act - R> result = serverController.serverGetAllByPage(serverQueryEntity); + R> result = serverController.serverGetAllByPage(serverQueryEntity); // Assert assertNotNull(result); diff --git a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java new file mode 100644 index 0000000..025b40f --- /dev/null +++ b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java @@ -0,0 +1,45 @@ +package io.wdd.server.func; + +import io.wdd.func.auto.beans.ProjectDeployContext; +import io.wdd.func.auto.service.BaseFuncScheduler; +import io.wdd.server.beans.po.ServerInfoPO; +import io.wdd.server.beans.request.ServerQueryEntity; +import io.wdd.server.coreService.CoreServerService; +import org.junit.Test; +import org.springframework.boot.test.context.SpringBootTest; + +import javax.annotation.Resource; + +@SpringBootTest +public class TestBaseFuncScheduler { + + + @Resource + BaseFuncScheduler baseFuncScheduler; + + @Resource + CoreServerService serverService; + + + @Test + public void testRunProcedure() { + + ProjectDeployContext projectDeployContext = new ProjectDeployContext(); + + projectDeployContext.setProjectId(1716372290994155522L); + + ServerQueryEntity serverQueryEntity = new ServerQueryEntity(); + serverQueryEntity.setServerName("Osaka"); + ServerInfoPO serverInfoPO = serverService + .serverGetByPage(serverQueryEntity) + .getRecords() + .get(0); + + projectDeployContext.setMasterNode(serverInfoPO); + + + baseFuncScheduler.runProcedure(projectDeployContext); + + } + +}