增加积分商城相关代码

cloud-exam/src/main/java/com/yizhi/application/controller/api/ExamApiController.java

@@ -14,6 +14,7 @@ import com.yizhi.exam.application.vo.*;
 import com.yizhi.exam.application.vo.exam.ExamDetailsVO;
 import com.yizhi.exam.application.vo.exam.ExamDetailsVO;
 import com.yizhi.exam.application.vo.exam.*;
 import com.yizhi.exam.application.vo.exam.*;
 import com.yizhi.exam.application.vo.report.PcAnswerQuestionDetailVO;
 import com.yizhi.exam.application.vo.report.PcAnswerQuestionDetailVO;
+import com.yizhi.point.application.feign.PointApiFeignClients;
 import com.yizhi.point.application.feign.PointListenerClients;
 import com.yizhi.point.application.feign.PointListenerClients;
 import com.yizhi.util.application.domain.Response;
 import com.yizhi.util.application.domain.Response;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiParam;
@@ -56,6 +57,8 @@ public class ExamApiController {
 
 
     @Autowired
     @Autowired
     private PointListenerClients pointListenerClients;
     private PointListenerClients pointListenerClients;
+    @Autowired
+    private PointApiFeignClients pointApiFeignClients;
 
 
     @PostMapping("/result")
     @PostMapping("/result")
     public ExamAnswerApiListVO getExamResultList(@RequestBody ExamAnswerApiListVO examAnswerApiListVo) {
     public ExamAnswerApiListVO getExamResultList(@RequestBody ExamAnswerApiListVO examAnswerApiListVo) {
@@ -914,7 +917,8 @@ public class ExamApiController {
         }
         }
         examDetailsVO.setScanCode(1);
         examDetailsVO.setScanCode(1);
         examDetailsVO.setScanMsg("扫码考试成功");
         examDetailsVO.setScanMsg("扫码考试成功");
-        pointListenerClients.addPoint("CreditCourseDone1", myExamParameterVO.getExamId());
+        //pointListenerClients.addPoint("CreditCourseDone1", myExamParameterVO.getExamId());
+        //pointApiFeignClients.addPoint(myExamParameterVO.getAccountId(), "point_exam", "" + myExamParameterVO.getExamId());
         return examDetailsVO;
         return examDetailsVO;
     }
     }
 
 

cloud-exam/src/main/java/com/yizhi/application/controller/api/ExamQuestionController.java

 package com.yizhi.application.controller.api;
 package com.yizhi.application.controller.api;
 
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.yizhi.application.constant.ExamConstant;
 import com.yizhi.application.constant.ExamConstant;
@@ -14,11 +15,13 @@ import com.yizhi.core.application.publish.CloudEventPublisher;
 import com.yizhi.core.application.task.AbstractTaskHandler;
 import com.yizhi.core.application.task.AbstractTaskHandler;
 import com.yizhi.core.application.task.TaskExecutor;
 import com.yizhi.core.application.task.TaskExecutor;
 import com.yizhi.exam.application.vo.exam.*;
 import com.yizhi.exam.application.vo.exam.*;
+import com.yizhi.point.application.feign.PointApiFeignClients;
 import com.yizhi.point.application.feign.PointListenerClients;
 import com.yizhi.point.application.feign.PointListenerClients;
 import com.yizhi.point.application.feign.PointRedisFeignClients;
 import com.yizhi.point.application.feign.PointRedisFeignClients;
 import com.yizhi.point.application.vo.PointParamVO;
 import com.yizhi.point.application.vo.PointParamVO;
 import com.yizhi.util.application.constant.QueueConstant;
 import com.yizhi.util.application.constant.QueueConstant;
 import com.yizhi.util.application.event.TrainingProjectEvent;
 import com.yizhi.util.application.event.TrainingProjectEvent;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
@@ -41,7 +44,7 @@ import java.util.Map;
  * @author mei
  * @author mei
  * @Date 2018-03-15
  * @Date 2018-03-15
  */
  */
-
+@Slf4j
 @RestController
 @RestController
 @RequestMapping("/api/exam")
 @RequestMapping("/api/exam")
 public class ExamQuestionController {
 public class ExamQuestionController {
@@ -86,6 +89,8 @@ public class ExamQuestionController {
 
 
     @Autowired
     @Autowired
     private PointListenerClients pointListenerClients;
     private PointListenerClients pointListenerClients;
+    @Autowired
+    private PointApiFeignClients pointApiFeignClients;
 
 
     /**
     /**
      * 根据考试的设置，生成空白答卷（题目、答案选项）
      * 根据考试的设置，生成空白答卷（题目、答案选项）
@@ -325,7 +330,8 @@ public class ExamQuestionController {
             curTime = formatDate.parse(formatDate.format(curTime));
             curTime = formatDate.parse(formatDate.format(curTime));
             //获取考试结束时长
             //获取考试结束时长
             com.yizhi.exam.application.vo.domain.Exam examInfo = iExamService.getExam(examId);
             com.yizhi.exam.application.vo.domain.Exam examInfo = iExamService.getExam(examId);
-            pointListenerClients.addPoint("CreditCourseDone1", examId);
+            //pointListenerClients.addPoint("CreditCourseDone1", examId);
+            //pointApiFeignClients.addPoint(accountId, "point_exam", "" + examId);
 
 
             if (examInfo == null) {
             if (examInfo == null) {
                 LOG.error("pc端用户accountId = {} ,开始考试: 未查询到考试信息! examId = {}", accountId, examId);
                 LOG.error("pc端用户accountId = {} ,开始考试: 未查询到考试信息! examId = {}", accountId, examId);
@@ -1118,6 +1124,12 @@ public class ExamQuestionController {
                 return result;
                 return result;
             }
             }
             result = trExamAnswerQuestionService.submitExamPage(vo);
             result = trExamAnswerQuestionService.submitExamPage(vo);
+            log.info("提交考试结果submit返回:{}", JSONUtil.toJsonStr(result));
+            //考试交卷后根据分数增加积分
+            if(result.getScore().intValue() >= result.getScoreSuccess().intValue()) {
+                log.info("考试合格发放积分:{}", JSONUtil.toJsonStr(result));
+                pointApiFeignClients.addPoint(vo.getAccountId(), "point_exam", "" + result.getExamId() + "|" + result.getScore());
+            }
             return result;
             return result;
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();