fix: app调用详情接口

34517c01 · minghao.wu · 51065141 · 34517c01 · 34517c01 · 34517c01
--- a/server/src/main/java/com/pica/cloud/online/exam/analysis/server/controller/AnalysisController.java
+++ b/server/src/main/java/com/pica/cloud/online/exam/analysis/server/controller/AnalysisController.java
@@ -60,7 +60,7 @@ 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);
@@ -84,7 +84,7 @@ public class AnalysisController {
        id = (id == null ? 2 : id);

        try {
-            CHCAnalysisDto analysisDto = analysisService.getPSAAnalysisById(id);
+            CHCAnalysisDto analysisDto = analysisService.getPSAAnalysisDtoById(id);
            List<AnalysisRoundDto> roundList = analysisService.getRoundListByAnalysisId(id);

            analysisDto.setRoundList(roundList);
@@ -141,12 +141,35 @@ public class AnalysisController {
            examTitleReplyDto.setExamTitle(examTitleDto);
            examTitleReplyDto.setReplyList(replyDtoList);

+            /**
+             * 设置回复状态
+             */
+            examTitleReplyDto.setReplyStatus(0);
+
+            if (user !=  null && user.getId() != 0) {
+                Doctor doctor = doctorService.getDoctorById(user.getId());
+
+                if (doctor != null) {
+                    /**
+                     * TODO: 判断权限 CHC PSA
+                     */
+                    CHCAnalysis analysis =  analysisService.getAnalysisById(analysisRoundExamTitle.getAnalysisId());
+                    if (analysis.getType() == 1) {
+                        /**
+                         * CHC 获取考试前两百名
+                         */
+
+                    } else if (analysis.getType() == 2) {
+                        /**
+                         * PSA 职务职称主任/副主任 院长/副院长 科长/副科长 管理人数100以上
+                         */
+
+                    }
+                }
+            }
            if (user ==  null || user.getId() == 0) {
                examTitleReplyDto.setReplyStatus(0);
            } else {
-                /**
-                 * 判断权限 CHC RSA
-                 */
                examTitleReplyDto.setReplyStatus(analysisService.getReplyStatus(examTitleId, user.getId()));
            }

@@ -194,6 +217,42 @@ 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,
+                                                                @RequestParam(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.getReplyByExamTitleId(examTitleId, user != null ? user.getId() : 0);
+            AnalysisRoundExamTitle analysisRoundExamTitle = analysisService.getAnanlysisRoundExamTitleById(examTitleId);
+            ExamTitleDto examTitleDto = analysisService.getExamTitleDtoById(examTitleId);
+
+            if (null != reply) {
+                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 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,

--- a/server/src/main/java/com/pica/cloud/online/exam/analysis/server/entity/CHCRankingList.java
+++ b/server/src/main/java/com/pica/cloud/online/exam/analysis/server/entity/CHCRankingList.java
+package com.pica.cloud.online.exam.analysis.server.entity;
+
+/**
+ * @author wuminghao
+ * @date 2018/8/28 13:52
+ */
+public class CHCRankingList {
+    private Integer id;
+
+    private Integer doctor_id;
+
+    private String doctor_name;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getDoctor_id() {
+        return doctor_id;
+    }
+
+    public void setDoctor_id(Integer doctor_id) {
+        this.doctor_id = doctor_id;
+    }
+
+    public String getDoctor_name() {
+        return doctor_name;
+    }
+
+    public void setDoctor_name(String doctor_name) {
+        this.doctor_name = doctor_name;
+    }
+}
--- a/server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/CHCAnalysisService.java
+++ b/server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/CHCAnalysisService.java
@@ -2,6 +2,7 @@ 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.AnalysisRoundExamTitle;
+import com.pica.cloud.online.exam.analysis.server.entity.CHCAnalysis;
 import com.pica.cloud.online.exam.analysis.server.entity.Reply;

 import java.util.List;
@@ -16,14 +17,21 @@ public interface CHCAnalysisService {
     * @param analysisId
     * @return
     */
-    CHCAnalysisDto getCHCAnalysisById(Integer analysisId);
+    CHCAnalysis getAnalysisById(Integer analysisId);

    /**
     * 根据活动id获取活动详情
     * @param analysisId
     * @return
     */
-    CHCAnalysisDto getPSAAnalysisById(Integer analysisId);
+    CHCAnalysisDto getCHCAnalysisDtoById(Integer analysisId);
+
+    /**
+     * 根据活动id获取活动详情
+     * @param analysisId
+     * @return
+     */
+    CHCAnalysisDto getPSAAnalysisDtoById(Integer analysisId);

    /**
     * 根据活动id获取活动的轮数
@@ -132,4 +140,13 @@ public interface CHCAnalysisService {
     * @return
     */
    Integer getReplyStatus(Integer examTitleId, Integer userId);
+
+
+    /**
+     * 获取我的评论详情
+     * @param examTitleId
+     * @param userId
+     * @return
+     */
+    Reply getReplyByExamTitleId(Integer examTitleId, Integer userId);
 }
--- a/server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/CHCRankingListService.java
+++ b/server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/CHCRankingListService.java
+package com.pica.cloud.online.exam.analysis.server.service;
+
+/**
+ * @author wuminghao
+ * @date 2018/8/28 13:55
+ */
+public interface CHCRankingListService {
+    /**
+     * 判断输入的用户id是否为前200名
+     * @param doctorId
+     * @return
+     */
+    boolean isRankingInTop200(Integer doctorId);
+}
--- a/server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/impl/CHCAnalysisServiceImpl.java
+++ b/server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/impl/CHCAnalysisServiceImpl.java
@@ -46,7 +46,12 @@ public class CHCAnalysisServiceImpl implements CHCAnalysisService {
    private PropertiesConfiguration properties;

    @Override
-    public CHCAnalysisDto getCHCAnalysisById(Integer analysisId) {
+    public CHCAnalysis getAnalysisById(Integer analysisId) {
+        return analysisMapper.selectByPrimaryKey(analysisId);
+    }
+
+    @Override
+    public CHCAnalysisDto getCHCAnalysisDtoById(Integer analysisId) {

        CHCAnalysis analysis = analysisMapper.selectByPrimaryKey(analysisId);
        if (null ==  analysis) {
@@ -72,7 +77,7 @@ public class CHCAnalysisServiceImpl implements CHCAnalysisService {
    }

    @Override
-    public CHCAnalysisDto getPSAAnalysisById(Integer analysisId) {
+    public CHCAnalysisDto getPSAAnalysisDtoById(Integer analysisId) {
        CHCAnalysis analysis = analysisMapper.selectPSAByPrimaryKey(analysisId);
        if (null ==  analysis) {
            return null;
@@ -438,4 +443,12 @@ public class CHCAnalysisServiceImpl implements CHCAnalysisService {
         */
        return 2;
    }
+
+    @Override
+    public Reply getReplyByExamTitleId(Integer examTitleId, Integer userId) {
+        Reply reply = new Reply();
+        reply.setAnalysisRoundExamTitleId(examTitleId);
+        reply.setUserId(userId);
+        return replyMapper.selectReplyByRecord(reply);
+    }
 }
--- a/server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/impl/CHCRankingListServiceImpl.java
+++ b/server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/impl/CHCRankingListServiceImpl.java
+package com.pica.cloud.online.exam.analysis.server.service.impl;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @author wuminghao
+ * @date 2018/8/28 13:57
+ */
+@Service
+public class CHCRankingListServiceImpl {
+
+}