From 191df96a6a7f9a9d1420666be8f85f3032bde6e2 Mon Sep 17 00:00:00 2001
From: zhangye <654600784@qq.com>
Date: Thu, 26 Dec 2019 16:23:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=BA=94=E7=9A=84us?=
 =?UTF-8?q?erid=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game/pom.xml                                  | 12 ++++
 .../java/com/ccsens/game/GameApplication.java |  5 ++
 .../com/ccsens/game/bean/po/GameMember.java   | 11 ++++
 .../game/bean/po/GameMemberExample.java       | 60 +++++++++++++++++++
 .../com/ccsens/game/bean/vo/ScreenVo.java     |  6 +-
 .../ccsens/game/service/ScreenService.java    |  4 ++
 .../resources/mapper_raw/GameMemberMapper.xml | 55 ++++++++++-------
 game/src/main/resources/mbg.xml               |  4 +-
 .../com/ccsens/mt/service/ScoreService.java   | 12 ++--
 9 files changed, 138 insertions(+), 31 deletions(-)

diff --git a/game/pom.xml b/game/pom.xml
index bd46e353..7d79952b 100644
--- a/game/pom.xml
+++ b/game/pom.xml
@@ -15,12 +15,24 @@
 	</properties>
 
 	<dependencies>
+		<!--cloud 工具类-->
+		<dependency>
+			<artifactId>cloudutil</artifactId>
+			<groupId>com.ccsens</groupId>
+			<version>1.0-SNAPSHOT</version>
+		</dependency>
 		<!--util 工具类-->
 		<dependency>
 			<artifactId>util</artifactId>
 			<groupId>com.ccsens</groupId>
 			<version>1.0-SNAPSHOT</version>
 		</dependency>
+
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.62</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/game/src/main/java/com/ccsens/game/GameApplication.java b/game/src/main/java/com/ccsens/game/GameApplication.java
index 393a6c1b..54ee7de2 100644
--- a/game/src/main/java/com/ccsens/game/GameApplication.java
+++ b/game/src/main/java/com/ccsens/game/GameApplication.java
@@ -4,11 +4,16 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 @MapperScan(basePackages = {"com.ccsens.game.persist.*"})
 @ServletComponentScan
 @EnableAsync
+//开启断路器功能
+@EnableCircuitBreaker
+@EnableFeignClients(basePackages = "com.ccsens.cloudutil.feign")
 @SpringBootApplication(scanBasePackages = "com.ccsens")
 public class GameApplication {
 
diff --git a/game/src/main/java/com/ccsens/game/bean/po/GameMember.java b/game/src/main/java/com/ccsens/game/bean/po/GameMember.java
index 5de210c2..d9a83731 100644
--- a/game/src/main/java/com/ccsens/game/bean/po/GameMember.java
+++ b/game/src/main/java/com/ccsens/game/bean/po/GameMember.java
@@ -6,6 +6,8 @@ import java.util.Date;
 public class GameMember implements Serializable {
     private Long id;
 
+    private Long userId;
+
     private Byte grade;
 
     private Byte subscribe;
@@ -56,6 +58,14 @@ public class GameMember implements Serializable {
         this.id = id;
     }
 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public Byte getGrade() {
         return grade;
     }
@@ -223,6 +233,7 @@ public class GameMember implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
+        sb.append(", userId=").append(userId);
         sb.append(", grade=").append(grade);
         sb.append(", subscribe=").append(subscribe);
         sb.append(", openid=").append(openid);
diff --git a/game/src/main/java/com/ccsens/game/bean/po/GameMemberExample.java b/game/src/main/java/com/ccsens/game/bean/po/GameMemberExample.java
index e5897f8d..5ae0fae9 100644
--- a/game/src/main/java/com/ccsens/game/bean/po/GameMemberExample.java
+++ b/game/src/main/java/com/ccsens/game/bean/po/GameMemberExample.java
@@ -165,6 +165,66 @@ public class GameMemberExample {
             return (Criteria) this;
         }
 
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(Long value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(Long value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(Long value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(Long value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(Long value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<Long> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<Long> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(Long value1, Long value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(Long value1, Long value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
         public Criteria andGradeIsNull() {
             addCriterion("grade is null");
             return (Criteria) this;
diff --git a/game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java b/game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java
index d5cc46ea..93a6831b 100644
--- a/game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java
+++ b/game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java
@@ -33,11 +33,11 @@ public class ScreenVo {
 
         @ApiModelProperty("未开始")
         private PendingData pendingData;
-        @ApiModelProperty("未开始")
+        @ApiModelProperty("准备中")
         private PreparingData preparingData;
-        @ApiModelProperty("未开始")
+        @ApiModelProperty("进行中")
         private ProcessingData processingData;
-        @ApiModelProperty("未开始")
+        @ApiModelProperty("已结束")
         private CompletedData completedData;
 
     }
diff --git a/game/src/main/java/com/ccsens/game/service/ScreenService.java b/game/src/main/java/com/ccsens/game/service/ScreenService.java
index 5a4f479f..4bc7b0b5 100644
--- a/game/src/main/java/com/ccsens/game/service/ScreenService.java
+++ b/game/src/main/java/com/ccsens/game/service/ScreenService.java
@@ -136,6 +136,10 @@ public class ScreenService implements IScreenService{
         gameMemberJoinExample.createCriteria().andRecordIdEqualTo(memberRecord.getMemberRecord());
         List<GameMemberJoin> memberJoinList = gameMemberJoinDao.selectByExample(gameMemberJoinExample);
         if(CollectionUtil.isNotEmpty(memberJoinList)){
+            if(gameInfoVo.getGameStatus()==1){
+                ScreenVo.PreparingData preparingData = new ScreenVo.PreparingData();
+//                preparingData.setStartLocalTime();
+            }
             gameInfoVo.setTotalMembers(memberJoinList.size());
         }else {
             gameInfoVo.setTotalMembers(0);
diff --git a/game/src/main/resources/mapper_raw/GameMemberMapper.xml b/game/src/main/resources/mapper_raw/GameMemberMapper.xml
index 6f3d1fb5..02064993 100644
--- a/game/src/main/resources/mapper_raw/GameMemberMapper.xml
+++ b/game/src/main/resources/mapper_raw/GameMemberMapper.xml
@@ -3,6 +3,7 @@
 <mapper namespace="com.ccsens.game.persist.mapper.GameMemberMapper">
   <resultMap id="BaseResultMap" type="com.ccsens.game.bean.po.GameMember">
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
     <result column="grade" jdbcType="TINYINT" property="grade" />
     <result column="subscribe" jdbcType="TINYINT" property="subscribe" />
     <result column="openid" jdbcType="VARCHAR" property="openid" />
@@ -83,9 +84,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, grade, subscribe, openid, unionid, nickname, headimgurl, sex, language, city, 
-    province, country, subscribe_time, remark, groupid, subscribe_scene, qr_scene, qr_scene_str, 
-    created_at, updated_at, rec_status
+    id, user_id, grade, subscribe, openid, unionid, nickname, headimgurl, sex, language, 
+    city, province, country, subscribe_time, remark, groupid, subscribe_scene, qr_scene, 
+    qr_scene_str, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.game.bean.po.GameMemberExample" resultMap="BaseResultMap">
     select
@@ -118,22 +119,22 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.ccsens.game.bean.po.GameMember">
-    insert into t_game_member (id, grade, subscribe, 
-      openid, unionid, nickname, 
-      headimgurl, sex, language, 
-      city, province, country, 
-      subscribe_time, remark, groupid, 
-      subscribe_scene, qr_scene, qr_scene_str, 
-      created_at, updated_at, rec_status
-      )
-    values (#{id,jdbcType=BIGINT}, #{grade,jdbcType=TINYINT}, #{subscribe,jdbcType=TINYINT}, 
-      #{openid,jdbcType=VARCHAR}, #{unionid,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR}, 
-      #{headimgurl,jdbcType=VARCHAR}, #{sex,jdbcType=TINYINT}, #{language,jdbcType=VARCHAR}, 
-      #{city,jdbcType=VARCHAR}, #{province,jdbcType=VARCHAR}, #{country,jdbcType=VARCHAR}, 
-      #{subscribeTime,jdbcType=BIGINT}, #{remark,jdbcType=VARCHAR}, #{groupid,jdbcType=BIGINT}, 
-      #{subscribeScene,jdbcType=VARCHAR}, #{qrScene,jdbcType=BIGINT}, #{qrSceneStr,jdbcType=VARCHAR}, 
-      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
-      )
+    insert into t_game_member (id, user_id, grade, 
+      subscribe, openid, unionid, 
+      nickname, headimgurl, sex, 
+      language, city, province, 
+      country, subscribe_time, remark, 
+      groupid, subscribe_scene, qr_scene, 
+      qr_scene_str, created_at, updated_at, 
+      rec_status)
+    values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{grade,jdbcType=TINYINT}, 
+      #{subscribe,jdbcType=TINYINT}, #{openid,jdbcType=VARCHAR}, #{unionid,jdbcType=VARCHAR}, 
+      #{nickname,jdbcType=VARCHAR}, #{headimgurl,jdbcType=VARCHAR}, #{sex,jdbcType=TINYINT}, 
+      #{language,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{province,jdbcType=VARCHAR}, 
+      #{country,jdbcType=VARCHAR}, #{subscribeTime,jdbcType=BIGINT}, #{remark,jdbcType=VARCHAR}, 
+      #{groupid,jdbcType=BIGINT}, #{subscribeScene,jdbcType=VARCHAR}, #{qrScene,jdbcType=BIGINT}, 
+      #{qrSceneStr,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.game.bean.po.GameMember">
     insert into t_game_member
@@ -141,6 +142,9 @@
       <if test="id != null">
         id,
       </if>
+      <if test="userId != null">
+        user_id,
+      </if>
       <if test="grade != null">
         grade,
       </if>
@@ -206,6 +210,9 @@
       <if test="id != null">
         #{id,jdbcType=BIGINT},
       </if>
+      <if test="userId != null">
+        #{userId,jdbcType=BIGINT},
+      </if>
       <if test="grade != null">
         #{grade,jdbcType=TINYINT},
       </if>
@@ -280,6 +287,9 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=BIGINT},
       </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=BIGINT},
+      </if>
       <if test="record.grade != null">
         grade = #{record.grade,jdbcType=TINYINT},
       </if>
@@ -348,6 +358,7 @@
   <update id="updateByExample" parameterType="map">
     update t_game_member
     set id = #{record.id,jdbcType=BIGINT},
+      user_id = #{record.userId,jdbcType=BIGINT},
       grade = #{record.grade,jdbcType=TINYINT},
       subscribe = #{record.subscribe,jdbcType=TINYINT},
       openid = #{record.openid,jdbcType=VARCHAR},
@@ -375,6 +386,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.game.bean.po.GameMember">
     update t_game_member
     <set>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=BIGINT},
+      </if>
       <if test="grade != null">
         grade = #{grade,jdbcType=TINYINT},
       </if>
@@ -440,7 +454,8 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.ccsens.game.bean.po.GameMember">
     update t_game_member
-    set grade = #{grade,jdbcType=TINYINT},
+    set user_id = #{userId,jdbcType=BIGINT},
+      grade = #{grade,jdbcType=TINYINT},
       subscribe = #{subscribe,jdbcType=TINYINT},
       openid = #{openid,jdbcType=VARCHAR},
       unionid = #{unionid,jdbcType=VARCHAR},
diff --git a/game/src/main/resources/mbg.xml b/game/src/main/resources/mbg.xml
index e25db0b9..a9ed67e9 100644
--- a/game/src/main/resources/mbg.xml
+++ b/game/src/main/resources/mbg.xml
@@ -55,11 +55,11 @@
             <!-- enableSubPackages:是否让schema作为包的后缀 -->
             <property name="enableSubPackages" value="false" />
         </javaClientGenerator>
-        <!--<table tableName="t_game_member" domainObjectName="GameMember"></table>-->
+        <table tableName="t_game_member" domainObjectName="GameMember"></table>
         <!--<table tableName="t_game_type" domainObjectName="GameType"></table>-->
         <!--<table tableName="t_game_type_member" domainObjectName="GameTypeMember"></table>-->
         <!--<table tableName="t_game_record" domainObjectName="GameRecord"></table>-->
-        <table tableName="t_game_member_join" domainObjectName="GameMemberJoin"></table>
+        <!--<table tableName="t_game_member_join" domainObjectName="GameMemberJoin"></table>-->
         <!--<table tableName="t_game_score_log" domainObjectName="GameScoreLog"></table>-->
         <!--<table tableName="t_game_activity_rule" domainObjectName="GameActivityRule"></table>-->
         <!--<table tableName="t_game_activity_prize" domainObjectName="GameActivityPrize"></table>-->
diff --git a/mt/src/main/java/com/ccsens/mt/service/ScoreService.java b/mt/src/main/java/com/ccsens/mt/service/ScoreService.java
index 92954d2f..673db477 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ScoreService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/ScoreService.java
@@ -87,7 +87,7 @@ public class ScoreService implements IScoreService{
                 //查找评分
                 MtScoreExample scoreExample = new MtScoreExample();
                 scoreExample.createCriteria().andScoreLogIdEqualTo(mtScoreLog.getId())
-                        .andJudgeUserIdEqualTo(memberInfo.getId()).andTaskIdEqualTo(playerId);
+                        .andJudgeUserIdEqualTo(memberInfo.getId()).andTaskIdEqualTo(taskInfo.getId());
                 List<MtScore> scoreList = scoreDao.selectByExample(scoreExample);
                 if (CollectionUtil.isNotEmpty(scoreList)) {
                     scoreInfo.setScore(scoreList.get(0).getScore());
@@ -125,7 +125,7 @@ public class ScoreService implements IScoreService{
         addJudge(memberInfo);
 
         MtScoreExample scoreExample = new MtScoreExample();
-        scoreExample.createCriteria().andTaskIdEqualTo(submitScore.getPlayerId()).andJudgeUserIdEqualTo(memberInfo.getId());
+        scoreExample.createCriteria().andTaskIdEqualTo(taskInfo.getId()).andJudgeUserIdEqualTo(memberInfo.getId());
         List<MtScore> scoreList = scoreDao.selectByExample(scoreExample);
         if (CollectionUtil.isEmpty(scoreList)) {
             if (CollectionUtil.isNotEmpty(submitScore.getData())) {
@@ -133,7 +133,7 @@ public class ScoreService implements IScoreService{
                     MtScore score = new MtScore();
                     score.setId(snowflake.nextId());
                     score.setJudgeUserId(memberInfo.getId());
-                    score.setTaskId(submitScore.getPlayerId());
+                    score.setTaskId(taskInfo.getId());
                     score.setTaskName(taskInfo.getName());
                     score.setScoreLogId(data.getId());
                     score.setScore(data.getScore());
@@ -178,7 +178,7 @@ public class ScoreService implements IScoreService{
         List<MtJudge> judgeList = judgeDao.selectByExample(judgeExample);
         if(CollectionUtil.isNotEmpty(judgeList)){
             for(MtJudge mtJudge:judgeList){
-                BigDecimal score = scoreDao.sumScoreByJudgeId(mtJudge.getId(),playerId);
+                BigDecimal score = scoreDao.sumScoreByJudgeId(mtJudge.getId(),taskInfo.getId());
                 adminScore = new ScoreVo.AdminScore();
 
                 adminScore.setJudge(mtJudge.getId());
@@ -225,7 +225,7 @@ public class ScoreService implements IScoreService{
                 rankingScore.setPlayerId(taskInfo.getId());
                 rankingScore.setCompany(taskInfo.getName());
                 //获取每个评委对此任务的评分
-                List<ScoreVo.JudgeScore> judgeScoreList = findJudgeScore(projectId,taskId);
+                List<ScoreVo.JudgeScore> judgeScoreList = findJudgeScore(projectId,taskInfo.getId());
 //                rankingScore.setJudgeScoreList(judgeScoreList);
 
                 //获取此任务的平均分
@@ -302,7 +302,7 @@ public class ScoreService implements IScoreService{
         data.setPlayerId(taskInfo.getId());
         data.setPlayerName(taskInfo.getName());
         //获取每个评委对此任务的评分
-        List<ScoreVo.JudgeScore> judgeScoreList = findJudgeScore(projectId,taskId);
+        List<ScoreVo.JudgeScore> judgeScoreList = findJudgeScore(projectId,taskInfo.getId());
         BigDecimal aveScore = BigDecimal.valueOf(0);
         if(CollectionUtil.isNotEmpty(judgeScoreList)){
             for(ScoreVo.JudgeScore judgeScore : judgeScoreList){