From 5ddcfa130846fae7c7541e5472a242fe0e31a2db Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 21 Dec 2020 14:47:00 +0800 Subject: [PATCH] =?UTF-8?q?20201221=E6=B8=B8=E6=88=8F=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/game/persist/dao/GameGroupDao.java | 5 +++++ .../com/ccsens/game/service/ClientService.java | 13 +++++++++++++ .../main/resources/mapper_dao/GameGroupDao.xml | 11 +++++++++++ .../com/ccsens/tall/service/UserInfoService.java | 1 + .../com/ccsens/tall/service/UserService.java | 3 +++ .../com/ccsens/tall/web/UserInfoController.java | 4 +++- .../wisdomcar/rabbitMQ/RabbitController.java | 2 +- .../ccsens/wisdomcar/service/RecordService.java | 16 +++++++++------- wisdomcar/src/main/resources/application-dev.yml | 1 + 9 files changed, 47 insertions(+), 9 deletions(-) diff --git a/game/src/main/java/com/ccsens/game/persist/dao/GameGroupDao.java b/game/src/main/java/com/ccsens/game/persist/dao/GameGroupDao.java index 24892185..e8aeef3f 100644 --- a/game/src/main/java/com/ccsens/game/persist/dao/GameGroupDao.java +++ b/game/src/main/java/com/ccsens/game/persist/dao/GameGroupDao.java @@ -33,4 +33,9 @@ public interface GameGroupDao extends GameGroupMapper { * @return 成员信息 */ List groupMemberRank(@Param("groupId") Long groupId); + + /** + * 根据分组id查找游戏类型 + */ + String getTypeByGroupId(@Param("groupId") Long groupId); } 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 8eab45d5..8fb20665 100644 --- a/game/src/main/java/com/ccsens/game/service/ClientService.java +++ b/game/src/main/java/com/ccsens/game/service/ClientService.java @@ -62,6 +62,8 @@ public class ClientService implements IClientService { private TallFeignClient tallFeignClient; @Resource private IScreenService screenService; + @Resource + private GameRecordDao gameRecordDao; @Override @@ -606,6 +608,17 @@ public class ClientService implements IClientService { @Override public PageInfo groupMembers(ClientDto.GroupRanking groupRanking) { log.info("查询组内成员排序：{}", groupRanking); + //查询游戏信息 + String gameType = gameGroupDao.getTypeByGroupId(groupRanking.getGroupId()); + if(StrUtil.isNotEmpty(gameType)){ + if(gameType.equals(GameConstant.GAME_TYPE_SQ)){ + groupRanking.setPageSize(5); + } + if(gameType.equals(GameConstant.GAME_TYPE_BH)){ + groupRanking.setPageSize(10); + } + } + PageHelper.startPage(groupRanking.getPageNum(), groupRanking.getPageSize()); List infos = gameGroupDao.groupMemberRank(groupRanking.getGroupId()); log.info("结果：{}", infos); diff --git a/game/src/main/resources/mapper_dao/GameGroupDao.xml b/game/src/main/resources/mapper_dao/GameGroupDao.xml index 24fcd767..82ac6f6c 100644 --- a/game/src/main/resources/mapper_dao/GameGroupDao.xml +++ b/game/src/main/resources/mapper_dao/GameGroupDao.xml @@ -56,4 +56,15 @@ ORDER BY u.score DESC + \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java b/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java index f2979cf0..dda619fb 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java +++ b/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java @@ -201,6 +201,7 @@ public class UserInfoService implements IUserInfoService{ @Override public UserVo.SelectUserInfo updateUserInfo(Long currentUserId, UserDto.UpdateUserInfo updateUserInfo) { + //查找用户 SysUser user = sysUserDao.selectByPrimaryKey(updateUserInfo.getId()); if(ObjectUtil.isNull(user)){ 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 11986631..7c9e57d1 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java @@ -1161,6 +1161,9 @@ public class UserService implements IUserService { public UserVo.TokenBean getUserInfoAndToken(WebConstant.CLIENT_TYPE clientType, WebConstant.IDENTIFY_TYPE identifyType,UserVo.UserSign userSignVo, Map theMap) { long start = System.currentTimeMillis(); UserVo.TokenBean tokenBean = userDao.getTokenBeanByUserId(userSignVo.getUserId()); + if(ObjectUtil.isNull(tokenBean)){ + return tokenBean; + } //如果只有手机号没有账号信息，则将手机号脱敏当成账号 if (StrUtil.isEmpty(tokenBean.getAccount()) && StrUtil.isNotEmpty(tokenBean.getPhone())){ String phoneNumber = tokenBean.getPhone().substring(0, 3) + "****" + tokenBean.getPhone().substring(7, tokenBean.getPhone().length()); diff --git a/tall/src/main/java/com/ccsens/tall/web/UserInfoController.java b/tall/src/main/java/com/ccsens/tall/web/UserInfoController.java index 8c3b46df..1a829955 100644 --- a/tall/src/main/java/com/ccsens/tall/web/UserInfoController.java +++ b/tall/src/main/java/com/ccsens/tall/web/UserInfoController.java @@ -12,6 +12,7 @@ import com.ccsens.util.UploadFileUtil_Servlet3; import com.ccsens.util.WebConstant; import io.jsonwebtoken.Claims; import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -27,6 +28,7 @@ import java.io.FileOutputStream; /** * @author 逗 */ +@Slf4j @Api(tags = "用户详细信息操作API") @RestController @RequestMapping("/users/info") @@ -86,7 +88,7 @@ public class UserInfoController { @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse updateUserInfo(HttpServletRequest request, @ApiParam @Validated @RequestBody UserDto.UpdateUserInfo updateUserInfo) throws Exception { - + log.info("修改用户详细信息:{}",updateUserInfo); Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); UserVo.SelectUserInfo selectUserInfo = userInfoService.updateUserInfo(currentUserId,updateUserInfo); return JsonResponse.newInstance().ok(selectUserInfo); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java index 0de445a7..c14c123c 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java @@ -118,7 +118,7 @@ public class RabbitController { Object o = redisUtil.get(key); if (ObjectUtil.isNull(o)) { //如果没有依次存入redis，value值都是0 - redisUtil.set(key, carRecordMessageDto.getValue()); + redisUtil.set(key, carRecordMessageDto.getValue(),Constant.FIRST_AID_REDIS_TIME); carRecordMessageDto.setValue(0 + ""); } else { //如果有，用当前的值减去上次的数据，得到的是新的value diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java index bf1a04e4..0fc354b5 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java @@ -121,9 +121,9 @@ public class RecordService implements IRecordService{ step = stepDao.getCodeByRfId(carRecordMessageDto.getValue()); } //发送消息 - sendRecordMessage(carRecordMessageDto,userIdSet,step == null?null:step.getStepCode(),step == null?null:step.getStepType()); - - + if(carRecordMessageDto.getType() != Constant.CAR_RECORD_RFID) { + sendRecordMessage(carRecordMessageDto, userIdSet, step == null ? null : step.getStepCode(), step == null ? null : step.getStepType()); + } // //如果是称重信息，制造测试数据发送大屏 // if(carRecordMessageDto.getType() == Constant.CAR_RECORD_WEIGHT){ // @@ -135,7 +135,7 @@ public class RecordService implements IRecordService{ // } // } //新建急救表存储信息 - saveAidRecord(carRecordMessageDto, wisdomCar.getId(),step); + saveAidRecord(carRecordMessageDto, wisdomCar.getId(),step,userIdSet); } private void doseAndSensorMessage(CarRecordMessageDto carRecordMessageDto, Set userIdSet) throws Exception { @@ -225,7 +225,7 @@ public class RecordService implements IRecordService{ /** * 添加急救信息和急救记录信息 */ - private void saveAidRecord(CarRecordMessageDto carRecordMessageDto, Long wisdomCarId, StepVo.Step step) { + private void saveAidRecord(CarRecordMessageDto carRecordMessageDto, Long wisdomCarId, StepVo.Step step, Set userIdSet) throws Exception { // 如果是开始信息，新建一条急救表数据 String key = Constant.FIRST_AID + wisdomCarId; log.info("急救表的key:{}",key); @@ -271,14 +271,15 @@ public class RecordService implements IRecordService{ case Constant.THROMBOLYTIC: case Constant.BOLUS_DOSE: case Constant.MAINTENANCE_DOSE: - saveFirstAidRecord(carRecordMessageDto,firstAidId,step); + saveFirstAidRecord(carRecordMessageDto,firstAidId,step,userIdSet); + break; default: } } - private void saveFirstAidRecord(CarRecordMessageDto carRecordMessageDto, Long firstAidId, StepVo.Step step) { + private void saveFirstAidRecord(CarRecordMessageDto carRecordMessageDto, Long firstAidId, StepVo.Step step, Set userIdSet) throws Exception { String reidKey; if(carRecordMessageDto.getType() == Constant.CAR_RECORD_RFID){ reidKey = Constant.FIRST_AID + firstAidId + "_" + carRecordMessageDto.getType() + "_" + carRecordMessageDto.getValue(); @@ -301,6 +302,7 @@ public class RecordService implements IRecordService{ if(firstAidRecordMapper.countByExample(aidRecordExample) > 0){ return; } + sendRecordMessage(carRecordMessageDto, userIdSet, step == null ? null : step.getStepCode(), step == null ? null : step.getStepType()); //没有数据则添加 FirstAidRecord aidRecord = new FirstAidRecord(); aidRecord.setId(snowflake.nextId()); diff --git a/wisdomcar/src/main/resources/application-dev.yml b/wisdomcar/src/main/resources/application-dev.yml index c2bae8d8..01db920c 100644 --- a/wisdomcar/src/main/resources/application-dev.yml +++ b/wisdomcar/src/main/resources/application-dev.yml @@ -9,6 +9,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: host: 192.144.182.42 +# host: test.tall.wiki password: 111111 port: 5672 username: admin