From 4398937fdc9ee8db0cd6a1dfc022c129f4632826 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 01 七月 2024 17:17:20 +0800
Subject: [PATCH] 合并、调整
---
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
index 0809c9e..635e59f 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -30,9 +30,8 @@
import com.ycl.jxkg.enums.general.ExamSubmitTempStatusEnum;
import com.ycl.jxkg.mapper.*;
import com.ycl.jxkg.rabbitmq.msg.ExamStatusMsg;
-import com.ycl.jxkg.rabbitmq.product.Product;
+import com.ycl.jxkg.rabbitmq.product.Producer;
import com.ycl.jxkg.server.WebsocketServer;
-import com.ycl.jxkg.service.ExamPaperScoreService;
import com.ycl.jxkg.service.ExamPaperService;
import com.ycl.jxkg.service.ExamService;
import com.ycl.jxkg.utils.DateTimeUtil;
@@ -59,6 +58,8 @@
@RequiredArgsConstructor
public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements ExamService {
+ private static final String ANSWER_SPLIT = ",";
+
private final ExamMapper examMapper;
private final WebContext webContext;
private final QuestionMapper questionMapper;
@@ -69,9 +70,7 @@
private final WebsocketServer websocketServer;
private final UserMapper userMapper;
private final ExamPaperScoreMapper examPaperScoreMapper;
- private final ExamPaperScoreService examPaperScoreService;
- private static final String ANSWER_SPLIT = ",";
- private final Product product;
+ private final Producer producer;
/**
* 娣诲姞
@@ -130,20 +129,20 @@
ingMsg.setVersion(version);
ingMsg.setExamId(entity.getId());
ingMsg.setTargetStatus(ExamStatusEnum.ING);
- product.examMsg(entity.getId(), JSON.toJSONString(ingMsg), DateTimeUtil.getTwoTimeDiffMS(entity.getStartTime(), new Date()));
+ producer.examMsg(entity.getId(), JSON.toJSONString(ingMsg), DateTimeUtil.getTwoTimeDiffMS(entity.getStartTime(), new Date()));
// 缁撴潫鐘舵�佹秷鎭�
ExamStatusMsg finishedMsg = new ExamStatusMsg();
finishedMsg.setVersion(version);
finishedMsg.setExamId(entity.getId());
finishedMsg.setTargetStatus(ExamStatusEnum.FINISHED);
- product.examMsg(entity.getId(), JSON.toJSONString(finishedMsg), DateTimeUtil.getTwoTimeDiffMS(entity.getEndTime(), new Date()));
+ producer.examMsg(entity.getId(), JSON.toJSONString(finishedMsg), DateTimeUtil.getTwoTimeDiffMS(entity.getEndTime(), new Date()));
} else if (ExamStatusEnum.ING.equals(entity.getStatus())) { // 褰撳墠鏄繘琛屼腑鐘舵�佸垯鍙渶鍙戦�佺粨鏉熸秷鎭�
// 缁撴潫鐘舵�佹秷鎭�
ExamStatusMsg finishedMsg = new ExamStatusMsg();
finishedMsg.setVersion(0);
finishedMsg.setExamId(entity.getId());
finishedMsg.setTargetStatus(ExamStatusEnum.FINISHED);
- product.examMsg(entity.getId(), JSON.toJSONString(finishedMsg), DateTimeUtil.getTwoTimeDiffMS(entity.getEndTime(), new Date()));
+ producer.examMsg(entity.getId(), JSON.toJSONString(finishedMsg), DateTimeUtil.getTwoTimeDiffMS(entity.getEndTime(), new Date()));
}
}
--
Gitblit v1.8.0