|
@@ -12,7 +12,7 @@ import com.zanxiang.game.data.serve.pojo.enums.OrderByEnum;
|
|
|
import com.zanxiang.game.data.serve.service.IRoleManageService;
|
|
|
import com.zanxiang.game.data.serve.utils.Page;
|
|
|
import com.zanxiang.game.module.base.ServerInfo;
|
|
|
-import com.zanxiang.game.module.base.pojo.dto.SendMsgDto;
|
|
|
+import com.zanxiang.game.module.base.pojo.dto.SendMsgDTO;
|
|
|
import com.zanxiang.game.module.base.pojo.params.SendMsgTaskParam;
|
|
|
import com.zanxiang.game.module.base.rpc.ICPSendMsgRpc;
|
|
|
import com.zanxiang.game.module.base.util.PageUtil;
|
|
@@ -337,7 +337,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
//获取当前用户id
|
|
|
Long sysUserId = SecurityUtil.getUserId();
|
|
|
//构建发送消息dto
|
|
|
- SendMsgDto sendMsgDto = buildSendMsgDto(dto, sysUserId);
|
|
|
+ SendMsgDTO sendMsgDto = buildSendMsgDto(dto, sysUserId);
|
|
|
//调用发送消息接口
|
|
|
ResultVO<Boolean> booleanResultVO = sendMsgRpc.sendMsg(sendMsgDto);
|
|
|
if (!booleanResultVO.isSuccess()) {
|
|
@@ -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());
|
|
|
//
|
|
@@ -355,7 +355,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
// .map(map -> Optional.ofNullable(map.get("role_id")).map(Object::toString).orElse(null))
|
|
|
// .toList();
|
|
|
|
|
|
- SendMsgDto sendMsgDto = new SendMsgDto();
|
|
|
+ SendMsgDTO sendMsgDto = new SendMsgDTO();
|
|
|
//任务名称
|
|
|
sendMsgDto.setTaskName(dto.getTaskName());
|
|
|
//消息
|
|
@@ -651,16 +651,16 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
//补齐参数
|
|
|
Sql sql = Sqls.create(getTaskResultSql() + cri);
|
|
|
sql.setCallback(Sqls.callback.entities());
|
|
|
- sql.setEntity(dao.getEntity(TaskResultDto.class));
|
|
|
+ sql.setEntity(dao.getEntity(TaskResultDTO.class));
|
|
|
dao.execute(sql);
|
|
|
- List<TaskResultDto> list = sql.getList(TaskResultDto.class);
|
|
|
+ List<TaskResultDTO> list = sql.getList(TaskResultDTO.class);
|
|
|
//拼成map key为角色id
|
|
|
- HashMap<String, TaskResultDto> taskResultMap = new HashMap<>();
|
|
|
+ HashMap<String, TaskResultDTO> taskResultMap = new HashMap<>();
|
|
|
list.forEach(item -> {
|
|
|
taskResultMap.put(item.getRoleId(), item);
|
|
|
});
|
|
|
sendMsgTaskResultList.getRecords().forEach(item -> {
|
|
|
- TaskResultDto taskResultDto = taskResultMap.get(item.getRoleId());
|
|
|
+ TaskResultDTO taskResultDto = taskResultMap.get(item.getRoleId());
|
|
|
if(taskResultDto!=null){
|
|
|
item.setGameName(taskResultDto.getGameName());
|
|
|
item.setRoleName(taskResultDto.getRoleName());
|