zhangxianyu 1 рік тому
батько
коміт
42e9f377c6

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

@@ -53,7 +53,7 @@ public class RoleManageController {
     @PostMapping("/sendMsgTask")
     public ResultVO createSendMsgTask(@RequestBody SendMsgTaskDto dto) {
         roleManageService.createSendMsgTask(dto);
-        return ResultVO.ok();
+        return ResultVO.ok("操作成功", true);
     }
 
     @ApiOperation(value = "查询发送消息任务列表")

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

@@ -1,15 +1,12 @@
 package com.zanxiang.game.data.serve.service.impl;
 
 import com.alibaba.fastjson2.JSON;
+import com.zanxiang.game.data.serve.pojo.dto.*;
 import com.zanxiang.game.data.serve.pojo.vo.GameDataDayVO;
 import com.zanxiang.game.module.base.pojo.vo.SendMsgVo;
 import com.zanxiang.erp.base.ErpServer;
 import com.zanxiang.erp.base.rpc.ISysUserRpc;
 import com.zanxiang.erp.security.util.SecurityUtil;
-import com.zanxiang.game.data.serve.pojo.dto.MsgTaskDto;
-import com.zanxiang.game.data.serve.pojo.dto.RoleCombatRankingDTO;
-import com.zanxiang.game.data.serve.pojo.dto.RoleRechargeRankingDTO;
-import com.zanxiang.game.data.serve.pojo.dto.SendMsgTaskDto;
 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;
@@ -593,15 +590,23 @@ public class RoleManageServiceImpl implements IRoleManageService {
             sendMsgTaskParam.setGameId(dto.getGameId());
             sendMsgTaskParam.setPageNum(dto.getPageNum());
             sendMsgTaskParam.setPageSize(dto.getPageSize());
-            PageUtil<SendMsgVo> sendMsgTaskList = sendMsgRpc.getSendMsgTaskList(sendMsgTaskParam);
+//            PageUtil<SendMsgVo> sendMsgTaskList = sendMsgRpc.getSendMsgTaskList(sendMsgTaskParam);
+            PageUtil<SendMsgVo> sendMsgTaskList = getTestList();
             //查询所有游戏名称
             Sql sql = Sqls.create(getGameSql());
             sql.setCallback(Sqls.callback.entities());
-            sql.setEntity(dao.getEntity(GameDataDayVO.class));
+            sql.setEntity(dao.getEntity(GameDto.class));
             dao.execute(sql);
+            List<GameDto> gameDtoList = sql.getList(GameDto.class);
+            //将游戏拼成map key为父游戏id,value为游戏名称
+            HashMap<Integer, String> gameMap = new HashMap<>();
+            gameDtoList.forEach(item -> {
+                gameMap.put(item.getParentId(), item.getGameName());
+            });
+            //循环遍历获取游戏名称
             sendMsgTaskList.getRecords().forEach(item -> {
-                String game = "";
-                item.setGameName(game);
+                String gameName = gameMap.get(item.getGameId());
+                item.setGameName(gameName);
             });
             return new Page<>(sendMsgTaskList.getRecords(),sendMsgTaskList.getTotal(),sendMsgTaskList.getSize(),sendMsgTaskList.getCurrent(),sendMsgTaskList.getPages());
         }catch (Exception exception){
@@ -610,6 +615,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
         }
     }
 
+    public PageUtil<SendMsgVo> getTestList(){
+        return null;
+
+    }
+
     /**
      * 查询游戏sql
      * @return String

+ 2 - 0
game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/vo/SendMsgVo.java

@@ -12,6 +12,8 @@ public class SendMsgVo implements Serializable {
 
     private String gameName;
 
+    private String gameId;
+