Procházet zdrojové kódy

:perf:更改类名,抽取优化

zhangxianyu před 1 rokem
rodič
revize
9b55faa34d

+ 3 - 3
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/RoleManageController.java

@@ -47,7 +47,7 @@ public class RoleManageController {
     @ApiOperation(value = "创建发送消息任务")
     @PreAuthorize(permissionKey = "roleManage:sendMsgTask:create")
     @PostMapping("/sendMsgTask")
-    public ResultVO createSendMsgTask(@RequestBody @Valid SendMsgTaskDto dto) {
+    public ResultVO createSendMsgTask(@RequestBody @Valid SendMsgTaskDTO dto) {
         roleManageService.createSendMsgTask(dto);
         return ResultVO.ok("操作成功", true);
     }
@@ -55,7 +55,7 @@ public class RoleManageController {
     @ApiOperation(value = "查询发送消息任务列表")
     @PreAuthorize(permissionKey = "roleManage:sendMsgTask:list")
     @PostMapping("/sendMsgTask/list")
-    public ResultVO<Page<SendMsgVO>> getSendMsgTaskList(@RequestBody MsgTaskDto dto) {
+    public ResultVO<Page<SendMsgVO>> getSendMsgTaskList(@RequestBody MsgTaskDTO dto) {
         return ResultVO.ok(roleManageService.getSendMsgTaskList(dto));
     }
 
@@ -63,7 +63,7 @@ public class RoleManageController {
     @ApiOperation(value = "查询发送消息任务结果")
     @PreAuthorize(permissionKey = "roleManage:sendMsgTask:resultList")
     @PostMapping("/sendMsgTask/resultList")
-    public ResultVO<Page<SendMsgResultVO>> getSendMsgResultList(@RequestBody @Valid MsgTaskResultDto msgTaskResultDto) {
+    public ResultVO<Page<SendMsgResultVO>> getSendMsgResultList(@RequestBody @Valid MsgTaskResultDTO msgTaskResultDto) {
         return ResultVO.ok(roleManageService.getSendMsgResultList(msgTaskResultDto));
     }
 

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

@@ -3,7 +3,7 @@ package com.zanxiang.game.data.serve.pojo.dto;
 import lombok.Data;
 
 @Data
-public class GameDto {
+public class GameDTO {
 
 
     private Integer id;

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

@@ -10,7 +10,7 @@ import lombok.Data;
  * @Description 消息任务查询dto
  **/
 @Data
-public class MsgTaskDto extends BasePage {
+public class MsgTaskDTO extends BasePage {
 
     @ApiModelProperty(value = "游戏id")
     private Long gameId;

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

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * @Description 查询任务结果Dto
  **/
 @Data
-public class MsgTaskResultDto extends BasePage implements Serializable {
+public class MsgTaskResultDTO extends BasePage implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @NotNull(message = "任务id不能为空")

+ 1 - 3
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/SendMsgTaskDto.java → game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/SendMsgTaskDTO.java

@@ -1,14 +1,12 @@
 package com.zanxiang.game.data.serve.pojo.dto;
 
 
-import com.zanxiang.game.data.serve.pojo.enums.TaskStrategyEnum;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -17,7 +15,7 @@ import java.util.List;
  * @Description 发送消息任务参数
  **/
 @Data
-public class SendMsgTaskDto  implements Serializable {
+public class SendMsgTaskDTO implements Serializable {
 
     /**
      * 任务名称

+ 3 - 3
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/IRoleManageService.java

@@ -18,7 +18,7 @@ public interface IRoleManageService {
      * 创建发送消息任务
      * @param dto
      */
-    void createSendMsgTask(SendMsgTaskDto dto);
+    void createSendMsgTask(SendMsgTaskDTO dto);
 
 
     /**
@@ -33,12 +33,12 @@ public interface IRoleManageService {
      * @param dto
      * @return
      */
-    Page<SendMsgVO> getSendMsgTaskList(MsgTaskDto dto);
+    Page<SendMsgVO> getSendMsgTaskList(MsgTaskDTO dto);
 
     /**
      * 查询发送消息任务结果
      * @param msgTaskResultDto
      * @return
      */
-    Page<SendMsgResultVO> getSendMsgResultList(MsgTaskResultDto msgTaskResultDto);
+    Page<SendMsgResultVO> getSendMsgResultList(MsgTaskResultDTO msgTaskResultDto);
 }

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

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