|
@@ -333,7 +333,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
* @param dto
|
|
|
*/
|
|
|
@Override
|
|
|
- public void createSendMsgTask(SendMsgTaskDto dto) {
|
|
|
+ public void createSendMsgTask(SendMsgTaskDTO dto) {
|
|
|
//获取当前用户id
|
|
|
Long sysUserId = SecurityUtil.getUserId();
|
|
|
//构建发送消息dto
|
|
@@ -346,7 +346,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
}
|
|
|
|
|
|
|
|
|
- private SendMsgDto buildSendMsgDto(SendMsgTaskDto dto, Long sysUserId) {
|
|
|
+ private SendMsgDto buildSendMsgDto(SendMsgTaskDTO dto, Long sysUserId) {
|
|
|
// //先查出来所有的角色
|
|
|
// List<Map> roleList = getRoleList(dto.getRoleRechargeRankingDTO());
|
|
|
//
|
|
@@ -561,7 +561,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
* @return Page<SendMsgVo>
|
|
|
*/
|
|
|
@Override
|
|
|
- public Page<SendMsgVO> getSendMsgTaskList(MsgTaskDto dto) {
|
|
|
+ public Page<SendMsgVO> getSendMsgTaskList(MsgTaskDTO dto) {
|
|
|
try {
|
|
|
SendMsgTaskParam sendMsgTaskParam = new SendMsgTaskParam();
|
|
|
sendMsgTaskParam.setGameId(dto.getGameId());
|
|
@@ -571,24 +571,12 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
if(CollectionUtils.isEmpty(sendMsgTaskList.getRecords())){
|
|
|
return new Page<>(sendMsgTaskList.getRecords(),sendMsgTaskList.getTotal(),sendMsgTaskList.getSize(),sendMsgTaskList.getCurrent(),sendMsgTaskList.getPages());
|
|
|
}
|
|
|
- //查询所有游戏名称
|
|
|
- Sql sql = Sqls.create(getGameSql());
|
|
|
- sql.setCallback(Sqls.callback.entities());
|
|
|
- sql.setEntity(dao.getEntity(GameDto.class));
|
|
|
- dao.execute(sql);
|
|
|
- List<GameDto> gameDtoList = sql.getList(GameDto.class);
|
|
|
- //将游戏拼成map key为父游戏id,value为游戏名称
|
|
|
- HashMap<Long, String> gameMap = new HashMap<>();
|
|
|
- gameDtoList.forEach(item -> {
|
|
|
- gameMap.put(item.getParentId(), item.getGameName());
|
|
|
- });
|
|
|
+ //查询所有父游戏名称map key为父游戏id,value为游戏名称
|
|
|
+ Map<Long, String> gameMap = getParentGameMap();
|
|
|
|
|
|
- //取创建人id变成list
|
|
|
- List<Long> userId = sendMsgTaskList.getRecords().stream().
|
|
|
- map(SendMsgVO::getCreateBy).collect(Collectors.toList());
|
|
|
+ //查询创建人id key为创建人id,value为创建人名称
|
|
|
+ Map<Long, String> userMap = getCreateByNameMap(sendMsgTaskList);
|
|
|
|
|
|
- ResultVO<Map<Long, String>> userNameByIds = sysUserRpc.getUserNameByIds(userId);
|
|
|
- Map<Long, String> userMap = userNameByIds.getData();
|
|
|
//循环遍历获取游戏名称, 获取创建人名称
|
|
|
sendMsgTaskList.getRecords().forEach(item -> {
|
|
|
String gameName = gameMap.get(item.getGameId());
|
|
@@ -607,13 +595,40 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取创建人名称
|
|
|
+ * @param sendMsgTaskList
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ private Map<Long, String> getCreateByNameMap(PageUtil<SendMsgVO> sendMsgTaskList) {
|
|
|
+ //取创建人id变成list
|
|
|
+ List<Long> userId = sendMsgTaskList.getRecords().stream().
|
|
|
+ map(SendMsgVO::getCreateBy).collect(Collectors.toList());
|
|
|
+ ResultVO<Map<Long, String>> userNameByIds = sysUserRpc.getUserNameByIds(userId);
|
|
|
+ return userNameByIds.getData();
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取父游戏列表
|
|
|
+ */
|
|
|
+ private Map<Long, String> getParentGameMap(){
|
|
|
+ Sql sql = Sqls.create(getGameSql());
|
|
|
+ sql.setCallback(Sqls.callback.entities());
|
|
|
+ sql.setEntity(dao.getEntity(GameDTO.class));
|
|
|
+ dao.execute(sql);
|
|
|
+ List<GameDTO> gameDtoList = sql.getList(GameDTO.class);
|
|
|
+ //将游戏拼成map key为父游戏id,value为游戏名称
|
|
|
+ return gameDtoList.stream().collect(Collectors.toMap(GameDTO::getParentId, GameDTO::getGameName));
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 查询发送消息任务结果
|
|
|
* @param msgTaskResultDto msgTaskResultDto
|
|
|
* @return Page<SendMsgResultVo>
|
|
|
*/
|
|
|
@Override
|
|
|
- public Page<SendMsgResultVO> getSendMsgResultList(MsgTaskResultDto msgTaskResultDto) {
|
|
|
+ public Page<SendMsgResultVO> getSendMsgResultList(MsgTaskResultDTO msgTaskResultDto) {
|
|
|
try {
|
|
|
SendMsgTaskResultParam param = new SendMsgTaskResultParam();
|
|
|
param.setTaskId(msgTaskResultDto.getTaskId());
|