feature: replyStatus新增回复状态2，如果轮时间过期则不允许点赞

server/src/main/java/com/pica/cloud/online/exam/analysis/server/controller/AnalysisController.java

@@ -24,6 +24,7 @@ import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -118,7 +119,7 @@ public class AnalysisController {
         PicaResponse.Builder<RoundExamTitleDto> builder = new PicaResponse.Builder<>();
 
         try {
-            RoundExamTitleDto roundExamTitleDto = analysisService.getRoundById(roundId);
+            RoundExamTitleDto roundExamTitleDto = analysisService.getRoundExamTitleDtoById(roundId);
             List<ExamTitleDto> examTitleDtoList = analysisService.getExamTitleListByRoundId(roundId);
 
             roundExamTitleDto.setExamTitleList(examTitleDtoList);
@@ -164,16 +165,20 @@ public class AnalysisController {
             examTitleReplyDto.setExamTitle(examTitleDto);
             examTitleReplyDto.setReplyList(replyDtoList);
 
+            AnalysisRound analysisRound = analysisService.getRoundInfoById(analysisRoundExamTitle.getRoundId());
             /**
              * 设置回复状态
              */
-            examTitleReplyDto.setReplyStatus(0);
+            if ((new Date()).getTime() > analysisRound.getEndTime().getTime()) {
+                examTitleReplyDto.setReplyStatus(2);
+            } else {
+                examTitleReplyDto.setReplyStatus(0);
 
-            if (user !=  null && user.getId() != 0) {
-                examTitleReplyDto.setReplyStatus(getReplyStatus(analysisRoundExamTitle.getAnalysisId(),
-                        examTitleId, user.getId()));
+                if (user != null && user.getId() != 0) {
+                    examTitleReplyDto.setReplyStatus(getReplyStatus(analysisRoundExamTitle.getAnalysisId(),
+                            examTitleId, user.getId()));
+                }
             }
-
             /**
              * 设置类型
              */
@@ -215,16 +220,22 @@ public class AnalysisController {
             examTitleReplyDetailDto.setExamTitle(examTitleDto);
             examTitleReplyDetailDto.setReply(replyDto);
 
+            AnalysisRound analysisRound = analysisService.getRoundInfoById(analysisRoundExamTitle.getRoundId());
+
             /**
              * 设置回复状态
              */
-            examTitleReplyDetailDto.setReplyStatus(0);
-
-            if (user !=  null && user.getId() != 0) {
-                examTitleReplyDetailDto.setReplyStatus(getReplyStatus(analysisRoundExamTitle.getAnalysisId(),
-                        reply.getAnalysisRoundExamTitleId(), user.getId()));
+            if ((new Date()).getTime() > analysisRound.getEndTime().getTime()) {
+                examTitleReplyDetailDto.setReplyStatus(2);
             }
+            {
+                examTitleReplyDetailDto.setReplyStatus(0);
 
+                if (user != null && user.getId() != 0) {
+                    examTitleReplyDetailDto.setReplyStatus(getReplyStatus(analysisRoundExamTitle.getAnalysisId(),
+                            reply.getAnalysisRoundExamTitleId(), user.getId()));
+                }
+            }
             /**
              * 设置类型
              */
@@ -371,15 +382,19 @@ public class AnalysisController {
             examTitleReplyDto.setExamTitle(examTitleDto);
             examTitleReplyDto.setReplyList(replyDtoList);
 
+            AnalysisRound analysisRound = analysisService.getRoundInfoById(analysisRoundExamTitle.getRoundId());
             /**
              * 设置回复状态
              */
-            examTitleReplyDto.setReplyStatus(0);
-            if (user !=  null && user.getId() != 0) {
-                examTitleReplyDto.setReplyStatus(getReplyStatus(analysisRoundExamTitle.getAnalysisId(),
-                        examTitleId, user.getId()));
+            if ((new Date()).getTime() > analysisRound.getEndTime().getTime()) {
+                examTitleReplyDto.setReplyStatus(2);
+            } else {
+                examTitleReplyDto.setReplyStatus(0);
+                if (user != null && user.getId() != 0) {
+                    examTitleReplyDto.setReplyStatus(getReplyStatus(analysisRoundExamTitle.getAnalysisId(),
+                            examTitleId, user.getId()));
+                }
             }
-
             /**
              * 设置类型
              */
@@ -422,16 +437,20 @@ public class AnalysisController {
             examTitleReplyDetailDto.setExamTitle(examTitleDto);
             examTitleReplyDetailDto.setReply(replyDto);
 
+            AnalysisRound analysisRound = analysisService.getRoundInfoById(analysisRoundExamTitle.getRoundId());
             /**
              * 设置回复状态
              */
-            examTitleReplyDetailDto.setReplyStatus(0);
+            if ((new Date()).getTime() > analysisRound.getEndTime().getTime()) {
+                examTitleReplyDetailDto.setReplyStatus(2);
+            } else {
+                examTitleReplyDetailDto.setReplyStatus(0);
 
-            if (user !=  null && user.getId() != 0) {
-                examTitleReplyDetailDto.setReplyStatus(getReplyStatus(analysisRoundExamTitle.getAnalysisId(),
-                        reply.getAnalysisRoundExamTitleId(),  user.getId()));
+                if (user != null && user.getId() != 0) {
+                    examTitleReplyDetailDto.setReplyStatus(getReplyStatus(analysisRoundExamTitle.getAnalysisId(),
+                            reply.getAnalysisRoundExamTitleId(), user.getId()));
+                }
             }
-
             /**
              * 设置类型
              */
@@ -558,7 +577,7 @@ public class AnalysisController {
                 roundExamTitleV2Dto.setRoundList(roundDtoList);
             }
 
-            RoundExamTitleDto roundExamTitleDto = analysisService.getRoundById(roundId);
+            RoundExamTitleDto roundExamTitleDto = analysisService.getRoundExamTitleDtoById(roundId);
 
             /**
              * 转换格式

server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/CHCAnalysisService.java

 package com.pica.cloud.online.exam.analysis.server.service;
 
 import com.pica.cloud.online.exam.analysis.common.dto.*;
+import com.pica.cloud.online.exam.analysis.server.entity.AnalysisRound;
 import com.pica.cloud.online.exam.analysis.server.entity.AnalysisRoundExamTitle;
 import com.pica.cloud.online.exam.analysis.server.entity.CHCAnalysis;
 import com.pica.cloud.online.exam.analysis.server.entity.Reply;
@@ -45,7 +46,14 @@ public interface CHCAnalysisService {
      * @param roundId
      * @return
      */
-    RoundExamTitleDto getRoundById(Integer roundId);
+    RoundExamTitleDto getRoundExamTitleDtoById(Integer roundId);
+
+    /**
+     * 根据轮的id获取信息
+     * @param roundId
+     * @return
+     */
+    AnalysisRound getRoundInfoById(Integer roundId);
 
     /**
      * 根据轮的id获取题目信息

server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/impl/CHCAnalysisServiceImpl.java

@@ -138,7 +138,7 @@ public class CHCAnalysisServiceImpl implements CHCAnalysisService {
     }
 
     @Override
-    public RoundExamTitleDto getRoundById(Integer roundId) {
+    public RoundExamTitleDto getRoundExamTitleDtoById(Integer roundId) {
         AnalysisRound round = analysisRoundMapper.selectByPrimaryKey(roundId);
 
         if (null == round) {
@@ -159,6 +159,11 @@ public class CHCAnalysisServiceImpl implements CHCAnalysisService {
         return roundExamTitleDto;
     }
 
+    @Override
+    public AnalysisRound getRoundInfoById(Integer roundId) {
+        return analysisRoundMapper.selectByPrimaryKey(roundId);
+    }
+
     @Override
     public List<ExamTitleDto> getExamTitleListByRoundId(Integer roundId) {
         List<AnalysisRoundExamTitle> roundExamTitleList = analysisRoundExamTitleMapper.selectExamTitleListByRoundId(roundId);