fix : CP发送消息代码提交

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

@@ -1,8 +1,8 @@
 package com.zanxiang.game.data.serve.controller;
 
 import com.zanxiang.game.data.serve.pojo.dto.*;
-import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVo;
-import com.zanxiang.game.module.base.pojo.vo.SendMsgVo;
+import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVO;
+import com.zanxiang.game.module.base.pojo.vo.SendMsgVO;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.data.serve.service.IRoleManageService;
 import com.zanxiang.game.data.serve.utils.Page;
@@ -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));
     }
 

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

@@ -1,8 +1,8 @@
 package com.zanxiang.game.data.serve.service;
 
 import com.zanxiang.game.data.serve.pojo.dto.*;
-import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVo;
-import com.zanxiang.game.module.base.pojo.vo.SendMsgVo;
+import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVO;
+import com.zanxiang.game.module.base.pojo.vo.SendMsgVO;
 import com.zanxiang.game.data.serve.utils.Page;
 
 import java.util.List;
@@ -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);
 }

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

@@ -3,8 +3,8 @@ 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.module.base.pojo.params.SendMsgTaskResultParam;
-import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVo;
-import com.zanxiang.game.module.base.pojo.vo.SendMsgVo;
+import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVO;
+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;
@@ -561,13 +561,13 @@ 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());
             sendMsgTaskParam.setPageNum(dto.getPageNum());
             sendMsgTaskParam.setPageSize(dto.getPageSize());
-            PageUtil<SendMsgVo> sendMsgTaskList = sendMsgRpc.getSendMsgTaskList(sendMsgTaskParam);
+            PageUtil<SendMsgVO> sendMsgTaskList = sendMsgRpc.getSendMsgTaskList(sendMsgTaskParam);
             //查询所有游戏名称
             Sql sql = Sqls.create(getGameSql());
             sql.setCallback(Sqls.callback.entities());
@@ -599,21 +599,21 @@ public class RoleManageServiceImpl implements IRoleManageService {
      * @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());
             param.setPageNum(msgTaskResultDto.getPageNum());
             param.setPageSize(msgTaskResultDto.getPageSize());
-            PageUtil<SendMsgResultVo> sendMsgTaskResultList = sendMsgRpc.getSendMsgTaskResultList(param);
+            PageUtil<SendMsgResultVO> sendMsgTaskResultList = sendMsgRpc.getSendMsgTaskResultList(param);
             if(CollectionUtils.isEmpty(sendMsgTaskResultList.getRecords())){
                 return new Page<>(sendMsgTaskResultList.getRecords(),sendMsgTaskResultList.getTotal(),sendMsgTaskResultList.getSize(),sendMsgTaskResultList.getCurrent(),sendMsgTaskResultList.getPages());
             }
             //取角色id变成list
             List<String> roleId = sendMsgTaskResultList.getRecords().stream().
-                    map(SendMsgResultVo::getRoleId).collect(Collectors.toList());
+                    map(SendMsgResultVO::getRoleId).collect(Collectors.toList());
 
-            SendMsgResultVo sendMsgResultVo = sendMsgTaskResultList.getRecords().get(0);
+            SendMsgResultVO sendMsgResultVo = sendMsgTaskResultList.getRecords().get(0);
             Criteria cri = Cnd.cri();
             //拼接游戏ID
             cri.where().andInStrList("role_id", roleId);

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/vo/SendMsgResultVo.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/vo/SendMsgResultVO.java

@@ -1,14 +1,12 @@
 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;
 
 @Data
-public class SendMsgResultVo implements Serializable {
+public class SendMsgResultVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -73,5 +71,4 @@ public class SendMsgResultVo implements Serializable {
     private LocalDateTime createTime;
 
 
-
 }

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

@@ -6,7 +6,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @Data
-public class SendMsgVo implements Serializable {
+public class SendMsgVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -3,8 +3,8 @@ package com.zanxiang.game.module.base.rpc;
 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;
-import com.zanxiang.game.module.base.pojo.vo.SendMsgVo;
+import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVO;
+import com.zanxiang.game.module.base.pojo.vo.SendMsgVO;
 import com.zanxiang.game.module.base.util.PageUtil;
 import com.zanxiang.module.util.pojo.ResultVO;
 
@@ -27,12 +27,12 @@ public interface ICPSendMsgRpc {
      * @param sendMsgTaskParam
      * @return
      */
-    PageUtil<SendMsgVo> getSendMsgTaskList(SendMsgTaskParam sendMsgTaskParam);
+    PageUtil<SendMsgVO> getSendMsgTaskList(SendMsgTaskParam sendMsgTaskParam);
 
     /**
      * 获取发送消息任务结果
      * @param sendMsgTaskResultParam
      * @return
      */
-    PageUtil<SendMsgResultVo> getSendMsgTaskResultList(SendMsgTaskResultParam sendMsgTaskResultParam);
+    PageUtil<SendMsgResultVO> getSendMsgTaskResultList(SendMsgTaskResultParam sendMsgTaskResultParam);
 }

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

@@ -3,8 +3,8 @@ package com.zanxiang.game.module.manage.rpc.impl;
 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;
-import com.zanxiang.game.module.base.pojo.vo.SendMsgVo;
+import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVO;
+import com.zanxiang.game.module.base.pojo.vo.SendMsgVO;
 import com.zanxiang.game.module.base.rpc.ICPSendMsgRpc;
 import com.zanxiang.game.module.base.util.PageUtil;
 import com.zanxiang.game.module.manage.service.ICPSendMsgTaskService;
@@ -30,12 +30,12 @@ public class CpSendMsgRpcImpl implements ICPSendMsgRpc {
     }
 
     @Override
-    public PageUtil<SendMsgVo> getSendMsgTaskList(SendMsgTaskParam param) {
+    public PageUtil<SendMsgVO> getSendMsgTaskList(SendMsgTaskParam param) {
        return cpSendMsgTaskService.getSendMsgTaskList(param);
     }
 
     @Override
-    public PageUtil<SendMsgResultVo> getSendMsgTaskResultList(SendMsgTaskResultParam sendMsgTaskResultParam) {
+    public PageUtil<SendMsgResultVO> getSendMsgTaskResultList(SendMsgTaskResultParam sendMsgTaskResultParam) {
         return cpSendMsgResultService.getSendMsgTaskResultList(sendMsgTaskResultParam);
     }
 

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

@@ -3,7 +3,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.params.SendMsgTaskParam;
-import com.zanxiang.game.module.base.pojo.vo.SendMsgVo;
+import com.zanxiang.game.module.base.pojo.vo.SendMsgVO;
 import com.zanxiang.game.module.base.util.PageUtil;
 import com.zanxiang.game.module.mybatis.entity.CpSendMsgTask;
 import com.zanxiang.module.util.pojo.ResultVO;
@@ -22,7 +22,7 @@ public interface ICPSendMsgTaskService extends IService<CpSendMsgTask> {
      * @param param
      * @return
      */
-    PageUtil<SendMsgVo> getSendMsgTaskList(SendMsgTaskParam param);
+    PageUtil<SendMsgVO> getSendMsgTaskList(SendMsgTaskParam param);
 
 
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/ICpSendMsgResultService.java

@@ -2,7 +2,7 @@ package com.zanxiang.game.module.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.module.base.pojo.params.SendMsgTaskResultParam;
-import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVo;
+import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVO;
 import com.zanxiang.game.module.base.util.PageUtil;
 import com.zanxiang.game.module.mybatis.entity.CpSendMsgResult;
 
@@ -17,5 +17,5 @@ public interface ICpSendMsgResultService extends IService<CpSendMsgResult> {
      * @param sendMsgTaskResultParam
      * @return
      */
-    PageUtil<SendMsgResultVo> getSendMsgTaskResultList(SendMsgTaskResultParam sendMsgTaskResultParam);
+    PageUtil<SendMsgResultVO> getSendMsgTaskResultList(SendMsgTaskResultParam sendMsgTaskResultParam);
 }

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

@@ -5,7 +5,7 @@ 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.params.SendMsgTaskParam;
-import com.zanxiang.game.module.base.pojo.vo.SendMsgVo;
+import com.zanxiang.game.module.base.pojo.vo.SendMsgVO;
 import com.zanxiang.game.module.base.util.PageUtil;
 import com.zanxiang.game.module.manage.enums.CpSendMsgTaskStatusEnum;
 import com.zanxiang.game.module.manage.enums.CpSendMsgTaskTypeEnum;
@@ -57,22 +57,22 @@ public class CPSendMsgTaskServiceImpl extends ServiceImpl<CpSendMsgTaskMapper, C
     }
 
     @Override
-    public PageUtil<SendMsgVo> getSendMsgTaskList(SendMsgTaskParam param) {
+    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);
+        List<SendMsgVO> sendMsgVos = toVo(cpSendMsgTasks);
+        return new PageUtil<>(sendMsgVos, page.getTotal(), param.getPageSize(), param.getPageNum(), 0);
     }
 
-    private List<SendMsgVo> toVo(List<CpSendMsgTask> cpSendMsgTasks) {
+    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))
+                .map(task -> BeanUtil.copy(task, SendMsgVO.class))
                 .collect(Collectors.toList());
     }
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/CpSendMsgResultServiceImpl.java

@@ -4,12 +4,10 @@ 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.params.SendMsgTaskResultParam;
-import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVo;
-import com.zanxiang.game.module.base.pojo.vo.SendMsgVo;
+import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVO;
 import com.zanxiang.game.module.base.util.PageUtil;
 import com.zanxiang.game.module.manage.service.ICpSendMsgResultService;
 import com.zanxiang.game.module.mybatis.entity.CpSendMsgResult;
-import com.zanxiang.game.module.mybatis.entity.CpSendMsgTask;
 import com.zanxiang.game.module.mybatis.mapper.CpSendMsgResultMapper;
 import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -30,23 +28,23 @@ public class CpSendMsgResultServiceImpl extends ServiceImpl<CpSendMsgResultMappe
 
 
     @Override
-    public PageUtil<SendMsgResultVo> getSendMsgTaskResultList(SendMsgTaskResultParam param) {
+    public PageUtil<SendMsgResultVO> getSendMsgTaskResultList(SendMsgTaskResultParam param) {
         Page<CpSendMsgResult> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()),
                 new LambdaQueryWrapper<CpSendMsgResult>()
                         .eq(CpSendMsgResult::getTaskId, param.getTaskId())
                         .orderByDesc(CpSendMsgResult::getCreateTime)
         );
         List<CpSendMsgResult> cpSendMsgResults = page.getRecords();
-        List<SendMsgResultVo> sendMsgVos = toVo(cpSendMsgResults);
+        List<SendMsgResultVO> sendMsgVos = toVo(cpSendMsgResults);
         return new PageUtil<>(sendMsgVos, page.getTotal(), param.getPageSize(), param.getPageNum(),0);
     }
 
-    private List<SendMsgResultVo> toVo(List<CpSendMsgResult> cpSendMsgResults) {
+    private List<SendMsgResultVO> toVo(List<CpSendMsgResult> cpSendMsgResults) {
         if (Objects.isNull(cpSendMsgResults) || cpSendMsgResults.isEmpty()) {
             return null;
         }
         return cpSendMsgResults.stream()
-                .map(task -> BeanUtil.copy(task, SendMsgResultVo.class))
+                .map(task -> BeanUtil.copy(task, SendMsgResultVO.class))
                 .collect(Collectors.toList());
     }
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameServerServiceImpl.java

@@ -290,7 +290,7 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
         }
         return page(param.toPage(), new QueryWrapper<GameServer>().lambda()
                 .eq(gameId != null, GameServer::getGameId, gameId)
-                .eq(param.getServerId() != null, GameServer::getServerId, param.getServerId())
+                .eq(Strings.isNotBlank(param.getServerId()), GameServer::getServerId, param.getServerId())
                 .like(Strings.isNotBlank(param.getServerName()), GameServer::getServerName, param.getServerName())
                 .like(Strings.isNotBlank(param.getNickName()), GameServer::getNickName, param.getNickName())
                 .ge(param.getStartTime() != null, GameServer::getStartTime, param.getStartTime() == null ? null : LocalDateTime.of(param.getStartTime(), LocalTime.MIN))

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/SDKApplication.java

@@ -23,7 +23,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 <解决线上导量用户多端兼容的问题> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <CP发送消息代码提交> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +