:fix:查询消息任务列表

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

@@ -590,8 +590,7 @@ 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 = getTestList();
+            PageUtil<SendMsgVo> sendMsgTaskList = sendMsgRpc.getSendMsgTaskList(sendMsgTaskParam);
             //查询所有游戏名称
             Sql sql = Sqls.create(getGameSql());
             sql.setCallback(Sqls.callback.entities());
@@ -606,7 +605,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
             //循环遍历获取游戏名称
             sendMsgTaskList.getRecords().forEach(item -> {
                 String gameName = gameMap.get(item.getGameId());
-                item.setGameName(gameName);
+                if (gameName != null){
+                    item.setGameName(gameName);
+                }
             });
             return new Page<>(sendMsgTaskList.getRecords(),sendMsgTaskList.getTotal(),sendMsgTaskList.getSize(),sendMsgTaskList.getCurrent(),sendMsgTaskList.getPages());
         }catch (Exception exception){
@@ -615,10 +616,6 @@ public class RoleManageServiceImpl implements IRoleManageService {
         }
     }
 
-    public PageUtil<SendMsgVo> getTestList(){
-        return null;
-
-    }
 
     /**
      * 查询游戏sql

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

@@ -1,8 +1,11 @@
 package com.zanxiang.game.module.base.pojo.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -10,9 +13,66 @@ public class SendMsgVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 消息内容
+     */
+    private String msg;
+
+    /**
+     * 游戏名称
+     */
     private String gameName;
 
-    private String gameId;
+    /**
+     * 任务人数
+     */
+    private Long roleIdCount;
+
+    /**
+     * 任务名称
+     */
+    private String taskName;
+
+    /**
+     * 任务条件
+     */
+    private String taskCondition;
+
+    /**
+     * 游戏id
+     */
+    private Long gameId;
+
+    /**
+     * 任务类型
+     */
+    private String type;
+
+    /**
+     * 任务状态
+     */
+    private String status;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
 
 
 

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

@@ -1,5 +1,8 @@
 package com.zanxiang.game.module.manage.rpc.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zanxiang.game.module.base.pojo.dto.SendMsgDto;
 import com.zanxiang.game.module.base.util.PageUtil;
 import com.zanxiang.game.module.base.pojo.params.SendMsgTaskParam;
@@ -7,8 +10,10 @@ import com.zanxiang.game.module.base.pojo.vo.SendMsgVo;
 import com.zanxiang.game.module.base.rpc.ICPSendMsgRpc;
 import com.zanxiang.game.module.manage.enums.CpSendMsgTaskStatusEnum;
 import com.zanxiang.game.module.manage.enums.CpSendMsgTaskTypeEnum;
+import com.zanxiang.game.module.manage.pojo.vo.CpVO;
 import com.zanxiang.game.module.manage.service.ICPSendMsgTaskService;
 import com.zanxiang.game.module.mybatis.entity.CpSendMsgTask;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.pojo.ResultVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -16,6 +21,10 @@ import org.apache.dubbo.config.annotation.DubboService;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 @DubboService
 @Slf4j
@@ -45,8 +54,23 @@ public class CpSendMsgRpcImpl implements ICPSendMsgRpc {
     }
 
     @Override
-    public PageUtil<SendMsgVo> getSendMsgTaskList(SendMsgTaskParam sendMsgTaskParam) {
-        return null;
+    public PageUtil<SendMsgVo> getSendMsgTaskList(SendMsgTaskParam param) {
+        Page<CpSendMsgTask> page = sendMsgTaskService.page(new Page<>(param.getPageNum(), param.getPageSize()),
+                new LambdaQueryWrapper<CpSendMsgTask>()
+                        .eq(param.getGameId() != null, CpSendMsgTask::getGameId, param.getGameId())
+                        .orderByDesc(CpSendMsgTask::getCreateTime));
+        List<CpSendMsgTask> cpSendMsgTasks = page.getRecords();
+        List<SendMsgVo> sendMsgVos = toVo(cpSendMsgTasks);
+        return new PageUtil<>(sendMsgVos, page.getTotal(), param.getPageSize(), param.getPageNum(),0);
+    }
+
+    private List<SendMsgVo> toVo(List<CpSendMsgTask> cpSendMsgTasks) {
+        if (Objects.isNull(cpSendMsgTasks) || cpSendMsgTasks.isEmpty()) {
+            return null;
+        }
+        return cpSendMsgTasks.stream()
+                .map(task -> BeanUtil.copy(task, SendMsgVo.class))
+                .collect(Collectors.toList());
     }