From d8e488c6c185c442f18b42d94208bad57c3703b6 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 14 Jun 2023 09:29:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8E=86=E5=8F=B2=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/trace/TraceTaskController.java | 2 +- .../com/glxp/api/task/mq/TraceSearchReceiver.java | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java b/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java index 1a82432..b51e82f 100644 --- a/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java +++ b/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java @@ -73,7 +73,7 @@ public class TraceTaskController { //任务列表 - @ApiOperation(value = "查询历史人物", response = TraceTaskDlResponse.class) + @ApiOperation(value = "查询历史任务", response = TraceTaskDlResponse.class) @AuthRuleAnnotation("udi/trace/task/history/filter") @GetMapping("udi/trace/task/history/filter") public BaseResponse filterhistoryTask(TraceTaskDetailRequest traceTaskDetailRequest) { diff --git a/src/main/java/com/glxp/api/task/mq/TraceSearchReceiver.java b/src/main/java/com/glxp/api/task/mq/TraceSearchReceiver.java index 368c998..534f4ec 100644 --- a/src/main/java/com/glxp/api/task/mq/TraceSearchReceiver.java +++ b/src/main/java/com/glxp/api/task/mq/TraceSearchReceiver.java @@ -1,14 +1,18 @@ package com.glxp.api.task.mq; +import cn.hutool.core.bean.BeanUtil; import com.glxp.api.config.rabbit.TopicRabbitConfig; import com.glxp.api.entity.trace.MqTaskDelayMessage; 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.service.trace.TraceTaskHistoryService; import com.glxp.api.service.trace.TraceTaskNoticeService; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Date; @@ -20,12 +24,15 @@ public class TraceSearchReceiver { @Resource TraceTaskNoticeService taskNoticeService; + @Resource + TraceTaskHistoryService traceTaskHistoryService; public void traceReceiver(String mqTraceMessage) { System.out.println("xxxx.xxxx.xxxx收到的消息内容为:\n" + mqTraceMessage); //todo 测试用 } + @Transactional(rollbackFor = Exception.class) @RabbitListener(queues = TopicRabbitConfig.delaytrace) public void traceDeleyReceiver(MqTaskDelayMessage mqTaskDelayMessage) { @@ -36,7 +43,11 @@ public class TraceSearchReceiver { taskNoticeEntity.setUpdateTime(new Date()); taskNoticeService.updateById(taskNoticeEntity); } 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()); } }