ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

添加对应的userid字段

master
zhangye 6 years ago
parent
076a41e18c
commit
191df96a6a
9 changed files with 138 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      game/pom.xml
  2. 5
      game/src/main/java/com/ccsens/game/GameApplication.java
  3. 11
      game/src/main/java/com/ccsens/game/bean/po/GameMember.java
  4. 60
      game/src/main/java/com/ccsens/game/bean/po/GameMemberExample.java
  5. 6
      game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java
  6. 4
      game/src/main/java/com/ccsens/game/service/ScreenService.java
  7. 55
      game/src/main/resources/mapper_raw/GameMemberMapper.xml
  8. 4
      game/src/main/resources/mbg.xml
  9. 12
      mt/src/main/java/com/ccsens/mt/service/ScoreService.java

12
game/pom.xml
View File

@ -15,12 +15,24 @@
</properties> </properties>
<dependencies> <dependencies>
<!--cloud 工具类-->
<dependency>
<artifactId>cloudutil</artifactId>
<groupId>com.ccsens</groupId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!--util 工具类--> <!--util 工具类-->
<dependency> <dependency>
<artifactId>util</artifactId> <artifactId>util</artifactId>
<groupId>com.ccsens</groupId> <groupId>com.ccsens</groupId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.62</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

5
game/src/main/java/com/ccsens/game/GameApplication.java
View File

@ -4,11 +4,16 @@ import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.ServletComponentScan; 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; import org.springframework.scheduling.annotation.EnableAsync;
@MapperScan(basePackages = {"com.ccsens.game.persist.*"}) @MapperScan(basePackages = {"com.ccsens.game.persist.*"})
@ServletComponentScan @ServletComponentScan
@EnableAsync @EnableAsync
//开启断路器功能
@EnableCircuitBreaker
@EnableFeignClients(basePackages = "com.ccsens.cloudutil.feign")
@SpringBootApplication(scanBasePackages = "com.ccsens") @SpringBootApplication(scanBasePackages = "com.ccsens")
public class GameApplication { public class GameApplication {

11
game/src/main/java/com/ccsens/game/bean/po/GameMember.java
View File

@ -6,6 +6,8 @@ import java.util.Date;
public class GameMember implements Serializable { public class GameMember implements Serializable {
private Long id; private Long id;
private Long userId;
private Byte grade; private Byte grade;
private Byte subscribe; private Byte subscribe;
@ -56,6 +58,14 @@ public class GameMember implements Serializable {
this.id = id; this.id = id;
} }
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public Byte getGrade() { public Byte getGrade() {
return grade; return grade;
} }
@ -223,6 +233,7 @@ public class GameMember implements Serializable {
sb.append(" ["); sb.append(" [");
sb.append("Hash = ").append(hashCode()); sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id); sb.append(", id=").append(id);
sb.append(", userId=").append(userId);
sb.append(", grade=").append(grade); sb.append(", grade=").append(grade);
sb.append(", subscribe=").append(subscribe); sb.append(", subscribe=").append(subscribe);
sb.append(", openid=").append(openid); sb.append(", openid=").append(openid);

60
game/src/main/java/com/ccsens/game/bean/po/GameMemberExample.java
View File

@ -165,6 +165,66 @@ public class GameMemberExample {
return (Criteria) this; 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() { public Criteria andGradeIsNull() {
addCriterion("grade is null"); addCriterion("grade is null");
return (Criteria) this; return (Criteria) this;

6
game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java
View File

@ -33,11 +33,11 @@ public class ScreenVo {
@ApiModelProperty("未开始") @ApiModelProperty("未开始")
private PendingData pendingData; private PendingData pendingData;
@ApiModelProperty("未开始") @ApiModelProperty("准备中")
private PreparingData preparingData; private PreparingData preparingData;
@ApiModelProperty("未开始") @ApiModelProperty("进行中")
private ProcessingData processingData; private ProcessingData processingData;
@ApiModelProperty("未开始") @ApiModelProperty("已结束")
private CompletedData completedData; private CompletedData completedData;
} }

4
game/src/main/java/com/ccsens/game/service/ScreenService.java
View File

@ -136,6 +136,10 @@ public class ScreenService implements IScreenService{
gameMemberJoinExample.createCriteria().andRecordIdEqualTo(memberRecord.getMemberRecord()); gameMemberJoinExample.createCriteria().andRecordIdEqualTo(memberRecord.getMemberRecord());
List<GameMemberJoin> memberJoinList = gameMemberJoinDao.selectByExample(gameMemberJoinExample); List<GameMemberJoin> memberJoinList = gameMemberJoinDao.selectByExample(gameMemberJoinExample);
if(CollectionUtil.isNotEmpty(memberJoinList)){ if(CollectionUtil.isNotEmpty(memberJoinList)){
if(gameInfoVo.getGameStatus()==1){
ScreenVo.PreparingData preparingData = new ScreenVo.PreparingData();
// preparingData.setStartLocalTime();
}
gameInfoVo.setTotalMembers(memberJoinList.size()); gameInfoVo.setTotalMembers(memberJoinList.size());
}else { }else {
gameInfoVo.setTotalMembers(0); gameInfoVo.setTotalMembers(0);

55
game/src/main/resources/mapper_raw/GameMemberMapper.xml
View File

@ -3,6 +3,7 @@
<mapper namespace="com.ccsens.game.persist.mapper.GameMemberMapper"> <mapper namespace="com.ccsens.game.persist.mapper.GameMemberMapper">
<resultMap id="BaseResultMap" type="com.ccsens.game.bean.po.GameMember"> <resultMap id="BaseResultMap" type="com.ccsens.game.bean.po.GameMember">
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="user_id" jdbcType="BIGINT" property="userId" />
<result column="grade" jdbcType="TINYINT" property="grade" /> <result column="grade" jdbcType="TINYINT" property="grade" />
<result column="subscribe" jdbcType="TINYINT" property="subscribe" /> <result column="subscribe" jdbcType="TINYINT" property="subscribe" />
<result column="openid" jdbcType="VARCHAR" property="openid" /> <result column="openid" jdbcType="VARCHAR" property="openid" />
@ -83,9 +84,9 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, grade, subscribe, openid, unionid, nickname, headimgurl, sex, language, city, id, user_id, grade, subscribe, openid, unionid, nickname, headimgurl, sex, language,
province, country, subscribe_time, remark, groupid, subscribe_scene, qr_scene, qr_scene_str, city, province, country, subscribe_time, remark, groupid, subscribe_scene, qr_scene,
created_at, updated_at, rec_status qr_scene_str, created_at, updated_at, rec_status
</sql> </sql>
<select id="selectByExample" parameterType="com.ccsens.game.bean.po.GameMemberExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.ccsens.game.bean.po.GameMemberExample" resultMap="BaseResultMap">
select select
@ -118,22 +119,22 @@
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.ccsens.game.bean.po.GameMember"> <insert id="insert" parameterType="com.ccsens.game.bean.po.GameMember">
insert into t_game_member (id, grade, subscribe, insert into t_game_member (id, user_id, grade,
openid, unionid, nickname, subscribe, openid, unionid,
headimgurl, sex, language, nickname, headimgurl, sex,
city, province, country, language, city, province,
subscribe_time, remark, groupid, country, subscribe_time, remark,
subscribe_scene, qr_scene, qr_scene_str, groupid, subscribe_scene, qr_scene,
created_at, updated_at, rec_status qr_scene_str, created_at, updated_at,
) rec_status)
values (#{id,jdbcType=BIGINT}, #{grade,jdbcType=TINYINT}, #{subscribe,jdbcType=TINYINT}, values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{grade,jdbcType=TINYINT},
#{openid,jdbcType=VARCHAR}, #{unionid,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR}, #{subscribe,jdbcType=TINYINT}, #{openid,jdbcType=VARCHAR}, #{unionid,jdbcType=VARCHAR},
#{headimgurl,jdbcType=VARCHAR}, #{sex,jdbcType=TINYINT}, #{language,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR}, #{headimgurl,jdbcType=VARCHAR}, #{sex,jdbcType=TINYINT},
#{city,jdbcType=VARCHAR}, #{province,jdbcType=VARCHAR}, #{country,jdbcType=VARCHAR}, #{language,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{province,jdbcType=VARCHAR},
#{subscribeTime,jdbcType=BIGINT}, #{remark,jdbcType=VARCHAR}, #{groupid,jdbcType=BIGINT}, #{country,jdbcType=VARCHAR}, #{subscribeTime,jdbcType=BIGINT}, #{remark,jdbcType=VARCHAR},
#{subscribeScene,jdbcType=VARCHAR}, #{qrScene,jdbcType=BIGINT}, #{qrSceneStr,jdbcType=VARCHAR}, #{groupid,jdbcType=BIGINT}, #{subscribeScene,jdbcType=VARCHAR}, #{qrScene,jdbcType=BIGINT},
#{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} #{qrSceneStr,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
) #{recStatus,jdbcType=TINYINT})
</insert> </insert>
<insert id="insertSelective" parameterType="com.ccsens.game.bean.po.GameMember"> <insert id="insertSelective" parameterType="com.ccsens.game.bean.po.GameMember">
insert into t_game_member insert into t_game_member
@ -141,6 +142,9 @@
<if test="id != null"> <if test="id != null">
id, id,
</if> </if>
<if test="userId != null">
user_id,
</if>
<if test="grade != null"> <if test="grade != null">
grade, grade,
</if> </if>
@ -206,6 +210,9 @@
<if test="id != null"> <if test="id != null">
#{id,jdbcType=BIGINT}, #{id,jdbcType=BIGINT},
</if> </if>
<if test="userId != null">
#{userId,jdbcType=BIGINT},
</if>
<if test="grade != null"> <if test="grade != null">
#{grade,jdbcType=TINYINT}, #{grade,jdbcType=TINYINT},
</if> </if>
@ -280,6 +287,9 @@
<if test="record.id != null"> <if test="record.id != null">
id = #{record.id,jdbcType=BIGINT}, id = #{record.id,jdbcType=BIGINT},
</if> </if>
<if test="record.userId != null">
user_id = #{record.userId,jdbcType=BIGINT},
</if>
<if test="record.grade != null"> <if test="record.grade != null">
grade = #{record.grade,jdbcType=TINYINT}, grade = #{record.grade,jdbcType=TINYINT},
</if> </if>
@ -348,6 +358,7 @@
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
update t_game_member update t_game_member
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
user_id = #{record.userId,jdbcType=BIGINT},
grade = #{record.grade,jdbcType=TINYINT}, grade = #{record.grade,jdbcType=TINYINT},
subscribe = #{record.subscribe,jdbcType=TINYINT}, subscribe = #{record.subscribe,jdbcType=TINYINT},
openid = #{record.openid,jdbcType=VARCHAR}, openid = #{record.openid,jdbcType=VARCHAR},
@ -375,6 +386,9 @@
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.game.bean.po.GameMember"> <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.game.bean.po.GameMember">
update t_game_member update t_game_member
<set> <set>
<if test="userId != null">
user_id = #{userId,jdbcType=BIGINT},
</if>
<if test="grade != null"> <if test="grade != null">
grade = #{grade,jdbcType=TINYINT}, grade = #{grade,jdbcType=TINYINT},
</if> </if>
@ -440,7 +454,8 @@
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.game.bean.po.GameMember"> <update id="updateByPrimaryKey" parameterType="com.ccsens.game.bean.po.GameMember">
update t_game_member update t_game_member
set grade = #{grade,jdbcType=TINYINT}, set user_id = #{userId,jdbcType=BIGINT},
grade = #{grade,jdbcType=TINYINT},
subscribe = #{subscribe,jdbcType=TINYINT}, subscribe = #{subscribe,jdbcType=TINYINT},
openid = #{openid,jdbcType=VARCHAR}, openid = #{openid,jdbcType=VARCHAR},
unionid = #{unionid,jdbcType=VARCHAR}, unionid = #{unionid,jdbcType=VARCHAR},

4
game/src/main/resources/mbg.xml
View File

@ -55,11 +55,11 @@
<!-- enableSubPackages:是否让schema作为包的后缀 --> <!-- enableSubPackages:是否让schema作为包的后缀 -->
<property name="enableSubPackages" value="false" /> <property name="enableSubPackages" value="false" />
</javaClientGenerator> </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" domainObjectName="GameType"></table>-->
<!--<table tableName="t_game_type_member" domainObjectName="GameTypeMember"></table>--> <!--<table tableName="t_game_type_member" domainObjectName="GameTypeMember"></table>-->
<!--<table tableName="t_game_record" domainObjectName="GameRecord"></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_score_log" domainObjectName="GameScoreLog"></table>-->
<!--<table tableName="t_game_activity_rule" domainObjectName="GameActivityRule"></table>--> <!--<table tableName="t_game_activity_rule" domainObjectName="GameActivityRule"></table>-->
<!--<table tableName="t_game_activity_prize" domainObjectName="GameActivityPrize"></table>--> <!--<table tableName="t_game_activity_prize" domainObjectName="GameActivityPrize"></table>-->

12
mt/src/main/java/com/ccsens/mt/service/ScoreService.java
View File

@ -87,7 +87,7 @@ public class ScoreService implements IScoreService{
//查找评分 //查找评分
MtScoreExample scoreExample = new MtScoreExample(); MtScoreExample scoreExample = new MtScoreExample();
scoreExample.createCriteria().andScoreLogIdEqualTo(mtScoreLog.getId()) scoreExample.createCriteria().andScoreLogIdEqualTo(mtScoreLog.getId())
.andJudgeUserIdEqualTo(memberInfo.getId()).andTaskIdEqualTo(playerId); .andJudgeUserIdEqualTo(memberInfo.getId()).andTaskIdEqualTo(taskInfo.getId());
List<MtScore> scoreList = scoreDao.selectByExample(scoreExample); List<MtScore> scoreList = scoreDao.selectByExample(scoreExample);
if (CollectionUtil.isNotEmpty(scoreList)) { if (CollectionUtil.isNotEmpty(scoreList)) {
scoreInfo.setScore(scoreList.get(0).getScore()); scoreInfo.setScore(scoreList.get(0).getScore());
@ -125,7 +125,7 @@ public class ScoreService implements IScoreService{
addJudge(memberInfo); addJudge(memberInfo);
MtScoreExample scoreExample = new MtScoreExample(); 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); List<MtScore> scoreList = scoreDao.selectByExample(scoreExample);
if (CollectionUtil.isEmpty(scoreList)) { if (CollectionUtil.isEmpty(scoreList)) {
if (CollectionUtil.isNotEmpty(submitScore.getData())) { if (CollectionUtil.isNotEmpty(submitScore.getData())) {
@ -133,7 +133,7 @@ public class ScoreService implements IScoreService{
MtScore score = new MtScore(); MtScore score = new MtScore();
score.setId(snowflake.nextId()); score.setId(snowflake.nextId());
score.setJudgeUserId(memberInfo.getId()); score.setJudgeUserId(memberInfo.getId());
score.setTaskId(submitScore.getPlayerId()); score.setTaskId(taskInfo.getId());
score.setTaskName(taskInfo.getName()); score.setTaskName(taskInfo.getName());
score.setScoreLogId(data.getId()); score.setScoreLogId(data.getId());
score.setScore(data.getScore()); score.setScore(data.getScore());
@ -178,7 +178,7 @@ public class ScoreService implements IScoreService{
List<MtJudge> judgeList = judgeDao.selectByExample(judgeExample); List<MtJudge> judgeList = judgeDao.selectByExample(judgeExample);
if(CollectionUtil.isNotEmpty(judgeList)){ if(CollectionUtil.isNotEmpty(judgeList)){
for(MtJudge mtJudge: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 = new ScoreVo.AdminScore();
adminScore.setJudge(mtJudge.getId()); adminScore.setJudge(mtJudge.getId());
@ -225,7 +225,7 @@ public class ScoreService implements IScoreService{
rankingScore.setPlayerId(taskInfo.getId()); rankingScore.setPlayerId(taskInfo.getId());
rankingScore.setCompany(taskInfo.getName()); rankingScore.setCompany(taskInfo.getName());
//获取每个评委对此任务的评分 //获取每个评委对此任务的评分
List<ScoreVo.JudgeScore> judgeScoreList = findJudgeScore(projectId,taskId); List<ScoreVo.JudgeScore> judgeScoreList = findJudgeScore(projectId,taskInfo.getId());
// rankingScore.setJudgeScoreList(judgeScoreList); // rankingScore.setJudgeScoreList(judgeScoreList);
//获取此任务的平均分 //获取此任务的平均分
@ -302,7 +302,7 @@ public class ScoreService implements IScoreService{
data.setPlayerId(taskInfo.getId()); data.setPlayerId(taskInfo.getId());
data.setPlayerName(taskInfo.getName()); data.setPlayerName(taskInfo.getName());
//获取每个评委对此任务的评分 //获取每个评委对此任务的评分
List<ScoreVo.JudgeScore> judgeScoreList = findJudgeScore(projectId,taskId); List<ScoreVo.JudgeScore> judgeScoreList = findJudgeScore(projectId,taskInfo.getId());
BigDecimal aveScore = BigDecimal.valueOf(0); BigDecimal aveScore = BigDecimal.valueOf(0);
if(CollectionUtil.isNotEmpty(judgeScoreList)){ if(CollectionUtil.isNotEmpty(judgeScoreList)){
for(ScoreVo.JudgeScore judgeScore : judgeScoreList){ for(ScoreVo.JudgeScore judgeScore : judgeScoreList){

Write Preview
Loading…
Cancel
Save