zhangxianyu 1 rok pred
rodič
commit
d9caf18bee

+ 1 - 1
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/TaskResultDto.java → game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/TaskResultDTO.java

@@ -10,7 +10,7 @@ import java.time.LocalDateTime;
  * @Description 补充任务查询结果Dto
  **/
 @Data
-public class TaskResultDto {
+public class TaskResultDTO {
 
     /**
      * 角色id

+ 8 - 8
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -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());

+ 1 - 1
game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/dto/SendMsgDto.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/dto/SendMsgDTO.java

@@ -6,7 +6,7 @@ import java.io.Serializable;
 import java.util.List;
 
 @Data
-public class SendMsgDto implements Serializable {
+public class SendMsgDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

+ 2 - 2
game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/rpc/ICPSendMsgRpc.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.base.rpc;
 
-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.pojo.params.SendMsgTaskResultParam;
 import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVO;
@@ -20,7 +20,7 @@ public interface ICPSendMsgRpc {
      * @param sendMsgDto
      * @return
      */
-    ResultVO<Boolean> sendMsg(SendMsgDto sendMsgDto);
+    ResultVO<Boolean> sendMsg(SendMsgDTO sendMsgDto);
 
     /**
      * 获取发送消息任务列表

+ 2 - 2
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/rpc/impl/CpSendMsgRpcImpl.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.manage.rpc.impl;
 
-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.pojo.params.SendMsgTaskResultParam;
 import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVO;
@@ -25,7 +25,7 @@ public class CpSendMsgRpcImpl implements ICPSendMsgRpc {
     private ICpSendMsgResultService cpSendMsgResultService;
 
     @Override
-    public ResultVO<Boolean> sendMsg(SendMsgDto sendMsgDto) {
+    public ResultVO<Boolean> sendMsg(SendMsgDTO sendMsgDto) {
        return cpSendMsgTaskService.sendMsg(sendMsgDto);
     }
 

+ 2 - 2
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/ICPSendMsgTaskService.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-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.pojo.vo.SendMsgVO;
 import com.zanxiang.game.module.base.util.PageUtil;
@@ -15,7 +15,7 @@ public interface ICPSendMsgTaskService extends IService<CpSendMsgTask> {
      * @param sendMsgDto
      * @return
      */
-    ResultVO<Boolean> sendMsg(SendMsgDto sendMsgDto);
+    ResultVO<Boolean> sendMsg(SendMsgDTO sendMsgDto);
 
     /**
      * 获取消息任务列表

+ 3 - 3
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/CPSendMsgTaskServiceImpl.java

@@ -3,7 +3,7 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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.pojo.vo.SendMsgVO;
 import com.zanxiang.game.module.base.util.PageUtil;
@@ -37,7 +37,7 @@ public class CPSendMsgTaskServiceImpl extends ServiceImpl<CpSendMsgTaskMapper, C
     private ICpSendMsgLogService cpSendMsgLogService;
 
     @Override
-    public ResultVO<Boolean> sendMsg(SendMsgDto sendMsgDto) {
+    public ResultVO<Boolean> sendMsg(SendMsgDTO sendMsgDto) {
         try {
             //创建任务
             CpSendMsgTask cpSendMsgTask = createSendMsgTask(sendMsgDto);
@@ -76,7 +76,7 @@ public class CPSendMsgTaskServiceImpl extends ServiceImpl<CpSendMsgTaskMapper, C
                 .collect(Collectors.toList());
     }
 
-    private CpSendMsgTask createSendMsgTask(SendMsgDto dto) {
+    private CpSendMsgTask createSendMsgTask(SendMsgDTO dto) {
         CpSendMsgTask cpSendMsgTask = new CpSendMsgTask();
         cpSendMsgTask.setMsg(dto.getMsg());
         cpSendMsgTask.setRoleIdCount((long) dto.getRoles().size());