:style:更改优雅的校验方式

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/SendMsgTaskDto.java

@@ -4,6 +4,9 @@ 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;
@@ -19,16 +22,19 @@ public class SendMsgTaskDto  implements Serializable {
     /**
      * 任务名称
      */
+    @NotBlank(message = "任务名称不能为空")
     private String taskName;
 
     /**
      * 游戏id
      */
+    @NotNull(message = "游戏id不能为空")
     private Long gameId;
 
     /**
      * 发送文本内容
      */
+    @NotBlank(message = "发送文本内容不能为空")
     private String sendContent;
     /**
      * 任务条件
@@ -38,6 +44,7 @@ public class SendMsgTaskDto  implements Serializable {
     /**
      * 角色id
      */
+    @NotEmpty(message = "角色id不能为空")
     private List<String> roleIds;
 
 

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

@@ -52,9 +52,6 @@ public class RoleManageServiceImpl implements IRoleManageService {
     private ICPSendMsgRpc sendMsgRpc;
 
 
-
-
-
     /**
      * 角色充值排行榜
      * @param dto RoleRechargeRankingDTO
@@ -336,8 +333,6 @@ public class RoleManageServiceImpl implements IRoleManageService {
      */
     @Override
     public void createSendMsgTask(SendMsgTaskDto dto) {
-        //校验参数
-        validation(dto);
         //获取当前用户id
         Long sysUserId = SecurityUtil.getUserId();
         //构建发送消息dto
@@ -349,25 +344,6 @@ public class RoleManageServiceImpl implements IRoleManageService {
         }
     }
 
-    /**
-     * 校验参数
-     * @param dto
-     */
-    private void validation(SendMsgTaskDto dto) {
-        if (StringUtils.isBlank(dto.getTaskName())) {
-            throw new BaseException("任务名称不能为空");
-        }
-        if (StringUtils.isBlank(dto.getSendContent())) {
-            throw new BaseException("发送内容不能为空");
-        }
-        if(dto.getGameId()==null){
-            throw new BaseException("游戏id不能为空");
-        }
-        if(CollectionUtils.isEmpty(dto.getRoleIds())){
-            throw new BaseException("角色id不能为空");
-        }
-
-    }
 
     private SendMsgDto buildSendMsgDto(SendMsgTaskDto dto, Long sysUserId) {
 //        //先查出来所有的角色

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

@@ -40,10 +40,6 @@ public class CPSendMsgTaskServiceImpl extends ServiceImpl<CpSendMsgTaskMapper, C
     @Override
     public ResultVO<Boolean> sendMsg(SendMsgDto sendMsgDto) {
         try {
-            // 数据校验
-            if (sendMsgDto == null || sendMsgDto.getMsg() == null || sendMsgDto.getGameId() == null || sendMsgDto.getCreateBy() == null || sendMsgDto.getRoles() == null || sendMsgDto.getRoles().isEmpty()) {
-                return ResultVO.fail("参数不能为空");
-            }
             //创建任务
             CpSendMsgTask cpSendMsgTask = createSendMsgTask(sendMsgDto);
             //保存任务