新增历史任务操作

cert
anthonywj 2 years ago
parent 32be5e61d1
commit d8e488c6c1

@ -73,7 +73,7 @@ public class TraceTaskController {
//任务列表 //任务列表
@ApiOperation(value = "查询历史人物", response = TraceTaskDlResponse.class) @ApiOperation(value = "查询历史任务", response = TraceTaskDlResponse.class)
@AuthRuleAnnotation("udi/trace/task/history/filter") @AuthRuleAnnotation("udi/trace/task/history/filter")
@GetMapping("udi/trace/task/history/filter") @GetMapping("udi/trace/task/history/filter")
public BaseResponse filterhistoryTask(TraceTaskDetailRequest traceTaskDetailRequest) { public BaseResponse filterhistoryTask(TraceTaskDetailRequest traceTaskDetailRequest) {

@ -1,14 +1,18 @@
package com.glxp.api.task.mq; package com.glxp.api.task.mq;
import cn.hutool.core.bean.BeanUtil;
import com.glxp.api.config.rabbit.TopicRabbitConfig; import com.glxp.api.config.rabbit.TopicRabbitConfig;
import com.glxp.api.entity.trace.MqTaskDelayMessage; import com.glxp.api.entity.trace.MqTaskDelayMessage;
import com.glxp.api.entity.trace.MqTraceMessage; import com.glxp.api.entity.trace.MqTraceMessage;
import com.glxp.api.entity.trace.TraceTaskHistoryEntity;
import com.glxp.api.entity.trace.TraceTaskNoticeEntity; import com.glxp.api.entity.trace.TraceTaskNoticeEntity;
import com.glxp.api.service.trace.TraceTaskHistoryService;
import com.glxp.api.service.trace.TraceTaskNoticeService; import com.glxp.api.service.trace.TraceTaskNoticeService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.amqp.rabbit.annotation.RabbitHandler;
import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Date; import java.util.Date;
@ -20,12 +24,15 @@ public class TraceSearchReceiver {
@Resource @Resource
TraceTaskNoticeService taskNoticeService; TraceTaskNoticeService taskNoticeService;
@Resource
TraceTaskHistoryService traceTaskHistoryService;
public void traceReceiver(String mqTraceMessage) { public void traceReceiver(String mqTraceMessage) {
System.out.println("xxxx.xxxx.xxxx收到的消息内容为\n" + mqTraceMessage); System.out.println("xxxx.xxxx.xxxx收到的消息内容为\n" + mqTraceMessage);
//todo 测试用 //todo 测试用
} }
@Transactional(rollbackFor = Exception.class)
@RabbitListener(queues = TopicRabbitConfig.delaytrace) @RabbitListener(queues = TopicRabbitConfig.delaytrace)
public void traceDeleyReceiver(MqTaskDelayMessage mqTaskDelayMessage) { public void traceDeleyReceiver(MqTaskDelayMessage mqTaskDelayMessage) {
@ -36,7 +43,11 @@ public class TraceSearchReceiver {
taskNoticeEntity.setUpdateTime(new Date()); taskNoticeEntity.setUpdateTime(new Date());
taskNoticeService.updateById(taskNoticeEntity); taskNoticeService.updateById(taskNoticeEntity);
} else if (mqTaskDelayMessage.getTaskStatus() == 3) { } else if (mqTaskDelayMessage.getTaskStatus() == 3) {
log.info(mqTaskDelayMessage.getTaskId() + ":任务已完成,过期删除"); log.info(mqTaskDelayMessage.getTaskId() + ":任务已完成,过期删除,并存到备份表");
TraceTaskNoticeEntity taskNoticeEntity = taskNoticeService.getById(mqTaskDelayMessage.getTaskId());
TraceTaskHistoryEntity traceTaskHistoryEntity = new TraceTaskHistoryEntity();
BeanUtil.copyProperties(taskNoticeEntity, traceTaskHistoryEntity);
traceTaskHistoryService.saveOrUpdate(traceTaskHistoryEntity);
taskNoticeService.removeById(mqTaskDelayMessage.getTaskId()); taskNoticeService.removeById(mqTaskDelayMessage.getTaskId());
} }
} }

Loading…
Cancel
Save