fix: 合并代码 发布uat环境

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

 package com.pica.cloud.online.exam.analysis.server.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.entity.PicaResultCode;
 import com.pica.cloud.foundation.redis.RedisClient;
@@ -11,10 +12,13 @@ import com.pica.cloud.online.exam.analysis.common.util.ReturnUtil;
 import com.pica.cloud.online.exam.analysis.server.client.IConfigServiceClient;
 import com.pica.cloud.online.exam.analysis.server.configuration.PropertiesConfiguration;
 import com.pica.cloud.online.exam.analysis.server.entity.*;
+import com.pica.cloud.online.exam.analysis.server.service.AntiSpamService;
 import com.pica.cloud.online.exam.analysis.server.service.CHCAnalysisService;
+import com.pica.cloud.online.exam.analysis.server.service.CHCRankingListService;
 import com.pica.cloud.online.exam.analysis.server.service.DoctorService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import javassist.bytecode.ExceptionsAttribute;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.web.bind.annotation.*;
@@ -44,6 +48,12 @@ public class AnalysisController {
     @Autowired
     private DoctorService doctorService;
 
+    @Autowired
+    private AntiSpamService antiSpamService;
+
+    @Autowired
+    private CHCRankingListService rankingListService;
+
     @ApiOperation(value = "获取活动详情", response = PicaResponse.class)
     @RequestMapping(value = "/activityDetail", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     public PicaResponse<CHCAnalysisDto> getActivityDetail(@RequestParam(required = false) Integer id) {
@@ -55,7 +65,31 @@ public class AnalysisController {
         id = (id == null ? 1 : id);
 
         try {
-            CHCAnalysisDto analysisDto = analysisService.getCHCAnalysisById(id);
+            CHCAnalysisDto analysisDto = analysisService.getCHCAnalysisDtoById(id);
+            List<AnalysisRoundDto> roundList = analysisService.getRoundListByAnalysisId(id);
+
+            analysisDto.setRoundList(roundList);
+            builder.setData(analysisDto);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_INNER_ERROR);
+        }
+
+        return builder.build();
+    }
+
+    @ApiOperation(value = "获取活动详情", response = PicaResponse.class)
+    @RequestMapping(value = "/psaActivityDetail", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+    public PicaResponse<CHCAnalysisDto> getPSAActivityDetail(@RequestParam(required = false) Integer id) {
+        PicaResponse.Builder<CHCAnalysisDto> builder = new PicaResponse.Builder<>();
+
+        /**
+         * 如果不传活动id进来，活动id就用1
+         */
+        id = (id == null ? 2 : id);
+
+        try {
+            CHCAnalysisDto analysisDto = analysisService.getPSAAnalysisDtoById(id);
             List<AnalysisRoundDto> roundList = analysisService.getRoundListByAnalysisId(id);
 
             analysisDto.setRoundList(roundList);
@@ -90,7 +124,7 @@ public class AnalysisController {
     @ApiOperation(value = "获取某一道题目的回复列表", response = PicaResponse.class)
     @RequestMapping(value = "/replyList/{examTitleId}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     public PicaResponse<ExamTitleReplyDto> getReplyList(@PathVariable("examTitleId") Integer examTitleId,
-                                                        @RequestParam(required = false) String token) {
+                                                        @RequestHeader(required = false) String token) {
 
         PICAUser user = null;
 
@@ -112,6 +146,22 @@ public class AnalysisController {
             examTitleReplyDto.setExamTitle(examTitleDto);
             examTitleReplyDto.setReplyList(replyDtoList);
 
+            /**
+             * 设置回复状态
+             */
+            examTitleReplyDto.setReplyStatus(0);
+
+            if (user !=  null && user.getId() != 0) {
+                examTitleReplyDto.setReplyStatus(getReplyStatus(analysisRoundExamTitle.getAnalysisId(),
+                        examTitleId, user.getId()));
+            }
+
+            /**
+             * 设置类型
+             */
+            CHCAnalysis analysis = analysisService.getAnalysisById(analysisRoundExamTitle.getAnalysisId());
+            examTitleReplyDto.setType(analysis.getType().intValue());
+
             builder.setData(examTitleReplyDto);
         } catch (Exception e) {
             e.printStackTrace();
@@ -124,7 +174,7 @@ public class AnalysisController {
     @ApiOperation(value = "查看回复详情", response = PicaResponse.class)
     @RequestMapping(value = "/replyDetail/{replyId}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     public PicaResponse<ExamTitleReplyDetailDto> getReplyDetail(@PathVariable("replyId") Integer replyId,
-                                                                @RequestParam(required = false) String token) {
+                                                                @RequestHeader(required = false) String token) {
         PICAUser user = null;
 
         if (token != null) {
@@ -147,6 +197,22 @@ public class AnalysisController {
             examTitleReplyDetailDto.setExamTitle(examTitleDto);
             examTitleReplyDetailDto.setReply(replyDto);
 
+            /**
+             * 设置回复状态
+             */
+            examTitleReplyDetailDto.setReplyStatus(0);
+
+            if (user !=  null && user.getId() != 0) {
+                examTitleReplyDetailDto.setReplyStatus(getReplyStatus(analysisRoundExamTitle.getAnalysisId(),
+                        reply.getAnalysisRoundExamTitleId(), user.getId()));
+            }
+
+            /**
+             * 设置类型
+             */
+            CHCAnalysis analysis = analysisService.getAnalysisById(analysisRoundExamTitle.getAnalysisId());
+            examTitleReplyDetailDto.setType(analysis.getType().intValue());
+
             builder.setData(examTitleReplyDetailDto);
         } catch (Exception e) {
             e.printStackTrace();
@@ -156,11 +222,50 @@ public class AnalysisController {
         return builder.build();
     }
 
+    @ApiOperation(value = "查看回复详情", response = PicaResponse.class)
+    @RequestMapping(value = "/replyDetailByExamTitleId/{examTitleId}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+    public PicaResponse<ExamTitleReplyDetailDto> getReplyDetailByExamTitleId(@PathVariable("examTitleId") Integer examTitleId,
+                                                                @RequestHeader(required = false) String token) {
+        System.out.println("replyDetailByExamTitleId: examTitleId == " + examTitleId.toString() + ", token=" + 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.getReplyByExamTitleId(examTitleId, user != null ? user.getId() : 0);
+            AnalysisRoundExamTitle analysisRoundExamTitle = analysisService.getAnanlysisRoundExamTitleById(examTitleId);
+            ExamTitleDto examTitleDto = analysisService.getExamTitleDtoById(examTitleId);
+
+            ReplyDto replyDto = new ReplyDto();
+            if (null != reply) {
+                replyDto = analysisService.getReplyDtoByReply(reply, user != null ? user.getId() : 0);
+            } else {
+                replyDto.setContent("");
+            }
+            examTitleReplyDetailDto.setAnalysisId(analysisRoundExamTitle.getAnalysisId());
+            examTitleReplyDetailDto.setRoundId(analysisRoundExamTitle.getRoundId());
+            examTitleReplyDetailDto.setExamTitle(examTitleDto);
+            examTitleReplyDetailDto.setReply(replyDto);
+
+            builder.setData(examTitleReplyDetailDto);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return builder.build();
+    }
+
     @ApiOperation(value = "点赞", response = PicaResponse.class)
     @RequestMapping(value = "/starReply/{replyId}/analysis/{analysisId}/round/{roundId}/examTitle/{examTitleId}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     public PicaResponse starReply(@PathVariable("analysisId") Integer analysisId, @PathVariable("roundId") Integer roundId,
                                   @PathVariable("examTitleId") Integer examTitleId, @PathVariable("replyId") Integer replyId,
-                                  @RequestParam(required = false) String token) {
+                                  @RequestHeader(required = false) String token) {
         if (token == null) {
             return ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_NO_TOKEN);
         }
@@ -168,12 +273,14 @@ public class AnalysisController {
         PICAUser user = CommonUtils.getUserByToken(redisClient, token);
 
         if (user == null || user.getId().intValue() == 0) {
+            System.out.println("starrecord: user == null, token=" + token);
             return ReturnUtil.getPicaResponse(PicaResultCode.LOGIN_FAILE);
         }
 
         Doctor doctor = doctorService.getDoctorById(user.getId());
 
         if (doctor == null) {
+            System.out.println("starrecord: doctor == null, userid=" + user.getId().toString());
             return ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_INVALID_TOKEN);
         }
 
@@ -199,15 +306,17 @@ public class AnalysisController {
 
     @ApiOperation(value = "取消点赞", response = PicaResponse.class)
     @RequestMapping(value = "/cancelStar/{replyId}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
-    public PicaResponse cancelStar( @PathVariable("replyId") Integer replyId, @RequestParam(required = false) String token) {
+    public PicaResponse cancelStar( @PathVariable("replyId") Integer replyId,
+                                    @RequestHeader(required = false) String token) {
         if (token == null) {
             return ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_NO_TOKEN);
         }
 
         PICAUser user = CommonUtils.getUserByToken(redisClient, token);
 
-        if (user == null) {
-            return ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_INVALID_TOKEN);
+        if (user == null || user.getId().intValue() == 0) {
+            System.out.println("cancelStar: user == null, token=" + token);
+            return ReturnUtil.getPicaResponse(PicaResultCode.LOGIN_FAILE);
         }
 
         System.out.println("cancelStar: replyid=" +  replyId.toString() + " token=" + token);
@@ -218,4 +327,191 @@ 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);
+
+            /**
+             * 设置回复状态
+             */
+            examTitleReplyDto.setReplyStatus(0);
+            if (user !=  null && user.getId() != 0) {
+                examTitleReplyDto.setReplyStatus(getReplyStatus(analysisRoundExamTitle.getAnalysisId(),
+                        examTitleId, user.getId()));
+            }
+
+            /**
+             * 设置类型
+             */
+            CHCAnalysis analysis = analysisService.getAnalysisById(analysisRoundExamTitle.getAnalysisId());
+            examTitleReplyDto.setType(analysis.getType().intValue());
+
+            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);
+
+            /**
+             * 设置回复状态
+             */
+            examTitleReplyDetailDto.setReplyStatus(0);
+
+            if (user !=  null && user.getId() != 0) {
+                examTitleReplyDetailDto.setReplyStatus(getReplyStatus(analysisRoundExamTitle.getAnalysisId(),
+                        reply.getAnalysisRoundExamTitleId(),  user.getId()));
+            }
+
+            /**
+             * 设置类型
+             */
+            CHCAnalysis analysis = analysisService.getAnalysisById(analysisRoundExamTitle.getAnalysisId());
+            examTitleReplyDetailDto.setType(analysis.getType().intValue());
+
+            builder.setData(examTitleReplyDetailDto);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_INNER_ERROR);
+        }
+
+        return builder.build();
+    }
+
+    @ApiOperation(value = "回复", response = PicaResponse.class)
+    @RequestMapping(value = "/reply/{examTitleId}", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+    public PicaResponse reply( @PathVariable("examTitleId") Integer examTitleId,
+                               @RequestBody String content,
+                               @RequestHeader String token) {
+        if (token == null) {
+            PicaResponse picaResponse = ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_NO_TOKEN);
+            picaResponse.setData("");
+            return picaResponse;
+        }
+
+        PICAUser user = CommonUtils.getUserByToken(redisClient, token);
+
+        if (user == null || user.getId().intValue() == 0) {
+            System.out.println("reply: user == null, token=" + token);
+            PicaResponse picaResponse = ReturnUtil.getPicaResponse(PicaResultCode.LOGIN_FAILE);
+            picaResponse.setData("");
+            return picaResponse;
+        }
+
+        try {
+            JSONObject jsonObject = JSONObject.parseObject(content);
+            content = jsonObject.get("content").toString();
+        } catch (Exception e) {
+            System.out.println("parse error: " + content);
+        }
+
+        /**
+         * 如果判断检测的数据中有垃圾 直接返回
+         */
+        PicaResponse response = antiSpamService.processString(content);
+        if (!response.getCode().equals(PicaResultCode.SUCCESS.code())) {
+            response.setData("");
+            return response;
+        }
+
+        /**
+         * 插入数据库
+         */
+        try {
+            analysisService.insertReply(examTitleId, content, user.getId());
+        } catch (Exception e) {
+            PicaResponse picaResponse = ReturnUtil.getPicaResponse(PicaResultCode.INTERFACE_INVOKE_EXCEPTION);
+            picaResponse.setData("");
+            return picaResponse;
+        }
+
+        PicaResponse picaResponse = ReturnUtil.getPicaResponse(PicaResultCode.SUCCESS);
+        picaResponse.setMessage("发布成功");
+        return picaResponse;
+    }
+
+    Integer getReplyStatus(Integer analysisId, Integer examTitleId,  Integer userId) {
+        Doctor doctor = doctorService.getDoctorById(userId);
+
+        if (doctor != null) {
+            CHCAnalysis analysis =  analysisService.getAnalysisById(analysisId);
+            if (analysis.getType() == 1) {
+                /**
+                 * CHC 获取考试前两百名
+                 */
+                if (rankingListService.isRankingInTop200(doctor.getId())) {
+                    return analysisService.getReplyStatus(examTitleId, userId);
+                }
+
+            } else if (analysis.getType() == 2) {
+                /**
+                 * 如果为认证 不可见
+                 */
+                if (!(doctor.getStatus().equals(CommonConstants.DOCTOR_STATUS_3) ||
+                        doctor.getStatus().equals(CommonConstants.DOCTOR_STATUS_6) ||
+                        doctor.getStatus().equals(CommonConstants.DOCTOR_STATUS_7) )) {
+                    return 0;
+                }
+                /**
+                 * PSA 职务职称主任/副主任 院长/副院长 科长/副科长 管理人数100以上
+                 */
+                if (doctorService.isAuth(doctor.getId())) {
+                    return analysisService.getReplyStatus(examTitleId, userId);
+                }
+            }
+        }
+
+        return 0;
+    }
 }

server/src/main/resources/bootstrap.properties

-spring.profiles.active=prod
+spring.profiles.active=uat