0106

cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java

@@ -102,7 +102,7 @@ public interface TallFeignClient {
     List<Long> getMemberIdListByProject(@RequestParam( name = "projectId")Long projectId);
 
     /**
-     * 通过任务id获得项目id(消息系统用)
+     * 通过token获得userId(消息系统用)
      * @param token
      * @return
      */

game/src/main/java/com/ccsens/game/service/ClientService.java

@@ -309,6 +309,12 @@ public class ClientService implements IClientService {
         return rankingAll;
     }
 
+    /**
+     * 滑动时添加记录
+     * @param userId
+     * @param recordId
+     * @return
+     */
     @Override
     public GameMessageCountOut clientAddTimes(String userId,String recordId) {
         GameMessageCountOut gameMessageCountOut = new GameMessageCountOut();
@@ -320,7 +326,7 @@ public class ClientService implements IClientService {
             if(CollectionUtil.isNotEmpty(userJoinList)){
                 GameUserJoin userJoin = userJoinList.get(0);
                 userJoin.setTimes(userJoin.getTimes() + 1);
-                userJoin.setScore((userJoin.getScore() + 1) * 100);
+                userJoin.setScore(userJoin.getScore() + 100);
                 gameUserJoinDao.updateByPrimaryKeySelective(userJoin);
                 //更新redis
                 ClientDto.RedisUser user = ClientDto.RedisUser.getInstance(userJoin);

game/src/main/java/com/ccsens/game/service/IScreenService.java

@@ -11,7 +11,7 @@ public interface IScreenService {
 
     ScreenVo.GameStatusVo getGameStatusVo(QueryDto<ScreenDto.MemberRecord> params);
 
-    String startAgain(QueryDto<ScreenDto.MemberRecord> params);
+    String startAgain(QueryDto<ScreenDto.MemberRecord> params) throws Exception;
 
     /**
      * 游戏开始

game/src/main/java/com/ccsens/game/service/ScreenService.java

@@ -243,6 +243,11 @@ public class ScreenService implements IScreenService{
 
         gameStatusVo.setGameStatus(gameRecord.getGameStatus());
 
+        GameUserJoinExample gameuserJoinExample = new GameUserJoinExample();
+        gameuserJoinExample.createCriteria().andRecordIdEqualTo(memberRecord.getMemberRecord());
+        List<GameUserJoin> userJoins = gameUserJoinDao.selectByExample(gameuserJoinExample);
+        gameStatusVo.setTotalMembers(userJoins.size());
+
         switch (gameStatusVo.getGameStatus()){
             case 0:
                 break;
@@ -294,10 +299,9 @@ public class ScreenService implements IScreenService{
                 }
                 break;
             case 3:
-//                List<ClientDto.RedisUser> userJoins = sendMsg.getAllScore(gameRecord);
-                GameUserJoinExample gameuserJoinExample = new GameUserJoinExample();
-                gameuserJoinExample.createCriteria().andRecordIdEqualTo(memberRecord.getMemberRecord());
-                List<GameUserJoin> userJoins = gameUserJoinDao.selectByExample(gameuserJoinExample);
+//                GameUserJoinExample gameuserJoinExample = new GameUserJoinExample();
+//                gameuserJoinExample.createCriteria().andRecordIdEqualTo(memberRecord.getMemberRecord());
+//                List<GameUserJoin> userJoins = gameUserJoinDao.selectByExample(gameuserJoinExample);
                 ScreenVo.CompletedData completedData = new ScreenVo.CompletedData();
                 if(CollectionUtil.isNotEmpty(userJoins)){
                     completedData = getCompletedData(userJoins);
@@ -316,7 +320,7 @@ public class ScreenService implements IScreenService{
      * 再玩一次
      */
     @Override
-    public String startAgain(QueryDto<ScreenDto.MemberRecord> params) {
+    public String startAgain(QueryDto<ScreenDto.MemberRecord> params) throws Exception {
         ScreenDto.MemberRecord memberRecord = params.getParam();
         GameRecord gameRecord = gameRecordDao.selectByPrimaryKey(memberRecord.getMemberRecord());
         if(ObjectUtil.isNull(gameRecord)){
@@ -330,17 +334,6 @@ public class ScreenService implements IScreenService{
         if(ObjectUtil.isNull(gameType)){
             throw new BaseException(CodeEnum.NOT_GAME_TYPE);
         }
-//        //添加一场新的游戏记录
-//        GameRecord gameRecordNew = new GameRecord();
-//        gameRecordNew.setId(snowflake.nextId());
-//        gameRecordNew.setUserPayId(gameUserPay.getId());
-//        gameRecordNew.setUrl(WebConstant.TEST_URL_GAME + gameRecordNew.getId() +  File.separator + gameType.getScreenUrl());
-//        gameRecordNew.setQrCodeUrl(WebConstant.TEST_URL_GAME + gameRecordNew.getId() +  File.separator + gameType.getClientUrl());
-//        gameRecordDao.insertSelective(gameRecordNew);
-//        //修改购买的游戏的使用次数
-//        gameUserPay.setUsedCount(gameUserPay.getUsedCount() + 1);
-//        gameUserPayDao.updateByPrimaryKeySelective(gameUserPay);
-
 
         if(gameUserPay.getUsedCount() >= gameUserPay.getTotalCount()){
            throw new BaseException(CodeEnum. GAME_NOT_TIMES);
@@ -357,6 +350,23 @@ public class ScreenService implements IScreenService{
             //修改购买的游戏的使用次数
             gameUserPay.setUsedCount(gameUserPay.getUsedCount() + 1);
             gameUserPayDao.updateByPrimaryKeySelective(gameUserPay);
+
+//            //给所有人发送消息发送消息
+//            ChromeMessageDto chromeMessageDto = new ChromeMessageDto(gameRecord.getUrl(),gameRecord.getId(),memberGame.getProjectId());
+//            BaseMessageDto.MessageUser messageUser = null;
+//            List<BaseMessageDto.MessageUser> messageUserList = new ArrayList<>();
+//            //获取项目下所有成员
+//            List<Long> memberIdList = tallFeignClient.getMemberIdListByProject(memberGame.getProjectId());
+//            if(CollectionUtil.isNotEmpty(memberIdList)){
+//                for(Long memberId:memberIdList){
+//                    messageUser = new BaseMessageDto.MessageUser();
+//                    messageUser.setUserId(memberId);
+//                    messageUserList.add(messageUser);
+//                }
+//            }
+//            chromeMessageDto.setReceivers(messageUserList);
+//            messageService.sendGameMessageWithGetUrl(chromeMessageDto);
+
         }else {
             throw new BaseException(CodeEnum.GAME_NO_END);
         }
@@ -466,7 +476,11 @@ public class ScreenService implements IScreenService{
     }
 
 
-
+    /**
+     * 开始游戏
+     * @param start
+     * @return
+     */
     @Override
     public ScreenVo.StartGame startGame(ScreenDto.Start start) {
         long current = System.currentTimeMillis();
@@ -552,8 +566,10 @@ public class ScreenService implements IScreenService{
             });
 
             long endTime = gameRecord.getEndTime() - System.currentTimeMillis();
+            System.out.println("游戏结束");
             sendMsg.sendMsg(executor, endTime > 0 ? endTime : 0, ()->{
                 try {
+                    System.out.println("-----游戏结束");
                     sendMsg.sendStatus(gameRecord, userJoins, GameConstant.GAME_COMPLETED);
                 } catch (JsonProcessingException e) {
                     e.printStackTrace();

game/src/main/java/com/ccsens/game/util/SendMsg.java

@@ -39,13 +39,16 @@ public class SendMsg {
     private RedisUtil redisUtil;
 
     public void sendStatus(GameRecord gameRecord, List<ClientDto.RedisUser> userJoins, byte status) throws JsonProcessingException {
+        System.out.println("准备发送"+userJoins.size());
         List<GameMessageWithChangeStatusOut> outs = new ArrayList<>();
         userJoins.forEach(join -> {
             outs.add(getMsg(gameRecord, join, status));
         });
+        System.out.println("准备发送"+outs);
         if (CollectionUtil.isNotEmpty(outs)) {
             log.info("==================="+outs);
             rabbitTemplate.convertAndSend(RabbitMQConfig.GAME_STATUS, JacksonUtil.beanToJson(outs));
+            System.out.println("发送成功"+JacksonUtil.beanToJson(outs));
 
         }
     }

game/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: test
+    include: common, util-test

mt/src/main/java/com/ccsens/mt/api/SigninController.java

@@ -62,7 +62,7 @@ public class SigninController {
     @RequestMapping(value = "all", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<List<SigninVo.SigninVoInfo>> getSignAllByTaskId(HttpServletRequest request,
                                                                         @RequestParam(required = true) Long taskId) throws Exception {
-        log.info("查看自己的签到信息");
+        log.info("查看所有人的签到信息");
         //获取userId
         Long userId = userService.getUserIdByToken(request);
         List<SigninVo.SigninVoInfo> signinVoInfo = signinService.getSignAllByTaskId(taskId,userId);

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -774,7 +774,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
             startMillisTime = timeMap.get("startMillisTime");
         }
         if (StrUtil.isNotEmpty(end)) {
-            timeMap = DateUtil.projectFormatDateTime(start);
+            timeMap = DateUtil.projectFormatDateTime(end);
             endMillisTime = timeMap.get("endMillisTime");
         }
         //获取需查询的角色

tall/src/main/java/com/ccsens/tall/service/ProjectService.java

@@ -305,7 +305,7 @@ public class ProjectService implements IProjectService {
             startMillisTime = timeMap.get("startMillisTime");
         }
         if (StrUtil.isNotEmpty(end)) {
-            timeMap = DateUtil.projectFormatDateTime(start);
+            timeMap = DateUtil.projectFormatDateTime(end);
             endMillisTime = timeMap.get("endMillisTime");
         }
         List<SysProject> projectList = sysProjectDao.findProjectIdByUserId(currentUserId, startMillisTime, endMillisTime);

tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java

@@ -590,7 +590,7 @@ public class TaskDeliverService implements ITaskDeliverService {
                 startMillisTime = timeMap.get("startMillisTime");
             }
             if (StrUtil.isNotEmpty(end)) {
-                timeMap = DateUtil.projectFormatDateTime(start);
+                timeMap = DateUtil.projectFormatDateTime(end);
                 endMillisTime = timeMap.get("endMillisTime");
             }
             if (CollectionUtil.isNotEmpty(deliverFileList)) {

tall/src/main/java/com/ccsens/tall/service/UserService.java

@@ -63,6 +63,7 @@ public class UserService implements IUserService {
             case Wxmp:
                 return wxmplogin(identifier);
             case OAUTH2_Wx:
+                //微信登录
                 //Fix Me.
                 break;
             case OAUTH2_WeiBo: