From 56cc4ea95bcacdde7bf7c3115254bf9e977beed2 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 5 Sep 2024 13:38:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E5=91=A8=E3=80=81=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E5=AE=9A=E6=97=B6=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/common/service/impl/ClassEntityServiceImpl.java  | 5 +----
 .../modules/common/service/impl/ClassExamServiceImpl.java    | 3 +--
 .../java/com/peanut/modules/mq/Consumer/CommonConsumer.java  | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
index 70316b4a..e4ee3e0f 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
@@ -314,10 +314,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
                         DelayQueueConfig.COMMON_EXCHANGE,
                         DelayQueueConfig.COMMON_ROUTING_KEY,
                         "examDays"+","+classEntity.getId(),
-                        messagePostProcessor(DateUtils.addDateDays(
-                                DateUtil.parseDate(LocalDate.now().toString()),
-                                classModel.getDays()-classModel.getExamDays())
-                                .getTime())
+                        messagePostProcessor((classModel.getDays()-classModel.getExamDays())*24*60*60*1000)
                 );
             }
         }else {
diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java
index c057a895..643cdec2 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java
@@ -220,12 +220,11 @@ public class ClassExamServiceImpl extends ServiceImpl<ClassExamDao, ClassExam> i
         classExamUser.setStartTime(startTime);
         classExamUserDao.insert(classExamUser);
         //在考试结束时检查是否提交，未完成者自动提交
-        //时间为2小时，再队列执行中也有设置，修改时要同步修改
         rabbitTemplate.convertAndSend(
                 DelayQueueConfig.COMMON_EXCHANGE,
                 DelayQueueConfig.COMMON_ROUTING_KEY,
                 "examSubmit"+","+classExamUser.getId(),
-                messagePostProcessor(DateUtils.addDateHours(startTime,2).getTime())
+                messagePostProcessor(60*60*1000)
         );
         return R.ok().put("examPaper",resultList).put("id",classExamUser.getId()).put("startTime",classExamUser.getStartTime());
 
diff --git a/src/main/java/com/peanut/modules/mq/Consumer/CommonConsumer.java b/src/main/java/com/peanut/modules/mq/Consumer/CommonConsumer.java
index f82197cd..5aba8675 100644
--- a/src/main/java/com/peanut/modules/mq/Consumer/CommonConsumer.java
+++ b/src/main/java/com/peanut/modules/mq/Consumer/CommonConsumer.java
@@ -27,7 +27,7 @@ public class CommonConsumer {
     @Autowired
     private ClassExamService classexamService;
 
-    @RabbitListener(queues = DelayQueueConfig.USERVIP_QUEUE)
+    @RabbitListener(queues = DelayQueueConfig.COMMON_QUEUE)
     public void commonConsumer(String typeAndParam) {
         //参数为   业务模块 + , + 参数
         String[] typeAndParams = typeAndParam.split(",");