From 538806785ceaba3133c4d1af01bdbb3bf7345ee6 Mon Sep 17 00:00:00 2001 From: Hope Li <1278288511@qq.com> Date: Mon, 28 Apr 2025 11:25:09 +0800 Subject: [PATCH] =?UTF-8?q?4/28=20ljc=20=E4=BF=AE=E6=94=B9postprocess?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=B1=BBresult?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../casic/ci/commons/bean/utils/Result.java | 73 ++++++++++++ .../execute/impl/PipelineExecServiceImpl.java | 2 +- .../controller/PostprocessController.java | 108 ++++++++++++++++++ .../postprocess/dao/PostprocessDao.java | 4 +- .../dao/PostprocessInstanceDao.java | 4 +- .../postprocess/entity}/PostprocessDo.java | 2 +- .../entity}/PostprocessInstanceDo.java | 2 +- .../service}/PostprocessExecService.java | 2 +- .../service}/PostprocessInstanceService.java | 2 +- .../service}/PostprocessService.java | 2 +- 10 files changed, 191 insertions(+), 10 deletions(-) create mode 100644 modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/utils/Result.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/controller/PostprocessController.java rename modules/module-ci-process-biz/src/main/java/cd/casic/module/process/{engine => support}/postprocess/dao/PostprocessDao.java (68%) rename modules/module-ci-process-biz/src/main/java/cd/casic/module/process/{engine => support}/postprocess/dao/PostprocessInstanceDao.java (69%) rename modules/module-ci-process-biz/src/main/java/cd/casic/module/process/{engine/postprocess/dataobject => support/postprocess/entity}/PostprocessDo.java (90%) rename modules/module-ci-process-biz/src/main/java/cd/casic/module/process/{engine/postprocess/dataobject => support/postprocess/entity}/PostprocessInstanceDo.java (92%) rename modules/module-ci-process-biz/src/main/java/cd/casic/module/process/{engine/postprocess => support/postprocess/service}/PostprocessExecService.java (87%) rename modules/module-ci-process-biz/src/main/java/cd/casic/module/process/{engine/postprocess => support/postprocess/service}/PostprocessInstanceService.java (96%) rename modules/module-ci-process-biz/src/main/java/cd/casic/module/process/{engine/postprocess => support/postprocess/service}/PostprocessService.java (96%) diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/utils/Result.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/utils/Result.java new file mode 100644 index 0000000..a0870fb --- /dev/null +++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/utils/Result.java @@ -0,0 +1,73 @@ +package cd.casic.ci.commons.bean.utils; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @ClassName Result + * @Author hopeli + * @Date 2025/4/28 10:51 + * @Version 1.0 + **/ +@Data +public class Result implements Serializable { + + @Serial + private static final long serialVersionUID = -3654582015538398741L; + private int code; + private T data; + private String msg; + private String detailMsg; + + public Result() { + } + + public Result(T data) { + this.code = 0; + this.data = data; + } + + public Result(T data, String msg) { + this.code = 0; + this.data = data; + this.msg = msg; + } + + public Result(int code, String msg) { + this.code = code; + this.msg = msg; + } + + public Result(int code, String msg, String detailMsg) { + this.code = code; + this.msg = msg; + this.detailMsg = detailMsg; + } + + public static Result ok() { + return new Result(); + } + + public static Result ok(T data) { + return new Result(data); + } + + public static Result ok(T data, String msg) { + return new Result(data, msg); + } + + public static Result error(int code, String msg) { + return new Result(code, msg); + } + + public static Result error(int code, String msg, String detailMsg) { + return new Result(code, msg, detailMsg); + } + + public String toString() { + int var10000 = this.code; + return "Result{code=" + var10000 + ", data=" + String.valueOf(this.data) + ", msg='" + this.msg + "', detailMsg='" + this.detailMsg + "'}"; + } +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/execute/impl/PipelineExecServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/execute/impl/PipelineExecServiceImpl.java index 7211dc0..b0a794e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/execute/impl/PipelineExecServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/execute/impl/PipelineExecServiceImpl.java @@ -15,7 +15,7 @@ import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; import cd.casic.module.process.engine.execute.PipelineExecService; -import cd.casic.module.process.engine.postprocess.PostprocessExecService; +import cd.casic.module.process.support.postprocess.service.PostprocessExecService; import cd.casic.module.process.engine.task.TasksExecService; import cd.casic.module.process.pipeline.instance.service.PipelineInstanceServiceImpl; import cd.casic.module.process.process.definition.PipelineService; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/controller/PostprocessController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/controller/PostprocessController.java new file mode 100644 index 0000000..3801b3e --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/controller/PostprocessController.java @@ -0,0 +1,108 @@ +package cd.casic.module.process.support.postprocess.controller; + +import cd.casic.ci.commons.bean.engine.postprocess.Postprocess; +import cd.casic.ci.commons.bean.utils.Result; +import cd.casic.module.process.support.postprocess.service.PostprocessService; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import java.util.List; + +/** + * @ClassName PostprocessController + * @Author hopeli + * @Date 2025/4/28 10:43 + * @Version 1.0 + **/ +public class PostprocessController { + + @Resource + PostprocessService postServer; + + + /** + * @Author hopeli + * @Description //TODO + * @Date 10:47 2025/4/28 + * @Param postprocess + * @return String + */ + @RequestMapping(path="/createPost",method = RequestMethod.POST) + public Result createPost(@RequestBody @NotNull @Valid Postprocess postprocess){ + String postId = postServer.createPostTask(postprocess); + return Result.ok(postId); + } + + /** + * @Author hopeli + * @Description + * @Date 11:17 2025/4/28 + * @Param postprocess + * @return void + */ + @RequestMapping(path="/updatePost",method = RequestMethod.POST) + public Result updatePost(@RequestBody @NotNull @Valid Postprocess postprocess){ + postServer.updatePostTask(postprocess); + return Result.ok(); + } + + + /** + * @Author hopeli + * @Description + * @Date 11:17 2025/4/28 + * @Param + * @return + */ + @RequestMapping(path="/findPipelinePost",method = RequestMethod.POST) + public Result> findAllPipelinePostTask(@NotNull String pipelineId) { + List list = postServer.findAllPipelinePostTask(pipelineId); + return Result.ok(list); + } + + + /** + * @Author hopeli + * @Description + * @Date 11:22 2025/4/28 + * @Param + * @return + */ + @RequestMapping(path="/findTaskPost",method = RequestMethod.POST) + public Result< List> findAllTaskPostTask(@NotNull String taskId) { + List list = postServer.findAllTaskPostTask(taskId); + return Result.ok(list); + } + + + /** + * @Author hopeli + * @Description + * @Date 11:22 2025/4/28 + * @Param + * @return + */ + @RequestMapping(path="/deletePost",method = RequestMethod.POST) + public Result deletePost(@NotNull String postId) { + postServer.deletePostTask(postId); + return Result.ok(); + } + + + /** + * @Author hopeli + * @Description + * @Date 11:22 2025/4/28 + * @Param + * @return + */ + @RequestMapping(path="/findOnePost",method = RequestMethod.POST) + public Result findOnePostOrTask(@NotNull String postId) { + Postprocess postOrTask = postServer.findOnePostOrTask(postId); + return Result.ok(postOrTask); + } +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/dao/PostprocessDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/dao/PostprocessDao.java similarity index 68% rename from modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/dao/PostprocessDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/dao/PostprocessDao.java index d4f6093..964879f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/dao/PostprocessDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/dao/PostprocessDao.java @@ -1,7 +1,7 @@ -package cd.casic.module.process.engine.postprocess.dao; +package cd.casic.module.process.support.postprocess.dao; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.engine.postprocess.dataobject.PostprocessDo; +import cd.casic.module.process.support.postprocess.entity.PostprocessDo; import org.apache.ibatis.annotations.Mapper; /** diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/dao/PostprocessInstanceDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/dao/PostprocessInstanceDao.java similarity index 69% rename from modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/dao/PostprocessInstanceDao.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/dao/PostprocessInstanceDao.java index 45f6769..dc9bcdf 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/dao/PostprocessInstanceDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/dao/PostprocessInstanceDao.java @@ -1,7 +1,7 @@ -package cd.casic.module.process.engine.postprocess.dao; +package cd.casic.module.process.support.postprocess.dao; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.engine.postprocess.dataobject.PostprocessInstanceDo; +import cd.casic.module.process.support.postprocess.entity.PostprocessInstanceDo; import org.apache.ibatis.annotations.Mapper; /** diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/dataobject/PostprocessDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/entity/PostprocessDo.java similarity index 90% rename from modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/dataobject/PostprocessDo.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/entity/PostprocessDo.java index 7f034f3..98988e4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/dataobject/PostprocessDo.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/entity/PostprocessDo.java @@ -1,4 +1,4 @@ -package cd.casic.module.process.engine.postprocess.dataobject; +package cd.casic.module.process.support.postprocess.entity; import cd.casic.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/dataobject/PostprocessInstanceDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/entity/PostprocessInstanceDo.java similarity index 92% rename from modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/dataobject/PostprocessInstanceDo.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/entity/PostprocessInstanceDo.java index c6169d5..d733976 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/dataobject/PostprocessInstanceDo.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/entity/PostprocessInstanceDo.java @@ -1,4 +1,4 @@ -package cd.casic.module.process.engine.postprocess.dataobject; +package cd.casic.module.process.support.postprocess.entity; import cd.casic.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/PostprocessExecService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessExecService.java similarity index 87% rename from modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/PostprocessExecService.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessExecService.java index ed2a70e..2bb569b 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/PostprocessExecService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessExecService.java @@ -1,4 +1,4 @@ -package cd.casic.module.process.engine.postprocess; +package cd.casic.module.process.support.postprocess.service; import cd.casic.ci.commons.bean.engine.postprocess.Postprocess; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/PostprocessInstanceService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessInstanceService.java similarity index 96% rename from modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/PostprocessInstanceService.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessInstanceService.java index f4d8621..cb70adb 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/PostprocessInstanceService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessInstanceService.java @@ -1,4 +1,4 @@ -package cd.casic.module.process.engine.postprocess; +package cd.casic.module.process.support.postprocess.service; import cd.casic.ci.commons.bean.engine.postprocess.PostprocessInstance; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/PostprocessService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessService.java similarity index 96% rename from modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/PostprocessService.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessService.java index 2eaca9f..2fca52d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/postprocess/PostprocessService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessService.java @@ -1,4 +1,4 @@ -package cd.casic.module.process.engine.postprocess; +package cd.casic.module.process.support.postprocess.service; import cd.casic.ci.commons.bean.engine.postprocess.Postprocess;