diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugSummary.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugSummary.java index d4911bbe..84e455ad 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugSummary.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugSummary.java @@ -1,7 +1,5 @@ package cd.casic.module.process.task.codescan.model; -import io.tiklab.toolkit.beans.annotation.Mapper; -import io.tiklab.toolkit.join.annotation.Join; import lombok.Data; /** diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeploy.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeploy.java index a27dd25f..81442122 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeploy.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeploy.java @@ -1,8 +1,8 @@ package cd.casic.module.process.task.deploy.model; -import io.tiklab.arbess.setting.model.HostGroup; -import io.tiklab.toolkit.beans.annotation.Mapper; -import io.tiklab.toolkit.join.annotation.Join; + + +import cd.casic.ci.commons.bean.process.setting.HostGroup; import java.util.List; @@ -12,8 +12,8 @@ import java.util.List; * @author zcamy */ //@ApiModel -@Join -@Mapper +//@Join +//@Mapper public class TaskDeploy { //@ApiProperty(name = "taskId",desc = "id") diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployInstance.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployInstance.java index 3074172f..07aa9b64 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployInstance.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployInstance.java @@ -1,8 +1,8 @@ package cd.casic.module.process.task.deploy.model; -import io.tiklab.toolkit.beans.annotation.Mapper; +//import io.tiklab.toolkit.beans.annotation.Mapper; -@Mapper +//@Mapper public class TaskDeployInstance { // id diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployStrategy.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployStrategy.java index 532c6219..d98ff1be 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployStrategy.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployStrategy.java @@ -1,6 +1,8 @@ package cd.casic.module.process.task.deploy.model; -import io.tiklab.arbess.setting.model.AuthHost; + + +import cd.casic.ci.commons.bean.process.setting.AuthHost; import java.util.List; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployExecService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployExecService.java index cbf75c0f..e7d571bd 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployExecService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployExecService.java @@ -1,7 +1,7 @@ package cd.casic.module.process.task.deploy.service; -import io.tiklab.arbess.task.task.model.Tasks; -import io.tiklab.core.exception.ApplicationException; + +import cd.casic.ci.commons.bean.engine.job.Tasks; /** * 部署执行服务接口 diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployService.java index e0dc0598..30bf2ae7 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployService.java @@ -1,18 +1,15 @@ package cd.casic.module.process.task.deploy.service; -import io.tiklab.arbess.task.deploy.model.TaskDeploy; -import io.tiklab.toolkit.join.annotation.FindAll; -import io.tiklab.toolkit.join.annotation.FindList; -import io.tiklab.toolkit.join.annotation.FindOne; -import io.tiklab.toolkit.join.annotation.JoinProvider; + +import cd.casic.ci.commons.bean.support.deploy.TaskDeploy; import java.util.List; /** * 部署服务接口 */ -@JoinProvider(model = TaskDeploy.class) +//@JoinProvider(model = TaskDeploy.class) public interface TaskDeployService { /** @@ -55,17 +52,17 @@ public interface TaskDeployService { * @param deployId pipelineDeployId * @return deploy信息 */ - @FindOne +// @FindOne TaskDeploy findOneDeploy(String deployId) ; /** * 查询所有信息 * @return deploy信息集合 */ - @FindAll +// @FindAll List findAllDeploy() ; - @FindList +// @FindList List findAllDeployList(List idList); } \ No newline at end of file diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessageType.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessageType.java index c8b831bd..9648c0e5 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessageType.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessageType.java @@ -1,15 +1,14 @@ package cd.casic.module.process.task.message.model; -import io.tiklab.toolkit.beans.annotation.Mapper; -import io.tiklab.toolkit.join.annotation.Join; + import java.util.List; /** * 任务消息类型模型 */ //@ApiModel -@Join -@Mapper +//@Join +//@Mapper public class TaskMessageType { //@ApiProperty(name = "id",desc = "id") diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessageUser.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessageUser.java index 84b74c64..ed502c8a 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessageUser.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessageUser.java @@ -1,17 +1,14 @@ package cd.casic.module.process.task.message.model; -import io.tiklab.toolkit.beans.annotation.Mapper; -import io.tiklab.toolkit.beans.annotation.Mapping; -import io.tiklab.toolkit.beans.annotation.Mappings; -import io.tiklab.toolkit.join.annotation.Join; -import io.tiklab.toolkit.join.annotation.JoinQuery; -import io.tiklab.user.user.model.User; + +import cd.casic.module.process.user.user.User; + /** * 任务消息接收人模型 */ //@ApiModel -@Join -@Mapper +//@Join +//@Mapper public class TaskMessageUser { //@ApiProperty(name="messageId",desc="配置id") @@ -21,10 +18,10 @@ public class TaskMessageUser { private String taskId; //@ApiProperty(name="user",desc="用户",required = true) - @Mappings({ - @Mapping(source = "user.id",target = "userId") - }) - @JoinQuery(key = "id") +// @Mappings({ +// @Mapping(source = "user.id",target = "userId") +// }) +// @JoinQuery(key = "id") private User user; //@ApiProperty(name="receiveType",desc="接收类型 1.全部 2.仅成功 3.仅失败") diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/service/TaskMessageTypeService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/service/TaskMessageTypeService.java index f1606ffd..b63babe4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/service/TaskMessageTypeService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/service/TaskMessageTypeService.java @@ -1,17 +1,15 @@ package cd.casic.module.process.task.message.service; -import io.tiklab.arbess.task.message.model.TaskMessageType; -import io.tiklab.toolkit.join.annotation.FindAll; -import io.tiklab.toolkit.join.annotation.FindList; -import io.tiklab.toolkit.join.annotation.FindOne; -import io.tiklab.toolkit.join.annotation.JoinProvider; + + +import cd.casic.module.process.task.message.model.TaskMessageType; import java.util.List; /** * 任务消息类型服务接口 */ -@JoinProvider(model = TaskMessageType.class) +//@JoinProvider(model = TaskMessageType.class) public interface TaskMessageTypeService { /** @@ -59,17 +57,17 @@ public interface TaskMessageTypeService { * @param messageId pipelineMessageId * @return message信息 */ - @FindOne +// @FindOne TaskMessageType findOneMessage(String messageId) ; /** * 查询所有信息 * @return message信息集合 */ - @FindAll +// @FindAll List findAllMessage() ; - @FindList +// @FindList List findAllMessageList(List idList); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/service/TaskMessageUserService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/service/TaskMessageUserService.java index 335bdc92..57e93c0d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/service/TaskMessageUserService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/service/TaskMessageUserService.java @@ -1,17 +1,13 @@ package cd.casic.module.process.task.message.service; -import io.tiklab.arbess.task.message.model.TaskMessageUser; -import io.tiklab.toolkit.join.annotation.FindAll; -import io.tiklab.toolkit.join.annotation.FindList; -import io.tiklab.toolkit.join.annotation.FindOne; -import io.tiklab.toolkit.join.annotation.JoinProvider; +import cd.casic.module.process.task.message.model.TaskMessageUser; import java.util.List; /** * 消息接收人服务接口 */ -@JoinProvider(model = TaskMessageUser.class) +//@JoinProvider(model = TaskMessageUser.class) public interface TaskMessageUserService { /** @@ -62,17 +58,17 @@ public interface TaskMessageUserService { * @param messageId pipelineMessageId * @return message信息 */ - @FindOne +// @FindOne TaskMessageUser findOneMessage(String messageId) ; /** * 查询所有信息 * @return message信息集合 */ - @FindAll +// @FindAll List findAllMessage() ; - @FindList +// @FindList List findAllMessageList(List idList); }