From d2268da9b8eddc3b27b13dc3da28268255a9826f Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Mon, 6 Jan 2020 11:24:55 +0800 Subject: [PATCH] 0106 --- .../cloudutil/feign/TallFeignClient.java | 2 +- .../ccsens/game/service/ClientService.java | 8 ++- .../ccsens/game/service/IScreenService.java | 2 +- .../ccsens/game/service/ScreenService.java | 50 ++++++++++++------- .../java/com/ccsens/game/util/SendMsg.java | 3 ++ game/src/main/resources/application.yml | 4 +- .../com/ccsens/mt/api/SigninController.java | 2 +- .../tall/service/ProTaskDetailService.java | 2 +- .../ccsens/tall/service/ProjectService.java | 2 +- .../tall/service/TaskDeliverService.java | 2 +- .../com/ccsens/tall/service/UserService.java | 1 + 11 files changed, 52 insertions(+), 26 deletions(-) diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java index 11eaa6ca..4e1acc77 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java @@ -102,7 +102,7 @@ public interface TallFeignClient { List getMemberIdListByProject(@RequestParam( name = "projectId")Long projectId); /** - * 通过任务id获得项目id(消息系统用) + * 通过token获得userId(消息系统用) * @param token * @return */ diff --git a/game/src/main/java/com/ccsens/game/service/ClientService.java b/game/src/main/java/com/ccsens/game/service/ClientService.java index 453157c2..799e5f82 100644 --- a/game/src/main/java/com/ccsens/game/service/ClientService.java +++ b/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); diff --git a/game/src/main/java/com/ccsens/game/service/IScreenService.java b/game/src/main/java/com/ccsens/game/service/IScreenService.java index 068d803c..375a21aa 100644 --- a/game/src/main/java/com/ccsens/game/service/IScreenService.java +++ b/game/src/main/java/com/ccsens/game/service/IScreenService.java @@ -11,7 +11,7 @@ public interface IScreenService { ScreenVo.GameStatusVo getGameStatusVo(QueryDto params); - String startAgain(QueryDto params); + String startAgain(QueryDto params) throws Exception; /** * 游戏开始 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 6bb2487a..ba7e9e6d 100644 --- a/game/src/main/java/com/ccsens/game/service/ScreenService.java +++ b/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 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 userJoins = sendMsg.getAllScore(gameRecord); - GameUserJoinExample gameuserJoinExample = new GameUserJoinExample(); - gameuserJoinExample.createCriteria().andRecordIdEqualTo(memberRecord.getMemberRecord()); - List userJoins = gameUserJoinDao.selectByExample(gameuserJoinExample); +// GameUserJoinExample gameuserJoinExample = new GameUserJoinExample(); +// gameuserJoinExample.createCriteria().andRecordIdEqualTo(memberRecord.getMemberRecord()); +// List 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 params) { + public String startAgain(QueryDto 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 messageUserList = new ArrayList<>(); +// //获取项目下所有成员 +// List 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(); diff --git a/game/src/main/java/com/ccsens/game/util/SendMsg.java b/game/src/main/java/com/ccsens/game/util/SendMsg.java index 30ebb36a..6e3523f8 100644 --- a/game/src/main/java/com/ccsens/game/util/SendMsg.java +++ b/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 userJoins, byte status) throws JsonProcessingException { + System.out.println("准备发送"+userJoins.size()); List 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)); } } diff --git a/game/src/main/resources/application.yml b/game/src/main/resources/application.yml index 5c2cd5c4..5889ff7f 100644 --- a/game/src/main/resources/application.yml +++ b/game/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: common, util-dev \ No newline at end of file + active: test + include: common, util-test \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/api/SigninController.java b/mt/src/main/java/com/ccsens/mt/api/SigninController.java index 407ac87c..202f5800 100644 --- a/mt/src/main/java/com/ccsens/mt/api/SigninController.java +++ b/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> getSignAllByTaskId(HttpServletRequest request, @RequestParam(required = true) Long taskId) throws Exception { - log.info("查看自己的签到信息"); + log.info("查看所有人的签到信息"); //获取userId Long userId = userService.getUserIdByToken(request); List signinVoInfo = signinService.getSignAllByTaskId(taskId,userId); diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index a25f0936..cd36fed2 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/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"); } //获取需查询的角色 diff --git a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java index 0c1c1bd5..37764433 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java +++ b/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 projectList = sysProjectDao.findProjectIdByUserId(currentUserId, startMillisTime, endMillisTime); diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java index 3d681ad4..de18b21d 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java +++ b/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)) { diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java index cd5140e5..390431b9 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserService.java +++ b/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: