From d5ca894861a77c101c5de9f1652c3353654fc385 Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Fri, 14 Aug 2020 10:42:56 +0800
Subject: [PATCH] topic

---
 .../java/com/ccsens/mt/persist/dao/TopicDao.java    |  9 ++++++++-
 .../java/com/ccsens/mt/service/TopicService.java    | 10 +++-------
 mt/src/main/resources/application.yml               |  4 ++--
 mt/src/main/resources/mapper_dao/TopicDao.xml       | 13 +++++++++++++
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/TopicDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/TopicDao.java
index 57b142dd..e683be37 100644
--- a/mt/src/main/java/com/ccsens/mt/persist/dao/TopicDao.java
+++ b/mt/src/main/java/com/ccsens/mt/persist/dao/TopicDao.java
@@ -52,7 +52,6 @@ public interface TopicDao extends MtTopicMapper {
     List<String> queryOption(@Param("topicId") Long topicId);
 
     /**
-<<<<<<< HEAD
      * 查询当前阶段的排名
      * @param projectId 项目id
      * @param linkType 阶段类型
@@ -65,4 +64,12 @@ public interface TopicDao extends MtTopicMapper {
      * @return 最小 最大
      */
     TopicVo.TopicSequence getMinAndMax(@Param("linkType") int linkType);
+
+    /**
+     * 查询有几组抢答成功
+     * @param projectId 项目ID
+     * @param topicId 试题ID
+     * @return 抢答数
+     */
+    long countVote(@Param("projectId") Long projectId, @Param("topicId") long topicId);
 }
diff --git a/mt/src/main/java/com/ccsens/mt/service/TopicService.java b/mt/src/main/java/com/ccsens/mt/service/TopicService.java
index e5fa2306..8128ece2 100644
--- a/mt/src/main/java/com/ccsens/mt/service/TopicService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/TopicService.java
@@ -170,15 +170,11 @@ public class TopicService implements ITopicService{
             if (a != null) {
                 return;
             }
+            //储存数据库
+            long count = topicDao.countVote(group.getProjectId(), (long)(int)o);
             //将自己抢答的信息存进redis
             redisUtil.set(group.getProjectId() + Constant.Redis.RESPONDER + o,group.getGroupId(),Constant.Redis.TIME_OUT);
-            //储存数据库
-            MtResponderExample responderExample = new MtResponderExample();
-            responderExample.createCriteria().andTopicIdEqualTo((long)o).andGroupIdEqualTo(group.getGroupId());
-            List<MtResponder> mtResponderList = mtResponderMapper.selectByExample(responderExample);
-            if(CollectionUtil.isNotEmpty(mtResponderList)){
-                return;
-            }
+
             MtResponder mtResponder = new MtResponder();
             mtResponder.setId(snowflake.nextId());
             mtResponder.setGroupId(group.getGroupId());
diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml
index 5889ff7f..5c2cd5c4 100644
--- a/mt/src/main/resources/application.yml
+++ b/mt/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
\ No newline at end of file
+    active: dev
+    include: common, util-dev
\ No newline at end of file
diff --git a/mt/src/main/resources/mapper_dao/TopicDao.xml b/mt/src/main/resources/mapper_dao/TopicDao.xml
index 7bddf26d..eba1ed35 100644
--- a/mt/src/main/resources/mapper_dao/TopicDao.xml
+++ b/mt/src/main/resources/mapper_dao/TopicDao.xml
@@ -128,5 +128,18 @@
             type = 0
         ORDER BY score DESC
     </select>
+    <select id="countVote" resultType="java.lang.Long">
+        SELECT
+            count( * )
+        FROM
+            t_mt_responder r,
+            t_mt_group g
+        WHERE
+            r.group_id = g.id
+            AND r.topic_id = #{topicId}
+            AND g.project_id = #{projectId}
+            AND r.rec_status = 0
+            AND g.rec_status = 0
+    </select>
 
 </mapper>
\ No newline at end of file