Merge branch 'dev' into dev_phase2

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

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

@@ -167,9 +167,8 @@ public class AnalysisController {
 
         PICAUser user = CommonUtils.getUserByToken(redisClient, token);
 
-        if (user == null) {
-            System.out.println("starrecord: user=null token=" + token);
-            return ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_INVALID_TOKEN);
+        if (user == null || user.getId().intValue() == 0) {
+            return ReturnUtil.getPicaResponse(PicaResultCode.LOGIN_FAILE);
         }
 
         Doctor doctor = doctorService.getDoctorById(user.getId());
@@ -183,7 +182,7 @@ public class AnalysisController {
          */
         if (!(doctor.getStatus().equals(CommonConstants.DOCTOR_STATUS_3) ||
                 doctor.getStatus().equals(CommonConstants.DOCTOR_STATUS_6) ||
-                doctor.getStatus().equals(CommonConstants.DOCTOR_STATUS_7)) ) {
+                doctor.getStatus().equals(CommonConstants.DOCTOR_STATUS_7) )) {
             return ReturnUtil.getPicaResponse(PicaResultCode.INTERFACE_FORBID_VISIT);
         }
 
@@ -219,74 +218,4 @@ public class AnalysisController {
 
         return ReturnUtil.getPicaResponse(PicaResultCode.SUCCESS);
     }
-
-    @ApiOperation(value = "获取某一道题目的下一道题", response = PicaResponse.class)
-    @RequestMapping(value = "/nextExamTitle/{examTitleId}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
-    public PicaResponse<ExamTitleReplyDto> nextReplyList(@PathVariable("examTitleId") Integer examTitleId,
-                                                        @RequestHeader(required = false) String token) {
-
-        PICAUser user = null;
-
-        if (token != null) {
-            user = CommonUtils.getUserByToken(redisClient, token);
-        }
-
-        PicaResponse.Builder<ExamTitleReplyDto> builder = new PicaResponse.Builder<>();
-
-        try {
-            AnalysisRoundExamTitle analysisRoundExamTitle = analysisService.getAnanlysisRoundExamTitleById(examTitleId);
-
-            ExamTitleReplyDto examTitleReplyDto = new ExamTitleReplyDto();
-            ExamTitleDto examTitleDto = analysisService.getNextExamTitleDtoById(analysisRoundExamTitle.getRoundId(), examTitleId);
-            List<ReplyDto> replyDtoList = analysisService.getReplyListDtoByExamTitleId(examTitleDto.getExamTitleId(), user !=  null ? user.getId() : 0);
-
-            examTitleReplyDto.setAnalysisId(analysisRoundExamTitle.getAnalysisId());
-            examTitleReplyDto.setRoundId(analysisRoundExamTitle.getRoundId());
-            examTitleReplyDto.setExamTitle(examTitleDto);
-            examTitleReplyDto.setReplyList(replyDtoList);
-
-            builder.setData(examTitleReplyDto);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_INNER_ERROR);
-        }
-
-        return builder.build();
-    }
-
-    @ApiOperation(value = "获取某一道题目的下一道题", response = PicaResponse.class)
-    @RequestMapping(value = "/nextReply/{replyId}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
-    public PicaResponse<ExamTitleReplyDto> nextReplyDetail(@PathVariable("replyId") Integer replyId,
-                                                         @RequestHeader(required = false) String token) {
-
-        PICAUser user = null;
-
-        if (token != null) {
-            user = CommonUtils.getUserByToken(redisClient, token);
-        }
-
-        PicaResponse.Builder<ExamTitleReplyDetailDto> builder = new PicaResponse.Builder<>();
-
-        try {
-            ExamTitleReplyDetailDto examTitleReplyDetailDto = new ExamTitleReplyDetailDto();
-
-            Reply reply =  analysisService.getNextReplyById(replyId);
-            AnalysisRoundExamTitle analysisRoundExamTitle = analysisService.getAnanlysisRoundExamTitleById(reply.getAnalysisRoundExamTitleId());
-
-            ExamTitleDto examTitleDto = analysisService.getExamTitleDtoById(reply.getAnalysisRoundExamTitleId());
-            ReplyDto replyDto = analysisService.getReplyDtoByReply(reply, user != null ? user.getId() : 0);
-
-            examTitleReplyDetailDto.setAnalysisId(analysisRoundExamTitle.getAnalysisId());
-            examTitleReplyDetailDto.setRoundId(analysisRoundExamTitle.getRoundId());
-            examTitleReplyDetailDto.setExamTitle(examTitleDto);
-            examTitleReplyDetailDto.setReply(replyDto);
-
-            builder.setData(examTitleReplyDetailDto);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_INNER_ERROR);
-        }
-
-        return builder.build();
-    }
 }

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

@@ -154,7 +154,7 @@ public class CHCAnalysisServiceImpl implements CHCAnalysisService {
         examTitleDto.setExamTitleId(analysisRoundExamTitle.getId());
         examTitleDto.setSeqNo(analysisRoundExamTitle.getSeqNo());
         examTitleDto.setType(analysisRoundExamTitle.getExamTitleType());
-        examTitleDto.setQuestion(analysisRoundExamTitle.getQuestion());
+        examTitleDto.setQuestion(analysisRoundExamTitle.getSeqNo().toString() + "." + analysisRoundExamTitle.getQuestion());
 
         /**
          * 设置选项