- * 任务实例明细 - *
- * - * @author codegen - * @since 2025-09-26 - */ -@Getter -@Setter -@ToString -@TableName("task_instance_detail") -@ApiModel(value = "TaskInstanceDetailTb对象", description = "任务实例明细") -public class TaskInstanceDetailTb extends KitObject { - - @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) - private Date createTime; - /** - * id - */ - @ApiModelProperty("id") - @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) - @JSONField(format = "string") - private Long id; - /** - * 任务实例id - */ - @TableField("instance_id") - @ApiModelProperty("任务实例id") - private Long instanceId; - /** - * 开始时间 - */ - @ApiModelProperty("开始时间") - @TableField("start_time") - private Date startTime; - /** - * 结束时间 - */ - @ApiModelProperty("结束时间") - @TableField("finish_time") - private Date finishTime; - /** - * 业务编码 - */ - @TableField("biz_code") - @ApiModelProperty("业务编码") - private String bizCode; - /** - * 业务名称(步骤) - */ - @TableField("biz_name") - @ApiModelProperty("业务名称(步骤)") - private String bizName; - /** - * 执行参数 - */ - @ApiModelProperty("执行参数") - @TableField("execute_params") - private String executeParams; - /** - * 执行信息 - */ - @ApiModelProperty("执行信息") - @TableField("execute_info") - private String executeInfo; - /** - * 执行状态(running进行中 success成功 fail失败) - */ - @TableField("execute_status") - @ApiModelProperty("执行状态(running进行中 success成功 fail失败)") - private String - executeStatus; -} diff --git a/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceInfoTb.java b/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceInfoTb.java deleted file mode 100644 index 36a0c187..00000000 --- a/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceInfoTb.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright 2021-2026 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.task.dal.dataobject; - -import cn.odboy.base.KitObject; -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; -import org.springframework.data.annotation.CreatedBy; - -/** - *- * 任务实例 - *
- * - * @author codegen - * @since 2025-09-26 - */ -@Getter -@Setter -@ToString -@TableName("task_instance_info") -@ApiModel(value = "TaskInstanceInfoTb对象", description = "任务实例") -public class TaskInstanceInfoTb extends KitObject { - - @CreatedBy - @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人", hidden = true) - private String - createBy; - @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) - private Date createTime; - @TableField(fill = FieldFill.INSERT_UPDATE) - @ApiModelProperty(value = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true) - private Date updateTime; - /** - * id, @JsonSerialize和@JSONField,用于处理大数精度丢失问题 - */ - @ApiModelProperty("id") - @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) - @JSONField(format = "string") - private Long id; - /** - * 名称 - */ - @ApiModelProperty("名称") - @TableField("context_name") - private String contextName; - /** - * 语言 - */ - @ApiModelProperty("语言") - @TableField("`language`") - private String language; - /** - * 变更类型 - */ - @ApiModelProperty("变更类型") - @TableField("change_type") - private String changeType; - /** - * 环境别名 - */ - @TableField("env_alias") - @ApiModelProperty("环境别名") - private String envAlias; - /** - * 状态(running进行中 success成功 fail失败) - */ - @TableField("`status`") - @ApiModelProperty("状态(running进行中 success成功 fail失败)") - private String status; - /** - * 完成时间 - */ - @ApiModelProperty("完成时间") - @TableField("finish_time") - private Date finishTime; - /** - * 来源 - */ - @ApiModelProperty("来源") - @TableField("`source`") - private String source; - /** - * 变更原因 - */ - @TableField("reason") - @ApiModelProperty("变更原因") - private String reason; - /** - * 任务模板 - */ - @TableField("template") - @ApiModelProperty("template") - private String template; - /** - * QuartzJob参数 - */ - @TableField("job_data") - @ApiModelProperty("QuartzJob参数") - private String jobData; - /** - * 异常信息 - */ - @TableField("error_message") - @ApiModelProperty("异常信息") - private String errorMessage; -} diff --git a/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceStepDetailTb.java b/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceStepDetailTb.java deleted file mode 100644 index 3c69c2c3..00000000 --- a/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceStepDetailTb.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2021-2026 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.task.dal.dataobject; - -import cn.odboy.base.KitObject; -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -/** - *- * 任务实例步骤明细 - *
- * - * @author codegen - * @since 2025-09-28 - */ -@Getter -@Setter -@ToString -@TableName("task_instance_step_detail") -@ApiModel(value = "TaskInstanceStepDetailTb对象", description = "") -public class TaskInstanceStepDetailTb extends KitObject { - - @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) - private Date createTime; - /** - * id - */ - @ApiModelProperty("id") - @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) - @JSONField(format = "string") - private Long id; - /** - * task_instance_detail表id - */ - @TableField("instance_detail_id") - @ApiModelProperty("task_instance_detail表id") - private Long instanceDetailId; - /** - * 步骤描述 - */ - @TableField("step_desc") - @ApiModelProperty("步骤描述") - private String stepDesc; - /** - * 状态(success成功 fail失败) - */ - @TableField("step_status") - @ApiModelProperty("状态(success成功 fail失败)") - private String stepStatus; -} diff --git a/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/dal/dataobject/TaskTemplateInfoTb.java b/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/dal/dataobject/TaskTemplateInfoTb.java deleted file mode 100644 index 942199b4..00000000 --- a/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/dal/dataobject/TaskTemplateInfoTb.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright 2021-2026 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.task.dal.dataobject; - -import cn.odboy.base.KitBaseUserTimeTb; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -/** - *- * 任务模板 - *
- * - * @author codegen - * @since 2025-09-28 - */ -@Getter -@Setter -@ToString -@TableName("task_template_info") -@ApiModel(value = "TaskTemplateInfoTb对象", description = "任务模板") -public class TaskTemplateInfoTb extends KitBaseUserTimeTb { - - /** - * id - */ - @ApiModelProperty("id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - /** - * 数据有效性 - */ - @TableField("available") - @ApiModelProperty("数据有效性") - private Boolean available; - /** - * 变更类型 - */ - @ApiModelProperty("变更类型") - @TableField("change_type") - private String changeType; - /** - * 流水线名称 - */ - @TableField("`name`") - @ApiModelProperty("流水线名称") - private String name; - /** - * 流水线描述 - */ - @ApiModelProperty("流水线描述") - @TableField("`description`") - private String description; - /** - * 流水线模板内容 - */ - @TableField("template") - @ApiModelProperty("流水线模板内容") - private String template; - /** - * 环境别名 - */ - @TableField("env_alias") - @ApiModelProperty("环境别名") - private String envAlias; - /** - * 应用为语言,资源为类型 - */ - @TableField("`language`") - @ApiModelProperty("应用为语言,资源为类型") - private String language; -} diff --git a/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/dal/model/TaskInstanceInfoVo.java b/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/dal/model/TaskInstanceInfoVo.java deleted file mode 100644 index 5b1fcff1..00000000 --- a/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/dal/model/TaskInstanceInfoVo.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.odboy.task.dal.model; - -import cn.odboy.task.dal.dataobject.TaskInstanceInfoTb; -import java.util.List; -import lombok.Getter; -import lombok.Setter; - -/** - * 任务实例数据 - * - * @author odboy - * @date 2025-10-01 - */ -@Getter -@Setter -public class TaskInstanceInfoVo extends TaskInstanceInfoTb { - - /** - * 进行中 - */ - private List- * 任务实例明细 Mapper 接口 - *
- * - * @author codegen - * @since 2025-09-26 - */ -@Mapper -public interface TaskInstanceDetailMapper extends BaseMapper- * 任务实例 Mapper 接口 - *
- * - * @author codegen - * @since 2025-09-26 - */ -@Mapper -public interface TaskInstanceInfoMapper extends BaseMapper- * 任务实例步骤明细 Mapper 接口 - *
- * - * @author codegen - * @since 2025-09-28 - */ -@Mapper -public interface TaskInstanceStepDetailMapper extends BaseMapper- * 任务模板 Mapper 接口 - *
- * - * @author codegen - * @since 2025-09-28 - */ -@Mapper -public interface TaskTemplateInfoMapper extends BaseMapper- * 任务实例明细 - *
- * - * @author codegen - * @since 2025-09-28 - */ -@Service -public class TaskInstanceDetailService { - - @Autowired - private TaskInstanceDetailMapper taskInstanceDetailMapper; - - public void fastFailWithInfo(Long instanceId, String code, String executeInfo) { - LambdaUpdateWrapper- * 任务实例 服务实现类 - *
- * - * @author codegen - * @since 2025-09-26 - */ -@Service -public class TaskInstanceInfoService { - - @Autowired - private TaskInstanceInfoMapper taskInstanceInfoMapper; - - public TaskInstanceInfoTb getRunningById(Long id) { - LambdaUpdateWrapper- * 任务实例步骤明细 服务实现类 - *
- * - * @author codegen - * @since 2025-09-28 - */ -@Service -public class TaskInstanceStepDetailService { - - @Autowired - private TaskInstanceStepDetailMapper taskInstanceStepDetailMapper; - - /** - * 步骤执行成功 - * - * @param instanceDetailId 任务实例明细id - * @param stepDesc 步骤描述 - */ - public void success(Long instanceDetailId, String stepDesc) { - TaskInstanceStepDetailTb stepDetail = new TaskInstanceStepDetailTb(); - stepDetail.setInstanceDetailId(instanceDetailId); - stepDetail.setStepDesc(stepDesc); - stepDetail.setStepStatus(TaskStatusEnum.Success.getCode()); - taskInstanceStepDetailMapper.insert(stepDetail); - } - - /** - * 步骤执行失败 - * - * @param instanceDetailId 任务实例明细id - * @param stepDesc 步骤描述 - */ - public void fail(Long instanceDetailId, String stepDesc) { - TaskInstanceStepDetailTb stepDetail = new TaskInstanceStepDetailTb(); - stepDetail.setInstanceDetailId(instanceDetailId); - stepDetail.setStepDesc(stepDesc); - stepDetail.setStepStatus(TaskStatusEnum.Fail.getCode()); - taskInstanceStepDetailMapper.insert(stepDetail); - throw new BadRequestException(stepDesc); - } - - /** - * 根据明细ID删除步骤明细 - * - * @param instanceDetailIds 任务实例明细id集合 - */ - public void removeByInstanceDetailIds(List- * 任务模板 - *
- * - * @author codegen - * @since 2025-09-28 - */ -@Service -public class TaskTemplateInfoService { - - @Autowired - private TaskTemplateInfoMapper taskTemplateInfoMapper; - - public TaskTemplateInfoVo getTemplateInfoByECL(String envAlias, String contextName, String language, - String changeType) { - return taskTemplateInfoMapper.selectTemplateInfoByECL(envAlias, contextName, language, changeType); - } -} diff --git a/cutejava/cutejava-module-task-v1/src/main/resources/mapper/TaskInstanceDetailMapper.xml b/cutejava/cutejava-module-task-v1/src/main/resources/mapper/TaskInstanceDetailMapper.xml deleted file mode 100644 index 794721f9..00000000 --- a/cutejava/cutejava-module-task-v1/src/main/resources/mapper/TaskInstanceDetailMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - -- * 任务实例明细 - *
- * - * @author codegen - * @since 2025-09-26 - */ -@Getter -@Setter -@ToString -@TableName("task_instance_detail") -@ApiModel(value = "TaskInstanceDetailTb对象", description = "任务实例明细") -public class TaskInstanceDetailTb extends KitObject { - - @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) - private Date createTime; - /** - * id - */ - @ApiModelProperty("id") - @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) - @JSONField(format = "string") - private Long id; - /** - * 任务实例id - */ - @TableField("instance_id") - @ApiModelProperty("任务实例id") - private Long instanceId; - /** - * 开始时间 - */ - @ApiModelProperty("开始时间") - @TableField("start_time") - private Date startTime; - /** - * 结束时间 - */ - @ApiModelProperty("结束时间") - @TableField("finish_time") - private Date finishTime; - /** - * 业务编码 - */ - @TableField("biz_code") - @ApiModelProperty("业务编码") - private String bizCode; - /** - * 业务名称(步骤) - */ - @TableField("biz_name") - @ApiModelProperty("业务名称(步骤)") - private String bizName; - /** - * 执行参数 - */ - @ApiModelProperty("执行参数") - @TableField("execute_params") - private String executeParams; - /** - * 执行信息 - */ - @ApiModelProperty("执行信息") - @TableField("execute_info") - private String executeInfo; - /** - * 执行状态(running进行中 success成功 fail失败) - */ - @TableField("execute_status") - @ApiModelProperty("执行状态(running进行中 success成功 fail失败)") - private String - executeStatus; -} diff --git a/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceInfoTb.java b/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceInfoTb.java deleted file mode 100644 index 36a0c187..00000000 --- a/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceInfoTb.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright 2021-2026 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.task.dal.dataobject; - -import cn.odboy.base.KitObject; -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; -import org.springframework.data.annotation.CreatedBy; - -/** - *- * 任务实例 - *
- * - * @author codegen - * @since 2025-09-26 - */ -@Getter -@Setter -@ToString -@TableName("task_instance_info") -@ApiModel(value = "TaskInstanceInfoTb对象", description = "任务实例") -public class TaskInstanceInfoTb extends KitObject { - - @CreatedBy - @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人", hidden = true) - private String - createBy; - @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) - private Date createTime; - @TableField(fill = FieldFill.INSERT_UPDATE) - @ApiModelProperty(value = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true) - private Date updateTime; - /** - * id, @JsonSerialize和@JSONField,用于处理大数精度丢失问题 - */ - @ApiModelProperty("id") - @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) - @JSONField(format = "string") - private Long id; - /** - * 名称 - */ - @ApiModelProperty("名称") - @TableField("context_name") - private String contextName; - /** - * 语言 - */ - @ApiModelProperty("语言") - @TableField("`language`") - private String language; - /** - * 变更类型 - */ - @ApiModelProperty("变更类型") - @TableField("change_type") - private String changeType; - /** - * 环境别名 - */ - @TableField("env_alias") - @ApiModelProperty("环境别名") - private String envAlias; - /** - * 状态(running进行中 success成功 fail失败) - */ - @TableField("`status`") - @ApiModelProperty("状态(running进行中 success成功 fail失败)") - private String status; - /** - * 完成时间 - */ - @ApiModelProperty("完成时间") - @TableField("finish_time") - private Date finishTime; - /** - * 来源 - */ - @ApiModelProperty("来源") - @TableField("`source`") - private String source; - /** - * 变更原因 - */ - @TableField("reason") - @ApiModelProperty("变更原因") - private String reason; - /** - * 任务模板 - */ - @TableField("template") - @ApiModelProperty("template") - private String template; - /** - * QuartzJob参数 - */ - @TableField("job_data") - @ApiModelProperty("QuartzJob参数") - private String jobData; - /** - * 异常信息 - */ - @TableField("error_message") - @ApiModelProperty("异常信息") - private String errorMessage; -} diff --git a/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceStepDetailTb.java b/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceStepDetailTb.java deleted file mode 100644 index 3c69c2c3..00000000 --- a/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceStepDetailTb.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2021-2026 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.task.dal.dataobject; - -import cn.odboy.base.KitObject; -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -/** - *- * 任务实例步骤明细 - *
- * - * @author codegen - * @since 2025-09-28 - */ -@Getter -@Setter -@ToString -@TableName("task_instance_step_detail") -@ApiModel(value = "TaskInstanceStepDetailTb对象", description = "") -public class TaskInstanceStepDetailTb extends KitObject { - - @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) - private Date createTime; - /** - * id - */ - @ApiModelProperty("id") - @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) - @JSONField(format = "string") - private Long id; - /** - * task_instance_detail表id - */ - @TableField("instance_detail_id") - @ApiModelProperty("task_instance_detail表id") - private Long instanceDetailId; - /** - * 步骤描述 - */ - @TableField("step_desc") - @ApiModelProperty("步骤描述") - private String stepDesc; - /** - * 状态(success成功 fail失败) - */ - @TableField("step_status") - @ApiModelProperty("状态(success成功 fail失败)") - private String stepStatus; -} diff --git a/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/dal/dataobject/TaskTemplateInfoTb.java b/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/dal/dataobject/TaskTemplateInfoTb.java deleted file mode 100644 index 942199b4..00000000 --- a/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/dal/dataobject/TaskTemplateInfoTb.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright 2021-2026 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.task.dal.dataobject; - -import cn.odboy.base.KitBaseUserTimeTb; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -/** - *- * 任务模板 - *
- * - * @author codegen - * @since 2025-09-28 - */ -@Getter -@Setter -@ToString -@TableName("task_template_info") -@ApiModel(value = "TaskTemplateInfoTb对象", description = "任务模板") -public class TaskTemplateInfoTb extends KitBaseUserTimeTb { - - /** - * id - */ - @ApiModelProperty("id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - /** - * 数据有效性 - */ - @TableField("available") - @ApiModelProperty("数据有效性") - private Boolean available; - /** - * 变更类型 - */ - @ApiModelProperty("变更类型") - @TableField("change_type") - private String changeType; - /** - * 流水线名称 - */ - @TableField("`name`") - @ApiModelProperty("流水线名称") - private String name; - /** - * 流水线描述 - */ - @ApiModelProperty("流水线描述") - @TableField("`description`") - private String description; - /** - * 流水线模板内容 - */ - @TableField("template") - @ApiModelProperty("流水线模板内容") - private String template; - /** - * 环境别名 - */ - @TableField("env_alias") - @ApiModelProperty("环境别名") - private String envAlias; - /** - * 应用为语言,资源为类型 - */ - @TableField("`language`") - @ApiModelProperty("应用为语言,资源为类型") - private String language; -} diff --git a/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/dal/model/TaskInstanceInfoVo.java b/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/dal/model/TaskInstanceInfoVo.java deleted file mode 100644 index 5b1fcff1..00000000 --- a/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/dal/model/TaskInstanceInfoVo.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.odboy.task.dal.model; - -import cn.odboy.task.dal.dataobject.TaskInstanceInfoTb; -import java.util.List; -import lombok.Getter; -import lombok.Setter; - -/** - * 任务实例数据 - * - * @author odboy - * @date 2025-10-01 - */ -@Getter -@Setter -public class TaskInstanceInfoVo extends TaskInstanceInfoTb { - - /** - * 进行中 - */ - private List- * 任务实例明细 Mapper 接口 - *
- * - * @author codegen - * @since 2025-09-26 - */ -@Mapper -public interface TaskInstanceDetailMapper extends BaseMapper- * 任务实例 Mapper 接口 - *
- * - * @author codegen - * @since 2025-09-26 - */ -@Mapper -public interface TaskInstanceInfoMapper extends BaseMapper- * 任务实例步骤明细 Mapper 接口 - *
- * - * @author codegen - * @since 2025-09-28 - */ -@Mapper -public interface TaskInstanceStepDetailMapper extends BaseMapper- * 任务模板 Mapper 接口 - *
- * - * @author codegen - * @since 2025-09-28 - */ -@Mapper -public interface TaskTemplateInfoMapper extends BaseMapper- * 任务实例明细 - *
- * - * @author codegen - * @since 2025-09-26 - */ -@Service -public class TaskInstanceDetailService { - - @Autowired - private TaskInstanceDetailMapper taskInstanceDetailMapper; - - public TaskInstanceDetailTb getOneByInstanceIdAndCode(Long id, String code) { - LambdaQueryWrapper- * 任务实例 - *
- * - * @author codegen - * @since 2025-09-26 - */ -@Service -public class TaskInstanceInfoService { - - @Autowired - private TaskInstanceInfoMapper taskInstanceInfoMapper; - - public TaskInstanceInfoTb getRunningById(Long id) { - LambdaQueryWrapper- * 任务实例步骤明细 - *
- * - * @author codegen - * @since 2025-09-28 - */ -@Service -public class TaskInstanceStepDetailService { - - @Autowired - private TaskInstanceStepDetailMapper taskInstanceStepDetailMapper; - - /** - * 步骤执行成功 - * - * @param instanceDetailId 任务实例明细id - * @param stepDesc 步骤描述 - */ - public void success(Long instanceDetailId, String stepDesc) { - TaskInstanceStepDetailTb stepDetail = new TaskInstanceStepDetailTb(); - stepDetail.setInstanceDetailId(instanceDetailId); - stepDetail.setStepDesc(stepDesc); - stepDetail.setStepStatus(TaskStatusEnum.Success.getCode()); - taskInstanceStepDetailMapper.insert(stepDetail); - } - - /** - * 步骤执行失败 - * - * @param instanceDetailId 任务实例明细id - * @param stepDesc 步骤描述 - */ - public void fail(Long instanceDetailId, String stepDesc) { - TaskInstanceStepDetailTb stepDetail = new TaskInstanceStepDetailTb(); - stepDetail.setInstanceDetailId(instanceDetailId); - stepDetail.setStepDesc(stepDesc); - stepDetail.setStepStatus(TaskStatusEnum.Fail.getCode()); - taskInstanceStepDetailMapper.insert(stepDetail); - throw new BadRequestException(stepDesc); - } - - /** - * 根据明细ID删除步骤明细 - * - * @param instanceDetailIds 任务实例明细id集合 - */ - public void removeByInstanceDetailIds(List- * 任务模板 - *
- * - * @author codegen - * @since 2025-09-28 - */ -@Service -public class TaskTemplateInfoService { - - @Autowired - private TaskTemplateInfoMapper taskTemplateInfoMapper; - - public TaskTemplateInfoVo getTemplateInfoByECL(String envAlias, String contextName, String language, - String changeType) { - return taskTemplateInfoMapper.selectTemplateInfoByECL(envAlias, contextName, language, changeType); - } -} diff --git a/cutejava/cutejava-module-task-v2/src/main/resources/mapper/TaskInstanceDetailMapper.xml b/cutejava/cutejava-module-task-v2/src/main/resources/mapper/TaskInstanceDetailMapper.xml deleted file mode 100644 index 794721f9..00000000 --- a/cutejava/cutejava-module-task-v2/src/main/resources/mapper/TaskInstanceDetailMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - -