refactor(util): 移除多余BeanUtil导入并添加参数验证工具类

cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java

@@ -49,4 +49,16 @@ public final class KitValidUtil {
           violations.stream().map(ConstraintViolation::getMessage).collect(Collectors.joining(",")));
     }
   }
+
+  public static void notNull(Object value) {
+    if (value == null) {
+      throw new BadRequestException("参数必填");
+    }
+  }
+
+  public static void isNull(Object value) {
+    if (value != null) {
+      throw new BadRequestException("参数非必填");
+    }
+  }
 }

cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpMapper.java

@@ -15,7 +15,6 @@
  */
 package cn.odboy.framework.mybatisplus.core.interfaces;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.odboy.base.KitPageResult;

cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java

@@ -49,4 +49,16 @@ public final class KitValidUtil {
           violations.stream().map(ConstraintViolation::getMessage).collect(Collectors.joining(",")));
     }
   }
+
+  public static void notNull(Object value) {
+    if (value == null) {
+      throw new BadRequestException("参数必填");
+    }
+  }
+
+  public static void isNull(Object value) {
+    if (value != null) {
+      throw new BadRequestException("参数非必填");
+    }
+  }
 }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java

@@ -3,7 +3,6 @@ package cn.odboy.system.controller;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
-import cn.odboy.system.dal.model.SystemQueryDeptArgs;
 import cn.odboy.system.dal.model.SystemQueryOperationLogArgs;
 import cn.odboy.system.service.SystemOperationLogService;
 import cn.odboy.util.KitPageUtil;
@@ -14,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java

@@ -21,7 +21,6 @@ import cn.odboy.base.KitSelectOptionVo;
 import cn.odboy.system.dal.dataobject.SystemUserTb;
 import cn.odboy.system.dal.model.SystemQueryUserArgs;
 import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs;
-import cn.odboy.system.dal.model.SystemUserInfoVo;
 import cn.odboy.system.dal.model.SystemUserJwtVo;
 import cn.odboy.system.dal.model.SystemUserVo;
 import cn.odboy.system.framework.operalog.OperationLog;

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java

@@ -15,8 +15,6 @@
  */
 package cn.odboy.system.dal.dataobject;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
 import cn.odboy.base.KitBaseUserTimeTb;
 import cn.odboy.util.KitBeanUtil;
 import com.baomidou.mybatisplus.annotation.IdType;

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java

@@ -4,7 +4,6 @@ import cn.odboy.system.dal.dataobject.SystemDeptTb;
 import cn.odboy.system.dal.dataobject.SystemJobTb;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
 import cn.odboy.system.dal.dataobject.SystemUserTb;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Set;
 import lombok.Getter;
@@ -13,6 +12,7 @@ import lombok.Setter;
 @Getter
 @Setter
 public class SystemUserVo extends SystemUserTb {
+
   @ApiModelProperty(value = "用户部门")
   private SystemDeptTb dept;
   @ApiModelProperty(value = "用户角色")

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java

@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.dal.mysql;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
 import cn.odboy.system.dal.model.SystemQuartzJobVo;
 import cn.odboy.util.KitBeanUtil;

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java

@@ -1,28 +1,24 @@
 package cn.odboy.system.dal.redis;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.redis.KitRedisHelper;
 import cn.odboy.system.dal.model.SystemUserJwtVo;
+import cn.odboy.system.dal.model.SystemUserOnlineExportRowVo;
 import cn.odboy.system.dal.model.SystemUserOnlineVo;
 import cn.odboy.system.framework.permission.core.handler.TokenProvider;
 import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitBrowserUtil;
 import cn.odboy.util.KitDesEncryptUtil;
-import cn.odboy.util.KitFileUtil;
 import cn.odboy.util.KitIPUtil;
 import cn.odboy.util.KitPageUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletRequest;
@@ -174,7 +170,7 @@ public class SystemUserOnlineInfoDAO {
     List<SystemUserOnlineVo> userOnlineVos = this.queryUserOnlineModelListByUsername(username);
 //    KitXlsxExportUtil.exportFile(response, "在线用户数据", userOnlineVos, SystemUserOnlineExportRowVo.class,
 //        (dataObject) -> CollUtil.newArrayList(KitBeanUtil.copyProperties(dataObject, SystemUserOnlineExportRowVo.class)));
-    List<SystemUserOnlineVo> rowVos = KitBeanUtil.copyToList(userOnlineVos, SystemUserOnlineVo.class);
+    List<SystemUserOnlineExportRowVo> rowVos = KitBeanUtil.copyToList(userOnlineVos, SystemUserOnlineExportRowVo.class);
-    KitExcelExporter.exportSimple(response, "在线用户数据", SystemUserOnlineVo.class, rowVos);
+    KitExcelExporter.exportSimple(response, "在线用户数据", SystemUserOnlineExportRowVo.class, rowVos);
   }
 }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java

@@ -19,7 +19,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.odboy.system.constant.SystemDataScopeEnum;
 import cn.odboy.system.dal.dataobject.SystemDeptTb;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import cn.odboy.system.dal.dataobject.SystemUserTb;
 import cn.odboy.system.dal.model.SystemRoleVo;
 import cn.odboy.system.dal.model.SystemUserVo;
 import java.util.ArrayList;

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java

@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -35,6 +34,7 @@ import cn.odboy.system.dal.mysql.SystemDeptMapper;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
 import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitClassUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import java.lang.reflect.Field;
@@ -147,8 +147,8 @@ public class SystemDeptService {
   }
 
   private List<SystemDeptTb> queryDeptByArgs(SystemQueryDeptArgs args) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemDeptTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
     wrapper.in(CollUtil.isNotEmpty(args.getIds()), SystemDeptTb::getId, args.getIds());
     wrapper.like(StrUtil.isNotBlank(args.getName()), SystemDeptTb::getName, args.getName());
     wrapper.eq(args.getEnabled() != null, SystemDeptTb::getEnabled, args.getEnabled());
@@ -158,7 +158,6 @@ public class SystemDeptService {
       wrapper.between(SystemDeptTb::getCreateTime, args.getCreateTime().get(0),
           args.getCreateTime().get(1));
     }
-    }
     wrapper.orderByAsc(SystemDeptTb::getDeptSort);
     return systemDeptMapper.selectList(wrapper);
   }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java

@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java

@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
@@ -27,6 +26,7 @@ import cn.odboy.system.dal.model.SystemQueryDictArgs;
 import cn.odboy.system.dal.mysql.SystemDictMapper;
 import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -97,11 +97,10 @@ public class SystemDictService {
   }
 
   private void injectQueryParams(SystemQueryDictArgs args, LambdaQueryWrapper<SystemDictTb> wrapper) {
-    if (args != null) {
+    KitValidUtil.notNull(args);
     wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemDictTb::getName, args.getBlurry()).or()
         .like(SystemDictTb::getDescription, args.getBlurry()));
   }
-  }
 
   public List<SystemDictTb> queryDictByArgs(SystemQueryDictArgs args) {
     LambdaQueryWrapper<SystemDictTb> wrapper = new LambdaQueryWrapper<>();

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java

@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
@@ -27,6 +26,7 @@ import cn.odboy.system.dal.model.SystemQueryJobArgs;
 import cn.odboy.system.dal.mysql.SystemJobMapper;
 import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -128,14 +128,13 @@ public class SystemJobService {
   }
 
   public void injectQueryParams(SystemQueryJobArgs args, LambdaQueryWrapper<SystemJobTb> wrapper) {
-    if (args != null) {
+    KitValidUtil.notNull(args);
     wrapper.like(StrUtil.isNotBlank(args.getName()), SystemJobTb::getName, args.getName());
     wrapper.eq(args.getEnabled() != null, SystemJobTb::getEnabled, args.getEnabled());
     if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
       wrapper.between(SystemJobTb::getCreateTime, args.getCreateTime().get(0),
           args.getCreateTime().get(1));
     }
-    }
     wrapper.orderByDesc(SystemJobTb::getJobSort, SystemJobTb::getId);
   }
 

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java

@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
@@ -34,6 +33,7 @@ import cn.odboy.system.dal.mysql.SystemLocalStorageMapper;
 import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitFileUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -140,7 +140,7 @@ public class SystemLocalStorageService {
   }
 
   private void injectQueryParams(SystemQueryStorageArgs args, LambdaQueryWrapper<SystemLocalStorageTb> wrapper) {
-    if (args != null) {
+    KitValidUtil.notNull(args);
     wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
         c -> c.like(SystemLocalStorageTb::getName, args.getBlurry()).or()
             .like(SystemLocalStorageTb::getSuffix, args.getBlurry()).or()
@@ -150,7 +150,6 @@ public class SystemLocalStorageService {
       wrapper.between(SystemLocalStorageTb::getUpdateTime, args.getCreateTime().get(0),
           args.getCreateTime().get(1));
     }
-    }
     wrapper.orderByDesc(SystemLocalStorageTb::getId);
   }
 

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java

@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -35,6 +34,7 @@ import cn.odboy.system.dal.mysql.SystemMenuMapper;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
 import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitClassUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -397,8 +397,8 @@ public class SystemMenuService {
   }
 
   private List<SystemMenuTb> queryMenuByArgs(SystemQueryMenuArgs args) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemMenuTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
     wrapper.isNull(args.getPidIsNull() != null, SystemMenuTb::getPid);
     wrapper.eq(args.getPid() != null, SystemMenuTb::getPid, args.getPid());
     wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
@@ -409,7 +409,6 @@ public class SystemMenuService {
       wrapper.between(SystemMenuTb::getCreateTime, args.getCreateTime().get(0),
           args.getCreateTime().get(1));
     }
-    }
     wrapper.orderByAsc(SystemMenuTb::getMenuSort);
     return systemMenuMapper.selectList(wrapper);
   }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java

@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
@@ -35,6 +34,7 @@ import cn.odboy.system.dal.mysql.SystemQuartzLogMapper;
 import cn.odboy.system.framework.quartz.QuartzManage;
 import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -200,36 +200,27 @@ public class SystemQuartzJobService {
    * @param page 分页参数
    * @return /
    */
-  public KitPageResult<SystemQuartzJobTb> searchQuartzJobByArgs(SystemQueryQuartzJobArgs args,
+  public KitPageResult<SystemQuartzJobTb> searchQuartzJobByArgs(SystemQueryQuartzJobArgs args, Page<SystemQuartzJobTb> page) {
-      Page<SystemQuartzJobTb> page) {
     LambdaQueryWrapper<SystemQuartzJobTb> wrapper = new LambdaQueryWrapper<>();
     this.injectQuartzJobQueryParams(args, wrapper);
     return KitPageUtil.toPage(systemQuartzJobMapper.selectPage(page, wrapper));
   }
 
-  private void injectQuartzJobQueryParams(SystemQueryQuartzJobArgs args,
+  private void injectQuartzJobQueryParams(SystemQueryQuartzJobArgs args, LambdaQueryWrapper<SystemQuartzJobTb> wrapper) {
-      LambdaQueryWrapper<SystemQuartzJobTb> wrapper) {
+    KitValidUtil.notNull(args);
-    if (args != null) {
+    wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzJobTb::getJobName, args.getJobName());
-      wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzJobTb::getJobName,
-          args.getJobName());
     if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemQuartzJobTb::getUpdateTime, args.getCreateTime().get(0),
+      wrapper.between(SystemQuartzJobTb::getUpdateTime, args.getCreateTime().get(0), args.getCreateTime().get(1));
-            args.getCreateTime().get(1));
-      }
     }
     wrapper.orderByDesc(SystemQuartzJobTb::getId);
   }
 
-  private void injectQuartzLogQueryParams(SystemQueryQuartzJobArgs args,
+  private void injectQuartzLogQueryParams(SystemQueryQuartzJobArgs args, LambdaQueryWrapper<SystemQuartzLogTb> wrapper) {
-      LambdaQueryWrapper<SystemQuartzLogTb> wrapper) {
+    KitValidUtil.notNull(args);
-    if (args != null) {
+    wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzLogTb::getJobName, args.getJobName());
-      wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzLogTb::getJobName,
-          args.getJobName());
     wrapper.eq(args.getIsSuccess() != null, SystemQuartzLogTb::getIsSuccess, args.getIsSuccess());
     if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemQuartzLogTb::getCreateTime, args.getCreateTime().get(0),
+      wrapper.between(SystemQuartzLogTb::getCreateTime, args.getCreateTime().get(0), args.getCreateTime().get(1));
-            args.getCreateTime().get(1));
-      }
     }
     wrapper.orderByDesc(SystemQuartzLogTb::getId);
   }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java

@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Dict;
@@ -34,6 +33,7 @@ import cn.odboy.system.dal.mysql.SystemRoleMapper;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
 import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -164,9 +164,9 @@ public class SystemRoleService {
    * @return /
    */
   public List<SystemRoleVo> queryRoleByArgs(SystemQueryRoleArgs args) {
+    KitValidUtil.notNull(args);
     // 查询角色基本信息
     LambdaQueryWrapper<SystemRoleTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
     wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
         c -> c.like(SystemRoleTb::getName, args.getBlurry()).or()
             .like(SystemRoleTb::getDescription, args.getBlurry()));
@@ -174,9 +174,8 @@ public class SystemRoleService {
       wrapper.between(SystemRoleTb::getCreateTime, args.getCreateTime().get(0),
           args.getCreateTime().get(1));
     }
-    }
     wrapper.orderByAsc(SystemRoleTb::getLevel);
-    if (args != null && args.getSize() != null) {
+    if (args.getSize() != null) {
       Page<SystemRoleTb> rolePage = new Page<>(args.getPage(), args.getSize());
       Page<SystemRoleTb> page = systemRoleMapper.selectPage(rolePage, wrapper);
       List<SystemRoleTb> roles = page.getRecords();
@@ -233,8 +232,8 @@ public class SystemRoleService {
   }
 
   public Long countRoleByArgs(SystemQueryRoleArgs args) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemRoleTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
     wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
         c -> c.like(SystemRoleTb::getName, args.getBlurry()).or()
             .like(SystemRoleTb::getDescription, args.getBlurry()));
@@ -242,7 +241,6 @@ public class SystemRoleService {
       wrapper.between(SystemRoleTb::getCreateTime, args.getCreateTime().get(0),
           args.getCreateTime().get(1));
     }
-    }
     return systemRoleMapper.selectCount(wrapper);
   }
 

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java

@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemDeptTb;

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java

@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
@@ -45,6 +44,7 @@ import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitFileUtil;
 import cn.odboy.util.KitPageUtil;
 import cn.odboy.util.KitRsaEncryptUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -401,8 +401,8 @@ public class SystemUserService {
    * @return /
    */
   private LambdaQueryWrapper<SystemUserTb> buildUserQueryWrapper(SystemQueryUserArgs args) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemUserTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
     if (args.getId() != null) {
       wrapper.eq(SystemUserTb::getId, args.getId());
     }
@@ -421,7 +421,6 @@ public class SystemUserService {
       wrapper.between(SystemUserTb::getCreateTime, args.getCreateTime().get(0),
           args.getCreateTime().get(1));
     }
-    }
     wrapper.orderByDesc(SystemUserTb::getCreateTime);
     return wrapper;
   }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java

@@ -33,6 +33,7 @@ import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitDateUtil;
 import cn.odboy.util.KitFileUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -68,33 +69,27 @@ public class SystemMinioStorageServiceImpl extends ServiceImpl<SystemOssStorageM
   private SystemOssStorageMapper systemOssStorageMapper;
 
   @Override
-  public KitPageResult<SystemOssStorageVo> searchOssStorage(SystemQueryStorageArgs args,
+  public KitPageResult<SystemOssStorageVo> searchOssStorage(SystemQueryStorageArgs args, Page<SystemOssStorageTb> page) {
-      Page<SystemOssStorageTb> page) {
+    IPage<SystemOssStorageVo> ossStorageTbs = this.selectOssStorageByArgs(args, page);
-    IPage<SystemOssStorageTb> ossStorageTbs = this.selectOssStorageByArgs(args, page);
+    for (SystemOssStorageVo storageVo : ossStorageTbs.getRecords()) {
-    IPage<SystemOssStorageVo> convert = ossStorageTbs.convert(c -> {
-      SystemOssStorageVo storageVo = KitBeanUtil.copyToClass(c, SystemOssStorageVo.class);
       storageVo.setFileSizeDesc(KitFileUtil.getSize(storageVo.getFileSize()));
-      return storageVo;
+    }
-    });
+    return KitPageUtil.toPage(ossStorageTbs);
-    return KitPageUtil.toPage(convert);
   }
 
-  private IPage<SystemOssStorageTb> selectOssStorageByArgs(SystemQueryStorageArgs args,
+  private IPage<SystemOssStorageVo> selectOssStorageByArgs(SystemQueryStorageArgs args, Page<SystemOssStorageTb> page) {
-      Page<SystemOssStorageTb> page) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemOssStorageTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
     wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
         c -> c.like(SystemOssStorageTb::getFileName, args.getBlurry()).or()
             .like(SystemOssStorageTb::getFilePrefix, args.getBlurry()).or()
             .like(SystemOssStorageTb::getFileMime, args.getBlurry()).or()
             .like(SystemOssStorageTb::getFileMd5, args.getBlurry()));
     if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemOssStorageTb::getUpdateTime, args.getCreateTime().get(0),
+      wrapper.between(SystemOssStorageTb::getUpdateTime, args.getCreateTime().get(0), args.getCreateTime().get(1));
-            args.getCreateTime().get(1));
-      }
     }
     wrapper.orderByAsc(SystemOssStorageTb::getId);
-    return systemOssStorageMapper.selectPage(page, wrapper);
+    return systemOssStorageMapper.selectPage(page, wrapper).convert(i -> KitBeanUtil.copyToClass(i, SystemOssStorageVo.class));
   }
 
   @Override

cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/core/TaskManage.java

@@ -15,7 +15,6 @@
  */
 package cn.odboy.task.core;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.framework.context.KitSpringBeanHolder;
 import cn.odboy.framework.exception.BadRequestException;

cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/core/TaskManage.java

@@ -15,7 +15,6 @@
  */
 package cn.odboy.task.core;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.framework.context.KitSpringBeanHolder;
 import cn.odboy.framework.exception.BadRequestException;