aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlanTaskController.java
@@ -7,6 +7,9 @@ import com.aps.core.domain.ApsPlanTask; import com.aps.core.service.ApsPlanTaskService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,6 +19,7 @@ /** * 计划任务管理 * */ @Tag(name = "计划任务管理", description = "计划任务管理") @RestController @RequestMapping("/planTask") public class ApsPlanTaskController extends BaseController { @@ -23,6 +27,7 @@ @Autowired private ApsPlanTaskService apsPlanTaskService; @Operation(summary = "计划任务管理列表", description = "分页查询") @RequiresPermissions("planTask:list") @GetMapping("/list") public Page<ApsPlanTask> list(ApsPlanTask task){ aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanTask.java
@@ -8,6 +8,7 @@ import java.io.Serializable; import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,6 +23,7 @@ @TableName(value ="aps_plan_task") @Data @Builder @Schema(description = "计划任务") public class ApsPlanTask extends BaseEntity implements Serializable { @TableField(exist = false) @@ -31,53 +33,62 @@ */ @TableField(value = "id") @TableId(type = IdType.INPUT) @Schema(description = "主键ID") private Long id; /** * 任务批次号 */ @Schema(description = "任务批次号") @TableField(value = "batch_num") private String batchNum; /** * 任务类型 */ @Schema(description = "任务类型") @TableField(value = "task_type") private String taskType; /** * 任务状态 */ @Schema(description = "任务状态") @TableField(value = "task_status") private String taskStatus; /** * 创建人 */ @Schema(description = "创建人") @TableField(value = "create_by") private String createBy; /** * 创建时间 */ @Schema(description = "创建时间") @TableField(value = "create_time") private Date createTime; /** * 更新人 */ @Schema(description = "更新人") @TableField(value = "update_by") private String updateBy; /** * 更新时间 */ @Schema(description = "更新时间") @TableField(value = "update_time") private Date updateTime; /** * 删除标记(0,1) */ @Schema(description = "删除标记(0,1)") @TableField(value = "del_flag") private Integer delFlag;
@@ -1,6 +1,5 @@ package com.aps.core.mapper; import com.aps.core.domain.ApsPlate.ApsPlateOrderPlanDate; import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireOrderEndDay; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -17,9 +16,8 @@ public interface ApsPlateStandardRequireOrderEndDayMapper extends BaseMapper<ApsPlateStandardRequireOrderEndDay> { Integer batchInsert(List<Long> planIds,String createBy); Integer batchRemove(List<Long> planIds); Integer batchRemoveByPlanId(List<Long> planIds); Integer batchRemove(); }
@@ -9,8 +9,10 @@ import com.aps.core.enums.PLAN_TASK_STATUS; import com.aps.core.enums.PLAN_TASK_TYPE; import com.aps.core.enums.REDIS_LOCK_KEY; import com.aps.core.mapper.ApsPlateStandardRequireOrderEndDayMapper; import com.aps.core.service.ApsPlate.IApsPlateStandardRequireBatchService; import com.aps.core.service.ApsPlate.IApsPlateStandardRequireService; import com.aps.core.service.ApsPlateStandardRequireOrderEndDayService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -46,10 +48,13 @@ @Resource RedisLockUtils redisLockUtils; @Resource ApsPlateStandardRequireOrderEndDayMapper orderEndDayMapper; @Override public Page<ApsPlanTask> pagingList(Page<ApsPlanTask> page ,ApsPlanTask task){ LambdaQueryWrapper<ApsPlanTask> queryWrapper=new LambdaQueryWrapper<>(); queryWrapper.like( !task.getTaskType().isEmpty(), ApsPlanTask::getTaskType,task.getTaskType()); queryWrapper.like( null!=task.getTaskType(), ApsPlanTask::getTaskType,task.getTaskType()); return mapper.selectPage(page, queryWrapper); } @@ -105,6 +110,8 @@ this.savePlanTask(batchNum); apsPlateStandardRequireService.generatorPlan(batchNum); this.updateTaskStatus(batchNum, PLAN_TASK_STATUS.FINISHED); /*清除已经存在的 工单计划完工时间*/ orderEndDayMapper.batchRemove(); log.info("计划任务执行完成!"+batchNum); return success(); }catch (Exception e){ aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireOrderEndDayServiceImpl.java
@@ -28,7 +28,7 @@ @Override public int saveBatch(List<Long> planIds) { mapper.batchRemove(planIds); mapper.batchRemoveByPlanId(planIds); return mapper.batchInsert(planIds, SecurityUtils.getUsername()); } } aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireOrderEndDayMapper.xml
@@ -56,7 +56,7 @@ from a </insert> <update id="batchRemove" parameterType="Long"> <update id="batchRemoveByPlanId" parameterType="Long"> update aps_plate_standard_require_order_end_day set del_flag=1 where plan_id in @@ -64,5 +64,10 @@ #{planId} </foreach> </update> <update id="batchRemove" > update aps_plate_standard_require_order_end_day set del_flag=1 where del_flag=0 </update> </mapper>
