refactor(service): 重构查询参数命名和方法调用

README.MD

@@ -24,6 +24,7 @@
 - ~~常用的辅助类的类名, 以`Cs`开头~~
 - 常用的辅助类的类名, 以`Kit`开头。Kit有套件、装备等意思。
 - 枚举类名，以`Enum`结尾
+- 内部调用一律声明this
 - 拒绝过度包装
 - 命名规则(Mapper or Service)
     - 简单查询：get + 名词

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

@@ -48,11 +48,11 @@ public interface KitMpService<T> extends IService<T> {
 
   <G> List<G> queryFeatureClazzListByIds(List<Serializable> ids, Class<G> targetClazz);
 
-  <Q> List<T> queryClazzListByArgs(Q criteria);
+  <Q> List<T> queryClazzListByArgs(Q args);
 
   List<T> queryClazzListByArgs(LambdaQueryWrapper<T> wrapper);
 
-  <G, Q> List<G> queryFeatureClazzListByArgs(Q criteria, Class<G> targetClazz);
+  <G, Q> List<G> queryFeatureClazzListByArgs(Q args, Class<G> targetClazz);
 
   <G> List<G> queryFeatureClazzListByArgs(LambdaQueryWrapper<T> wrapper, Class<G> targetClazz);
 
@@ -61,9 +61,9 @@ public interface KitMpService<T> extends IService<T> {
   <G> KitPageResult<G> queryFeatureClazzPageByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable,
       Class<G> targetClazz);
 
-  <G, Q> KitPageResult<G> queryFeatureClazzPageByArgs(Q criteria, IPage<T> pageable, Class<G> targetClazz);
+  <G, Q> KitPageResult<G> queryFeatureClazzPageByArgs(Q args, IPage<T> pageable, Class<G> targetClazz);
 
-  <Q> KitPageResult<T> queryClazzPageByArgs(Q criteria, IPage<T> pageable);
+  <Q> KitPageResult<T> queryClazzPageByArgs(Q args, IPage<T> pageable);
 
   int modifyClazzByArgs(LambdaQueryWrapper<T> wrapper, T entity);
 

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

@@ -144,10 +144,10 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
   /**
    * 查有关的数据
    *
-   * @param criteria 动态条件
+   * @param args 动态条件
    */
-  public <Q> List<T> queryClazzListByArgs(Q criteria) {
-    QueryWrapper<T> predicate = KitMpQUtil.build(criteria);
+  public <Q> List<T> queryClazzListByArgs(Q args) {
+    QueryWrapper<T> predicate = KitMpQUtil.build(args);
     return baseMapper.selectList(predicate);
   }
 
@@ -166,11 +166,11 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
   /**
    * 查有关的数据并转成目标类型的数据
    *
-   * @param criteria    动态条件
+   * @param args        动态条件
    * @param targetClazz 目标类型
    */
-  public <G, Q> List<G> queryFeatureClazzListByArgs(Q criteria, Class<G> targetClazz) {
-    QueryWrapper<T> predicate = KitMpQUtil.build(criteria);
+  public <G, Q> List<G> queryFeatureClazzListByArgs(Q args, Class<G> targetClazz) {
+    QueryWrapper<T> predicate = KitMpQUtil.build(args);
     List<T> data = baseMapper.selectList(predicate);
     return BeanUtil.copyToList(data, targetClazz);
   }
@@ -219,15 +219,15 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
         originPageData.getTotal());
   }
 
-  public <G, Q> KitPageResult<G> queryFeatureClazzPageByArgs(Q criteria, IPage<T> pageable, Class<G> targetClazz) {
-    QueryWrapper<T> wrapper = KitMpQUtil.build(criteria);
+  public <G, Q> KitPageResult<G> queryFeatureClazzPageByArgs(Q args, IPage<T> pageable, Class<G> targetClazz) {
+    QueryWrapper<T> wrapper = KitMpQUtil.build(args);
     IPage<T> originPageData = baseMapper.selectPage(pageable, wrapper);
     return new KitPageResult<>(BeanUtil.copyToList(originPageData.getRecords(), targetClazz),
         originPageData.getTotal());
   }
 
-  public <Q> KitPageResult<T> queryClazzPageByArgs(Q criteria, IPage<T> pageable) {
-    QueryWrapper<T> wrapper = KitMpQUtil.build(criteria);
+  public <Q> KitPageResult<T> queryClazzPageByArgs(Q args, IPage<T> pageable) {
+    QueryWrapper<T> wrapper = KitMpQUtil.build(args);
     IPage<T> originPageData = baseMapper.selectPage(pageable, wrapper);
     return new KitPageResult<>(originPageData.getRecords(), originPageData.getTotal());
   }

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

@@ -49,17 +49,17 @@ public class SystemDeptController {
   @ApiOperation("导出部门数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('dept:list')")
-  public void exportDept(HttpServletResponse response, SystemQueryDeptArgs criteria) throws Exception {
-    systemDeptService.exportDeptExcel(systemDeptService.queryAllDeptByArgs(criteria, false), response);
+  public void exportDept(HttpServletResponse response, SystemQueryDeptArgs args) throws Exception {
+    systemDeptService.exportDeptExcel(systemDeptService.queryAllDeptByArgs(args, false), response);
   }
 
   @ApiOperation("查询部门")
   @PostMapping
   @PreAuthorize("@el.check('user:list','dept:list')")
   public ResponseEntity<KitPageResult<SystemDeptTb>> queryDept(
-      @Validated @RequestBody KitPageArgs<SystemQueryDeptArgs> args) throws Exception {
-    SystemQueryDeptArgs criteria = args.getArgs();
-    List<SystemDeptTb> depts = systemDeptService.queryAllDeptByArgs(criteria, true);
+      @Validated @RequestBody KitPageArgs<SystemQueryDeptArgs> pageArgs) throws Exception {
+    SystemQueryDeptArgs args = pageArgs.getArgs();
+    List<SystemDeptTb> depts = systemDeptService.queryAllDeptByArgs(args, true);
     return ResponseEntity.ok(KitPageUtil.toPage(depts));
   }
 

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

@@ -49,8 +49,8 @@ public class SystemDictController {
   @ApiOperation("导出字典数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('dict:list')")
-  public void exportDict(HttpServletResponse response, SystemQueryDictArgs criteria) throws IOException {
-    systemDictService.exportDictExcel(systemDictService.queryDictByArgs(criteria), response);
+  public void exportDict(HttpServletResponse response, SystemQueryDictArgs args) throws IOException {
+    systemDictService.exportDictExcel(systemDictService.queryDictByArgs(args), response);
   }
 
   @ApiOperation("查询字典")
@@ -64,15 +64,10 @@ public class SystemDictController {
   @PostMapping
   @PreAuthorize("@el.check('dict:list')")
   public ResponseEntity<KitPageResult<SystemDictTb>> queryDictByArgs(
-      @Validated @RequestBody KitPageArgs<SystemQueryDictArgs> args) {
-    Page<SystemDictTb> page;
-    SystemQueryDictArgs criteria = args.getArgs();
-    if (args.getSize() != null) {
-      page = new Page<>(args.getPage(), args.getSize());
-    } else {
-      page = new Page<>(criteria.getPage(), criteria.getSize());
-    }
-    return ResponseEntity.ok(systemDictService.searchDict(criteria, page));
+      @Validated @RequestBody KitPageArgs<SystemQueryDictArgs> pageArgs) {
+    Page<SystemDictTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
+    SystemQueryDictArgs args = pageArgs.getArgs();
+    return ResponseEntity.ok(systemDictService.searchDict(args, page));
   }
 
   @ApiOperation("新增字典")

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

@@ -57,10 +57,10 @@ public class SystemDictDetailController {
   @ApiOperation("查询字典详情")
   @PostMapping(value = "/queryDictDetailByArgs")
   public ResponseEntity<KitPageResult<SystemDictDetailVo>> queryDictDetailByArgs(
-      @Validated @RequestBody KitPageArgs<SystemQueryDictDetailArgs> args) {
-    SystemQueryDictDetailArgs criteria = args.getArgs();
-    Page<SystemDictDetailTb> page = new Page<>(args.getPage(), args.getSize());
-    return ResponseEntity.ok(systemDictDetailService.searchDictDetail(criteria, page));
+      @Validated @RequestBody KitPageArgs<SystemQueryDictDetailArgs> pageArgs) {
+    SystemQueryDictDetailArgs args = pageArgs.getArgs();
+    Page<SystemDictDetailTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
+    return ResponseEntity.ok(systemDictDetailService.searchDictDetail(args, page));
   }
 
   @ApiOperation("查询多个字典详情")

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

@@ -48,18 +48,18 @@ public class SystemJobController {
   @ApiOperation("导出岗位数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('job:list')")
-  public void exportJob(HttpServletResponse response, SystemQueryJobArgs criteria) throws IOException {
-    systemJobService.exportJobExcel(systemJobService.queryJobByArgs(criteria), response);
+  public void exportJob(HttpServletResponse response, SystemQueryJobArgs args) throws IOException {
+    systemJobService.exportJobExcel(systemJobService.queryJobByArgs(args), response);
   }
 
   @ApiOperation("查询岗位")
   @PostMapping(value = "/queryAllEnableJob")
   @PreAuthorize("@el.check('job:list','user:list')")
   public ResponseEntity<KitPageResult<SystemJobTb>> queryJobByArgs(
-      @Validated @RequestBody KitPageArgs<SystemQueryJobArgs> args) {
-    SystemQueryJobArgs criteria = args.getArgs();
-    Page<SystemJobTb> page = new Page<>(criteria.getPage(), criteria.getSize());
-    return ResponseEntity.ok(systemJobService.queryJobByArgs(criteria, page));
+      @Validated @RequestBody KitPageArgs<SystemQueryJobArgs> pageArgs) {
+    SystemQueryJobArgs args = pageArgs.getArgs();
+    Page<SystemJobTb> page = new Page<>(args.getPage(), args.getSize());
+    return ResponseEntity.ok(systemJobService.searchJobByArgs(args, page));
   }
 
   @ApiOperation("查询岗位")
@@ -92,7 +92,7 @@ public class SystemJobController {
   public ResponseEntity<Void> removeJobByIds(@RequestBody Set<Long> ids) {
     // 验证是否被用户关联
     systemJobService.verifyBindRelationByIds(ids);
-    systemJobService.removeJobByIds(ids);
+    systemJobService.deleteJobByIds(ids);
     return ResponseEntity.ok(null);
   }
 }

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

@@ -52,17 +52,17 @@ public class SystemLocalStorageController {
   @PostMapping
   @PreAuthorize("@el.check('storage:list')")
   public ResponseEntity<KitPageResult<SystemLocalStorageTb>> queryLocalStorage(
-      @Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> args) {
-    SystemQueryStorageArgs criteria = args.getArgs();
-    Page<SystemLocalStorageTb> page = new Page<>(criteria.getPage(), criteria.getSize());
-    return ResponseEntity.ok(localStorageService.queryLocalStorage(criteria, page));
+      @Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> pageArgs) {
+    SystemQueryStorageArgs args = pageArgs.getArgs();
+    Page<SystemLocalStorageTb> page = new Page<>(args.getPage(), args.getSize());
+    return ResponseEntity.ok(localStorageService.queryLocalStorage(args, page));
   }
 
   @ApiOperation("导出数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('storage:list')")
-  public void exportFile(HttpServletResponse response, SystemQueryStorageArgs criteria) throws IOException {
-    localStorageService.exportLocalStorageExcel(localStorageService.queryLocalStorage(criteria), response);
+  public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException {
+    localStorageService.exportLocalStorageExcel(localStorageService.queryLocalStorage(args), response);
   }
 
   @ApiOperation("上传文件")

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

@@ -59,8 +59,8 @@ public class SystemMenuController {
   @ApiOperation("导出菜单数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('menu:list')")
-  public void exportMenu(HttpServletResponse response, SystemQueryMenuArgs criteria) throws Exception {
-    systemMenuService.exportMenuExcel(systemMenuService.queryAllMenu(criteria, false), response);
+  public void exportMenu(HttpServletResponse response, SystemQueryMenuArgs args) throws Exception {
+    systemMenuService.exportMenuExcel(systemMenuService.queryAllMenu(args, false), response);
   }
 
   @PostMapping(value = "/buildMenus")
@@ -102,9 +102,9 @@ public class SystemMenuController {
   @ApiOperation("查询菜单")
   @PreAuthorize("@el.check('menu:list')")
   public ResponseEntity<KitPageResult<SystemMenuTb>> queryAllMenu(
-      @Validated @RequestBody KitPageArgs<SystemQueryMenuArgs> args) throws Exception {
-    SystemQueryMenuArgs criteria = args.getArgs();
-    List<SystemMenuTb> menuList = systemMenuService.queryAllMenu(criteria, true);
+      @Validated @RequestBody KitPageArgs<SystemQueryMenuArgs> pageArgs) throws Exception {
+    SystemQueryMenuArgs args = pageArgs.getArgs();
+    List<SystemMenuTb> menuList = systemMenuService.queryAllMenu(args, true);
     return ResponseEntity.ok(KitPageUtil.toPage(menuList));
   }
 

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

@@ -52,17 +52,17 @@ public class SystemOssStorageController {
   @PostMapping
   @PreAuthorize("@el.check('storage:list')")
   public ResponseEntity<KitPageResult<SystemOssStorageVo>> queryOssStorage(
-      @Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> args) {
-    SystemQueryStorageArgs criteria = args.getArgs();
-    Page<SystemOssStorageTb> page = new Page<>(criteria.getPage(), criteria.getSize());
-    return ResponseEntity.ok(systemOssStorageService.queryOssStorage(criteria, page));
+      @Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> pageArgs) {
+    SystemQueryStorageArgs args = pageArgs.getArgs();
+    Page<SystemOssStorageTb> page = new Page<>(args.getPage(), args.getSize());
+    return ResponseEntity.ok(systemOssStorageService.queryOssStorage(args, page));
   }
 
   @ApiOperation("导出数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('storage:list')")
-  public void exportFile(HttpServletResponse response, SystemQueryStorageArgs criteria) throws IOException {
-    systemOssStorageService.exportOssStorageExcel(systemOssStorageService.queryOssStorage(criteria), response);
+  public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException {
+    systemOssStorageService.exportOssStorageExcel(systemOssStorageService.queryOssStorage(args), response);
   }
 
   @ApiOperation("上传文件")

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

@@ -56,24 +56,24 @@ public class SystemQuartzJobController {
   @PostMapping
   @PreAuthorize("@el.check('quartzJob:list')")
   public ResponseEntity<KitPageResult<SystemQuartzJobTb>> queryQuartzJobByCrud(
-      @Validated @RequestBody KitPageArgs<SystemQueryQuartzJobArgs> args) {
-    SystemQueryQuartzJobArgs criteria = args.getArgs();
-    Page<SystemQuartzJobTb> page = new Page<>(criteria.getPage(), criteria.getSize());
-    return ResponseEntity.ok(systemQuartzJobService.queryQuartzJobByArgs(criteria, page));
+      @Validated @RequestBody KitPageArgs<SystemQueryQuartzJobArgs> pageArgs) {
+    SystemQueryQuartzJobArgs args = pageArgs.getArgs();
+    Page<SystemQuartzJobTb> page = new Page<>(args.getPage(), args.getSize());
+    return ResponseEntity.ok(systemQuartzJobService.queryQuartzJobByArgs(args, page));
   }
 
   @ApiOperation("导出任务数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('quartzJob:list')")
-  public void exportQuartzJob(HttpServletResponse response, SystemQueryQuartzJobArgs criteria) throws IOException {
-    systemQuartzJobService.exportQuartzJobExcel(systemQuartzJobService.queryQuartzJobByArgs(criteria), response);
+  public void exportQuartzJob(HttpServletResponse response, SystemQueryQuartzJobArgs args) throws IOException {
+    systemQuartzJobService.exportQuartzJobExcel(systemQuartzJobService.queryQuartzJobByArgs(args), response);
   }
 
   @ApiOperation("导出日志数据")
   @GetMapping(value = "/logs/download")
   @PreAuthorize("@el.check('quartzJob:list')")
-  public void exportQuartzJobLog(HttpServletResponse response, SystemQueryQuartzJobArgs criteria) throws IOException {
-    systemQuartzJobService.exportQuartzLogExcel(systemQuartzJobService.queryQuartzLogByArgs(criteria), response);
+  public void exportQuartzJobLog(HttpServletResponse response, SystemQueryQuartzJobArgs args) throws IOException {
+    systemQuartzJobService.exportQuartzLogExcel(systemQuartzJobService.queryQuartzLogByArgs(args), response);
   }
 
   @ApiOperation("查询任务执行日志")

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

@@ -62,8 +62,8 @@ public class SystemRoleController {
   @ApiOperation("导出角色数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('role:list')")
-  public void exportRole(HttpServletResponse response, SystemQueryRoleArgs criteria) throws IOException {
-    systemRoleService.exportRoleExcel(systemRoleService.queryRoleByArgs(criteria), response);
+  public void exportRole(HttpServletResponse response, SystemQueryRoleArgs args) throws IOException {
+    systemRoleService.exportRoleExcel(systemRoleService.queryRoleByArgs(args), response);
   }
 
   @ApiOperation("返回全部的角色")
@@ -77,10 +77,10 @@ public class SystemRoleController {
   @PostMapping
   @PreAuthorize("@el.check('roles:list')")
   public ResponseEntity<KitPageResult<SystemRoleVo>> queryRoleByArgs(
-      @Validated @RequestBody KitPageArgs<SystemQueryRoleArgs> args) {
-    SystemQueryRoleArgs criteria = args.getArgs();
-    Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
-    return ResponseEntity.ok(systemRoleService.queryRoleByArgs(criteria, page));
+      @Validated @RequestBody KitPageArgs<SystemQueryRoleArgs> pageArgs) {
+    SystemQueryRoleArgs args = pageArgs.getArgs();
+    Page<Object> page = new Page<>(args.getPage(), args.getSize());
+    return ResponseEntity.ok(systemRoleService.queryRoleByArgs(args, page));
   }
 
   @ApiOperation("获取用户级别")

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

@@ -84,38 +84,38 @@ public class SystemUserController {
   @ApiOperation("导出用户数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('user:list')")
-  public void exportUserExcel(HttpServletResponse response, SystemQueryUserArgs criteria) throws IOException {
-    systemUserService.exportUserExcel(systemUserService.queryUserByArgs(criteria), response);
+  public void exportUserExcel(HttpServletResponse response, SystemQueryUserArgs args) throws IOException {
+    systemUserService.exportUserExcel(systemUserService.queryUserByArgs(args), response);
   }
 
   @ApiOperation("查询用户")
   @PostMapping
   @PreAuthorize("@el.check('user:list')")
   public ResponseEntity<KitPageResult<SystemUserVo>> queryUserByArgs(
-      @Validated @RequestBody KitPageArgs<SystemQueryUserArgs> args) {
-    Page<SystemUserTb> page = new Page<>(args.getPage(), args.getSize());
-    SystemQueryUserArgs criteria = args.getArgs();
-    if (!ObjectUtils.isEmpty(criteria.getDeptId())) {
-      criteria.getDeptIds().add(criteria.getDeptId());
+      @Validated @RequestBody KitPageArgs<SystemQueryUserArgs> pageArgs) {
+    Page<SystemUserTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
+    SystemQueryUserArgs args = pageArgs.getArgs();
+    if (!ObjectUtils.isEmpty(args.getDeptId())) {
+      args.getDeptIds().add(args.getDeptId());
       // 先查找是否存在子节点
-      List<SystemDeptTb> data = systemDeptService.listDeptByPid(criteria.getDeptId());
+      List<SystemDeptTb> data = systemDeptService.listDeptByPid(args.getDeptId());
       // 然后把子节点的ID都加入到集合中
-      criteria.getDeptIds().addAll(systemDeptService.queryChildDeptIdByDeptIds(data));
+      args.getDeptIds().addAll(systemDeptService.queryChildDeptIdByDeptIds(data));
     }
     // 数据权限
     List<Long> dataScopes = systemDataService.queryDeptIdByArgs(
         systemUserService.getUserByUsername(KitSecurityHelper.getCurrentUsername()));
-    // criteria.getDeptIds() 不为空并且数据权限不为空则取交集
-    if (!CollectionUtils.isEmpty(criteria.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)) {
+    // args.getDeptIds() 不为空并且数据权限不为空则取交集
+    if (!CollectionUtils.isEmpty(args.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)) {
       // 取交集
-      criteria.getDeptIds().retainAll(dataScopes);
-      if (!CollectionUtil.isEmpty(criteria.getDeptIds())) {
-        return ResponseEntity.ok(systemUserService.queryUserByArgs(criteria, page));
+      args.getDeptIds().retainAll(dataScopes);
+      if (!CollectionUtil.isEmpty(args.getDeptIds())) {
+        return ResponseEntity.ok(systemUserService.queryUserByArgs(args, page));
       }
     } else {
       // 否则取并集
-      criteria.getDeptIds().addAll(dataScopes);
-      return ResponseEntity.ok(systemUserService.queryUserByArgs(criteria, page));
+      args.getDeptIds().addAll(dataScopes);
+      return ResponseEntity.ok(systemUserService.queryUserByArgs(args, page));
     }
     return ResponseEntity.ok(KitPageUtil.emptyData());
   }

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

@@ -159,17 +159,17 @@ public class SystemDeptService {
     return deptList;
   }
 
-  private List<SystemDeptTb> queryDeptByArgs(SystemQueryDeptArgs criteria) {
+  private List<SystemDeptTb> queryDeptByArgs(SystemQueryDeptArgs args) {
     LambdaQueryWrapper<SystemDeptTb> wrapper = new LambdaQueryWrapper<>();
-    if (criteria != null) {
-      wrapper.in(CollUtil.isNotEmpty(criteria.getIds()), SystemDeptTb::getId, criteria.getIds());
-      wrapper.like(StrUtil.isNotBlank(criteria.getName()), SystemDeptTb::getName, criteria.getName());
-      wrapper.eq(criteria.getEnabled() != null, SystemDeptTb::getEnabled, criteria.getEnabled());
-      wrapper.eq(criteria.getPid() != null, SystemDeptTb::getPid, criteria.getPid());
-      wrapper.isNull(criteria.getPidIsNull() != null, SystemDeptTb::getPid);
-      if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) {
-        wrapper.between(SystemDeptTb::getCreateTime, criteria.getCreateTime().get(0),
-            criteria.getCreateTime().get(1));
+    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());
+      wrapper.eq(args.getPid() != null, SystemDeptTb::getPid, args.getPid());
+      wrapper.isNull(args.getPidIsNull() != null, SystemDeptTb::getPid);
+      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+        wrapper.between(SystemDeptTb::getCreateTime, args.getCreateTime().get(0),
+            args.getCreateTime().get(1));
       }
     }
     wrapper.orderByAsc(SystemDeptTb::getDeptSort);
@@ -179,18 +179,18 @@ public class SystemDeptService {
   /**
    * 查询所有数据
    *
-   * @param criteria 条件
-   * @param isQuery  /
+   * @param args    条件
+   * @param isQuery /
    * @return /
    * @throws Exception /
    */
-  public List<SystemDeptTb> queryAllDeptByArgs(SystemQueryDeptArgs criteria, Boolean isQuery) throws Exception {
+  public List<SystemDeptTb> queryAllDeptByArgs(SystemQueryDeptArgs args, Boolean isQuery) throws Exception {
     String dataScopeType = KitSecurityHelper.getDataScopeType();
     if (isQuery) {
       if (dataScopeType.equals(SystemDataScopeEnum.ALL.getValue())) {
-        criteria.setPidIsNull(true);
+        args.setPidIsNull(true);
       }
-      List<Field> fields = KitClassUtil.getAllFields(criteria.getClass(), new ArrayList<>());
+      List<Field> fields = KitClassUtil.getAllFields(args.getClass(), new ArrayList<>());
       List<String> fieldNames = new ArrayList<>() {{
         add("pidIsNull");
         add("enabled");
@@ -198,19 +198,19 @@ public class SystemDeptService {
       for (Field field : fields) {
         // 设置对象的访问权限, 保证对private的属性的访问
         field.setAccessible(true);
-        Object val = field.get(criteria);
+        Object val = field.get(args);
         if (fieldNames.contains(field.getName())) {
           continue;
         }
         if (ObjectUtil.isNotNull(val)) {
-          criteria.setPidIsNull(null);
+          args.setPidIsNull(null);
           break;
         }
       }
     }
     // 数据权限
-    criteria.setIds(KitSecurityHelper.getCurrentUserDataScope());
-    List<SystemDeptTb> list = this.queryDeptByArgs(criteria);
+    args.setIds(KitSecurityHelper.getCurrentUserDataScope());
+    List<SystemDeptTb> list = this.queryDeptByArgs(args);
     // 如果为空, 就代表为自定义权限或者本级权限, 就需要去重, 不理解可以注释掉，看查询结果
     if (StrUtil.isBlank(dataScopeType)) {
       return this.deduplication(list);

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

@@ -24,11 +24,9 @@ import cn.odboy.system.dal.dataobject.SystemJobTb;
 import cn.odboy.system.dal.model.SystemCreateJobArgs;
 import cn.odboy.system.dal.model.SystemQueryJobArgs;
 import cn.odboy.system.dal.mysql.SystemJobMapper;
-import cn.odboy.system.dal.mysql.SystemUserMapper;
 import cn.odboy.util.KitFileUtil;
 import cn.odboy.util.KitPageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -85,7 +83,7 @@ public class SystemJobService {
    * @param ids /
    */
   @Transactional(rollbackFor = Exception.class)
-  public void removeJobByIds(Set<Long> ids) {
+  public void deleteJobByIds(Set<Long> ids) {
     systemJobMapper.deleteByIds(ids);
   }
 
@@ -94,7 +92,6 @@ public class SystemJobService {
    *
    * @param jobs     待导出的数据
    * @param response /
-   * @throws IOException
    */
   public void exportJobExcel(List<SystemJobTb> jobs, HttpServletResponse response) throws IOException {
     List<Map<String, Object>> list = new ArrayList<>();
@@ -113,20 +110,21 @@ public class SystemJobService {
    *
    * @param args 条件
    * @param page 分页参数
-   * @return
    */
-  public KitPageResult<SystemJobTb> queryJobByArgs(SystemQueryJobArgs args, Page<SystemJobTb> page) {
-    return KitPageUtil.toPage(this.selectJobByArgs(args, page));
+  public KitPageResult<SystemJobTb> searchJobByArgs(SystemQueryJobArgs args, Page<SystemJobTb> page) {
+    LambdaQueryWrapper<SystemJobTb> wrapper = new LambdaQueryWrapper<>();
+    this.injectQueryParams(args, wrapper);
+    Page<SystemJobTb> selectPage = systemJobMapper.selectPage(page, wrapper);
+    return KitPageUtil.toPage(selectPage);
   }
 
   /**
    * 查询全部数据
-   *
-   * @param args /
-   * @return /
    */
   public List<SystemJobTb> queryJobByArgs(SystemQueryJobArgs args) {
-    return this.selectJobByArgs(args);
+    LambdaQueryWrapper<SystemJobTb> wrapper = new LambdaQueryWrapper<>();
+    this.injectQueryParams(args, wrapper);
+    return systemJobMapper.selectList(wrapper);
   }
 
   /**
@@ -140,34 +138,21 @@ public class SystemJobService {
     }
   }
 
-
   public SystemJobTb getJobByName(String name) {
     LambdaQueryWrapper<SystemJobTb> wrapper = new LambdaQueryWrapper<>();
     wrapper.eq(SystemJobTb::getName, name);
     return systemJobMapper.selectOne(wrapper);
   }
 
-  public void injectQueryParams(SystemQueryJobArgs criteria, LambdaQueryWrapper<SystemJobTb> wrapper) {
-    if (criteria != null) {
-      wrapper.like(StrUtil.isNotBlank(criteria.getName()), SystemJobTb::getName, criteria.getName());
-      wrapper.eq(criteria.getEnabled() != null, SystemJobTb::getEnabled, criteria.getEnabled());
-      if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) {
-        wrapper.between(SystemJobTb::getCreateTime, criteria.getCreateTime().get(0),
-            criteria.getCreateTime().get(1));
+  public void injectQueryParams(SystemQueryJobArgs args, LambdaQueryWrapper<SystemJobTb> wrapper) {
+    if (args != null) {
+      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);
   }
-
-  public IPage<SystemJobTb> selectJobByArgs(SystemQueryJobArgs criteria, Page<SystemJobTb> page) {
-    LambdaQueryWrapper<SystemJobTb> wrapper = new LambdaQueryWrapper<>();
-    this.injectQueryParams(criteria, wrapper);
-    return systemJobMapper.selectPage(page, wrapper);
-  }
-
-  public List<SystemJobTb> selectJobByArgs(SystemQueryJobArgs criteria) {
-    LambdaQueryWrapper<SystemJobTb> wrapper = new LambdaQueryWrapper<>();
-    this.injectQueryParams(criteria, wrapper);
-    return systemJobMapper.selectList(wrapper);
-  }
 }

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

@@ -149,50 +149,50 @@ public class SystemLocalStorageService {
   /**
    * 分页查询
    *
-   * @param criteria 条件
-   * @param page     分页参数
+   * @param args 条件
+   * @param page 分页参数
    * @return /
    */
-  public KitPageResult<SystemLocalStorageTb> queryLocalStorage(SystemQueryStorageArgs criteria,
+  public KitPageResult<SystemLocalStorageTb> queryLocalStorage(SystemQueryStorageArgs args,
       Page<SystemLocalStorageTb> page) {
-    return KitPageUtil.toPage(this.selectLocalStorageByArgs(criteria, page));
+    return KitPageUtil.toPage(this.selectLocalStorageByArgs(args, page));
   }
 
   /**
    * 查询全部数据
    *
-   * @param criteria 条件
+   * @param args 条件
    * @return /
    */
-  public List<SystemLocalStorageTb> queryLocalStorage(SystemQueryStorageArgs criteria) {
-    return this.selectLocalStorageByArgs(criteria);
+  public List<SystemLocalStorageTb> queryLocalStorage(SystemQueryStorageArgs args) {
+    return this.selectLocalStorageByArgs(args);
   }
 
-  public void injectQueryParams(SystemQueryStorageArgs criteria, LambdaQueryWrapper<SystemLocalStorageTb> wrapper) {
-    if (criteria != null) {
-      wrapper.and(StrUtil.isNotBlank(criteria.getBlurry()),
-          c -> c.like(SystemLocalStorageTb::getName, criteria.getBlurry()).or()
-              .like(SystemLocalStorageTb::getSuffix, criteria.getBlurry()).or()
-              .like(SystemLocalStorageTb::getType, criteria.getBlurry()).or()
-              .like(SystemLocalStorageTb::getCreateBy, criteria.getBlurry()));
-      if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) {
-        wrapper.between(SystemLocalStorageTb::getUpdateTime, criteria.getCreateTime().get(0),
-            criteria.getCreateTime().get(1));
+  public void injectQueryParams(SystemQueryStorageArgs args, LambdaQueryWrapper<SystemLocalStorageTb> wrapper) {
+    if (args != null) {
+      wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
+          c -> c.like(SystemLocalStorageTb::getName, args.getBlurry()).or()
+              .like(SystemLocalStorageTb::getSuffix, args.getBlurry()).or()
+              .like(SystemLocalStorageTb::getType, args.getBlurry()).or()
+              .like(SystemLocalStorageTb::getCreateBy, args.getBlurry()));
+      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+        wrapper.between(SystemLocalStorageTb::getUpdateTime, args.getCreateTime().get(0),
+            args.getCreateTime().get(1));
       }
     }
     wrapper.orderByDesc(SystemLocalStorageTb::getId);
   }
 
-  public List<SystemLocalStorageTb> selectLocalStorageByArgs(SystemQueryStorageArgs criteria) {
+  public List<SystemLocalStorageTb> selectLocalStorageByArgs(SystemQueryStorageArgs args) {
     LambdaQueryWrapper<SystemLocalStorageTb> wrapper = new LambdaQueryWrapper<>();
-    this.injectQueryParams(criteria, wrapper);
+    this.injectQueryParams(args, wrapper);
     return systemLocalStorageMapper.selectList(wrapper);
   }
 
-  public IPage<SystemLocalStorageTb> selectLocalStorageByArgs(SystemQueryStorageArgs criteria,
+  public IPage<SystemLocalStorageTb> selectLocalStorageByArgs(SystemQueryStorageArgs args,
       Page<SystemLocalStorageTb> page) {
     LambdaQueryWrapper<SystemLocalStorageTb> wrapper = new LambdaQueryWrapper<>();
-    this.injectQueryParams(criteria, wrapper);
+    this.injectQueryParams(args, wrapper);
     return systemLocalStorageMapper.selectPage(page, wrapper);
   }
 }

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

@@ -218,30 +218,30 @@ public class SystemMenuService {
   /**
    * 查询全部数据
    *
-   * @param criteria 条件
-   * @param isQuery  /
+   * @param args    条件
+   * @param isQuery /
    * @return /
    * @throws Exception /
    */
-  public List<SystemMenuTb> queryAllMenu(SystemQueryMenuArgs criteria, Boolean isQuery) throws Exception {
+  public List<SystemMenuTb> queryAllMenu(SystemQueryMenuArgs args, Boolean isQuery) throws Exception {
     if (Boolean.TRUE.equals(isQuery)) {
-      criteria.setPidIsNull(true);
-      List<Field> fields = KitClassUtil.getAllFields(criteria.getClass(), new ArrayList<>());
+      args.setPidIsNull(true);
+      List<Field> fields = KitClassUtil.getAllFields(args.getClass(), new ArrayList<>());
       for (Field field : fields) {
         //设置对象的访问权限, 保证对private的属性的访问
         field.setAccessible(true);
-        Object val = field.get(criteria);
+        Object val = field.get(args);
         if ("pidIsNull".equals(field.getName())) {
           continue;
         }
         // 如果有查询条件, 则不指定pidIsNull
         if (ObjectUtil.isNotNull(val)) {
-          criteria.setPidIsNull(null);
+          args.setPidIsNull(null);
           break;
         }
       }
     }
-    return this.queryMenuByArgs(criteria);
+    return this.queryMenuByArgs(args);
   }
 
   /**
@@ -427,18 +427,18 @@ public class SystemMenuService {
     return systemMenuMapper.selectCount(wrapper);
   }
 
-  private List<SystemMenuTb> queryMenuByArgs(SystemQueryMenuArgs criteria) {
+  private List<SystemMenuTb> queryMenuByArgs(SystemQueryMenuArgs args) {
     LambdaQueryWrapper<SystemMenuTb> wrapper = new LambdaQueryWrapper<>();
-    if (criteria != null) {
-      wrapper.isNull(criteria.getPidIsNull() != null, SystemMenuTb::getPid);
-      wrapper.eq(criteria.getPid() != null, SystemMenuTb::getPid, criteria.getPid());
-      wrapper.and(StrUtil.isNotBlank(criteria.getBlurry()),
-          c -> c.like(SystemMenuTb::getTitle, criteria.getBlurry()).or()
-              .like(SystemMenuTb::getComponentName, criteria.getBlurry()).or()
-              .like(SystemMenuTb::getPermission, criteria.getBlurry()));
-      if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) {
-        wrapper.between(SystemMenuTb::getCreateTime, criteria.getCreateTime().get(0),
-            criteria.getCreateTime().get(1));
+    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()),
+          c -> c.like(SystemMenuTb::getTitle, args.getBlurry()).or()
+              .like(SystemMenuTb::getComponentName, args.getBlurry()).or()
+              .like(SystemMenuTb::getPermission, args.getBlurry()));
+      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+        wrapper.between(SystemMenuTb::getCreateTime, args.getCreateTime().get(0),
+            args.getCreateTime().get(1));
       }
     }
     wrapper.orderByAsc(SystemMenuTb::getMenuSort);

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

@@ -36,9 +36,9 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public interface SystemOssStorageService extends IService<SystemOssStorageTb> {
 
-  KitPageResult<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs criteria, Page<SystemOssStorageTb> page);
+  KitPageResult<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs args, Page<SystemOssStorageTb> page);
 
-  List<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs criteria);
+  List<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs args);
 
   void exportOssStorageExcel(List<SystemOssStorageVo> list, HttpServletResponse response) throws IOException;
 

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

@@ -225,39 +225,39 @@ public class SystemQuartzJobService {
   /**
    * 分页查询
    *
-   * @param criteria 条件
-   * @param page     分页参数
+   * @param args 条件
+   * @param page 分页参数
    * @return /
    */
-  public KitPageResult<SystemQuartzJobTb> queryQuartzJobByArgs(SystemQueryQuartzJobArgs criteria,
+  public KitPageResult<SystemQuartzJobTb> queryQuartzJobByArgs(SystemQueryQuartzJobArgs args,
       Page<SystemQuartzJobTb> page) {
     LambdaQueryWrapper<SystemQuartzJobTb> wrapper = new LambdaQueryWrapper<>();
-    this.injectQuartzJobQueryParams(criteria, wrapper);
+    this.injectQuartzJobQueryParams(args, wrapper);
     return KitPageUtil.toPage(systemQuartzJobMapper.selectPage(page, wrapper));
   }
 
-  private void injectQuartzJobQueryParams(SystemQueryQuartzJobArgs criteria,
+  private void injectQuartzJobQueryParams(SystemQueryQuartzJobArgs args,
       LambdaQueryWrapper<SystemQuartzJobTb> wrapper) {
-    if (criteria != null) {
-      wrapper.like(StrUtil.isNotBlank(criteria.getJobName()), SystemQuartzJobTb::getJobName,
-          criteria.getJobName());
-      if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) {
-        wrapper.between(SystemQuartzJobTb::getUpdateTime, criteria.getCreateTime().get(0),
-            criteria.getCreateTime().get(1));
+    if (args != null) {
+      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),
+            args.getCreateTime().get(1));
       }
     }
     wrapper.orderByDesc(SystemQuartzJobTb::getId);
   }
 
-  private void injectQuartzLogQueryParams(SystemQueryQuartzJobArgs criteria,
+  private void injectQuartzLogQueryParams(SystemQueryQuartzJobArgs args,
       LambdaQueryWrapper<SystemQuartzLogTb> wrapper) {
-    if (criteria != null) {
-      wrapper.like(StrUtil.isNotBlank(criteria.getJobName()), SystemQuartzLogTb::getJobName,
-          criteria.getJobName());
-      wrapper.eq(criteria.getIsSuccess() != null, SystemQuartzLogTb::getIsSuccess, criteria.getIsSuccess());
-      if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) {
-        wrapper.between(SystemQuartzLogTb::getCreateTime, criteria.getCreateTime().get(0),
-            criteria.getCreateTime().get(1));
+    if (args != null) {
+      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),
+            args.getCreateTime().get(1));
       }
     }
     wrapper.orderByDesc(SystemQuartzLogTb::getId);
@@ -266,38 +266,38 @@ public class SystemQuartzJobService {
   /**
    * 分页查询日志
    *
-   * @param criteria 条件
-   * @param page     分页参数
+   * @param args 条件
+   * @param page 分页参数
    * @return /
    */
-  public KitPageResult<SystemQuartzLogTb> queryQuartzLogByArgs(SystemQueryQuartzJobArgs criteria,
+  public KitPageResult<SystemQuartzLogTb> queryQuartzLogByArgs(SystemQueryQuartzJobArgs args,
       Page<SystemQuartzLogTb> page) {
     LambdaQueryWrapper<SystemQuartzLogTb> wrapper = new LambdaQueryWrapper<>();
-    this.injectQuartzLogQueryParams(criteria, wrapper);
+    this.injectQuartzLogQueryParams(args, wrapper);
     return KitPageUtil.toPage(systemQuartzLogMapper.selectPage(page, wrapper));
   }
 
   /**
    * 查询全部
    *
-   * @param criteria 条件
+   * @param args 条件
    * @return /
    */
-  public List<SystemQuartzJobTb> queryQuartzJobByArgs(SystemQueryQuartzJobArgs criteria) {
+  public List<SystemQuartzJobTb> queryQuartzJobByArgs(SystemQueryQuartzJobArgs args) {
     LambdaQueryWrapper<SystemQuartzJobTb> wrapper = new LambdaQueryWrapper<>();
-    this.injectQuartzJobQueryParams(criteria, wrapper);
+    this.injectQuartzJobQueryParams(args, wrapper);
     return systemQuartzJobMapper.selectList(wrapper);
   }
 
   /**
    * 查询全部
    *
-   * @param criteria 条件
+   * @param args 条件
    * @return /
    */
-  public List<SystemQuartzLogTb> queryQuartzLogByArgs(SystemQueryQuartzJobArgs criteria) {
+  public List<SystemQuartzLogTb> queryQuartzLogByArgs(SystemQueryQuartzJobArgs args) {
     LambdaQueryWrapper<SystemQuartzLogTb> wrapper = new LambdaQueryWrapper<>();
-    this.injectQuartzLogQueryParams(criteria, wrapper);
+    this.injectQuartzLogQueryParams(args, wrapper);
     return systemQuartzLogMapper.selectList(wrapper);
   }
 

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

@@ -188,26 +188,26 @@ public class SystemRoleService {
   /**
    * 根据条件查询全部角色
    *
-   * @param criteria 条件
+   * @param args 条件
    * @return
    */
-  public List<SystemRoleVo> queryRoleByArgs(SystemQueryRoleArgs criteria) {
+  public List<SystemRoleVo> queryRoleByArgs(SystemQueryRoleArgs args) {
     // 查询角色基本信息
     LambdaQueryWrapper<SystemRoleTb> wrapper = new LambdaQueryWrapper<>();
-    if (criteria != null) {
-      wrapper.and(StrUtil.isNotBlank(criteria.getBlurry()),
-          c -> c.like(SystemRoleTb::getName, criteria.getBlurry()).or()
-              .like(SystemRoleTb::getDescription, criteria.getBlurry()));
-      if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) {
-        wrapper.between(SystemRoleTb::getCreateTime, criteria.getCreateTime().get(0),
-            criteria.getCreateTime().get(1));
+    if (args != null) {
+      wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
+          c -> c.like(SystemRoleTb::getName, args.getBlurry()).or()
+              .like(SystemRoleTb::getDescription, args.getBlurry()));
+      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+        wrapper.between(SystemRoleTb::getCreateTime, args.getCreateTime().get(0),
+            args.getCreateTime().get(1));
       }
     }
     wrapper.orderByAsc(SystemRoleTb::getLevel);
 
     // 分页处理
-    if (criteria != null && criteria.getOffset() > 0 && criteria.getSize() != null) {
-      Page<SystemRoleTb> rolePage = new Page<>(criteria.getOffset() / criteria.getSize() + 1, criteria.getSize());
+    if (args != null && args.getOffset() > 0 && args.getSize() != null) {
+      Page<SystemRoleTb> rolePage = new Page<>(args.getOffset() / args.getSize() + 1, args.getSize());
       Page<SystemRoleTb> page = systemRoleMapper.selectPage(rolePage, wrapper);
       List<SystemRoleTb> roles = page.getRecords();
       return roles.stream().map(this::convertToRoleVo).collect(Collectors.toList());
@@ -220,14 +220,14 @@ public class SystemRoleService {
   /**
    * 分页查询角色
    *
-   * @param criteria 条件
-   * @param page     分页参数
+   * @param args 条件
+   * @param page 分页参数
    * @return
    */
-  public KitPageResult<SystemRoleVo> queryRoleByArgs(SystemQueryRoleArgs criteria, Page<Object> page) {
-    criteria.setOffset(page.offset());
-    List<SystemRoleVo> roles = this.queryRoleByArgs(criteria);
-    Long total = this.countRoleByArgs(criteria);
+  public KitPageResult<SystemRoleVo> queryRoleByArgs(SystemQueryRoleArgs args, Page<Object> page) {
+    args.setOffset(page.offset());
+    List<SystemRoleVo> roles = this.queryRoleByArgs(args);
+    Long total = this.countRoleByArgs(args);
     return KitPageUtil.toPage(roles, total);
   }
 
@@ -387,15 +387,15 @@ public class SystemRoleService {
     return roleVo;
   }
 
-  public Long countRoleByArgs(SystemQueryRoleArgs criteria) {
+  public Long countRoleByArgs(SystemQueryRoleArgs args) {
     LambdaQueryWrapper<SystemRoleTb> wrapper = new LambdaQueryWrapper<>();
-    if (criteria != null) {
-      wrapper.and(StrUtil.isNotBlank(criteria.getBlurry()),
-          c -> c.like(SystemRoleTb::getName, criteria.getBlurry()).or()
-              .like(SystemRoleTb::getDescription, criteria.getBlurry()));
-      if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) {
-        wrapper.between(SystemRoleTb::getCreateTime, criteria.getCreateTime().get(0),
-            criteria.getCreateTime().get(1));
+    if (args != null) {
+      wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
+          c -> c.like(SystemRoleTb::getName, args.getBlurry()).or()
+              .like(SystemRoleTb::getDescription, args.getBlurry()));
+      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+        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/SystemUserService.java

@@ -117,7 +117,6 @@ public class SystemUserService {
    * 编辑用户
    *
    * @param args /
-   * @throws Exception /
    */
   @Transactional(rollbackFor = Exception.class)
   public void updateUserById(SystemUserVo args) {
@@ -303,13 +302,13 @@ public class SystemUserService {
   /**
    * 查询全部
    *
-   * @param criteria 条件
-   * @param page     分页参数
+   * @param args 条件
+   * @param page 分页参数
    * @return /
    */
-  public KitPageResult<SystemUserVo> queryUserByArgs(SystemQueryUserArgs criteria, Page<SystemUserTb> page) {
+  public KitPageResult<SystemUserVo> queryUserByArgs(SystemQueryUserArgs args, Page<SystemUserTb> page) {
     // 查询用户基本信息
-    LambdaQueryWrapper<SystemUserTb> wrapper = buildUserQueryWrapper(criteria);
+    LambdaQueryWrapper<SystemUserTb> wrapper = buildUserQueryWrapper(args);
     IPage<SystemUserTb> userPage = systemUserMapper.selectPage(page, wrapper);
     List<SystemUserTb> users = userPage.getRecords();
 
@@ -322,12 +321,12 @@ public class SystemUserService {
   /**
    * 查询全部不分页
    *
-   * @param criteria 条件
+   * @param args 条件
    * @return /
    */
-  public List<SystemUserVo> queryUserByArgs(SystemQueryUserArgs criteria) {
+  public List<SystemUserVo> queryUserByArgs(SystemQueryUserArgs args) {
     // 查询用户基本信息
-    LambdaQueryWrapper<SystemUserTb> wrapper = buildUserQueryWrapper(criteria);
+    LambdaQueryWrapper<SystemUserTb> wrapper = buildUserQueryWrapper(args);
     List<SystemUserTb> users = systemUserMapper.selectList(wrapper);
 
     // 转换为SystemUserVo并关联查询
@@ -344,20 +343,20 @@ public class SystemUserService {
     return systemUserMapper.selectById(id);
   }
 
-  public List<KitSelectOptionVo> queryUserMetadataOptions(KitPageArgs<SystemQueryUserArgs> args) {
-    SystemQueryUserArgs criteria = args.getArgs();
+  public List<KitSelectOptionVo> queryUserMetadataOptions(KitPageArgs<SystemQueryUserArgs> pageArgs) {
+    SystemQueryUserArgs args = pageArgs.getArgs();
     LambdaQueryWrapper<SystemUserTb> wrapper = new LambdaQueryWrapper<>();
     wrapper.select(SystemUserTb::getId, SystemUserTb::getDeptId, SystemUserTb::getEmail, SystemUserTb::getPhone);
     wrapper.and(c -> {
-      c.eq(SystemUserTb::getPhone, criteria.getBlurry());
+      c.eq(SystemUserTb::getPhone, args.getBlurry());
       c.or();
-      c.eq(SystemUserTb::getEmail, criteria.getBlurry());
+      c.eq(SystemUserTb::getEmail, args.getBlurry());
       c.or();
-      c.like(SystemUserTb::getUsername, criteria.getBlurry());
+      c.like(SystemUserTb::getUsername, args.getBlurry());
       c.or();
-      c.like(SystemUserTb::getNickName, criteria.getBlurry());
+      c.like(SystemUserTb::getNickName, args.getBlurry());
     });
-    return systemUserMapper.selectPage(new Page<>(criteria.getPage(), 50), wrapper).getRecords().stream().map(m -> {
+    return systemUserMapper.selectPage(new Page<>(args.getPage(), 50), wrapper).getRecords().stream().map(m -> {
       Map<String, Object> ext = new HashMap<>(1);
       ext.put("id", m.getId());
       ext.put("deptId", m.getDeptId());
@@ -415,7 +414,6 @@ public class SystemUserService {
     LambdaQueryWrapper<SystemUserRoleTb> userRoleWrapper = new LambdaQueryWrapper<>();
     // 这里需要通过菜单角色关联表查询，暂时简化处理
     List<SystemUserTb> users = systemUserMapper.selectList(null);
-
     return users.stream().map(this::convertToUserVo).collect(Collectors.toList());
   }
 
@@ -466,29 +464,29 @@ public class SystemUserService {
   /**
    * 构建用户查询条件
    *
-   * @param criteria 查询条件
+   * @param args 查询条件
    * @return /
    */
-  private LambdaQueryWrapper<SystemUserTb> buildUserQueryWrapper(SystemQueryUserArgs criteria) {
+  private LambdaQueryWrapper<SystemUserTb> buildUserQueryWrapper(SystemQueryUserArgs args) {
     LambdaQueryWrapper<SystemUserTb> wrapper = new LambdaQueryWrapper<>();
-    if (criteria != null) {
-      if (criteria.getId() != null) {
-        wrapper.eq(SystemUserTb::getId, criteria.getId());
+    if (args != null) {
+      if (args.getId() != null) {
+        wrapper.eq(SystemUserTb::getId, args.getId());
       }
-      if (criteria.getEnabled() != null) {
-        wrapper.eq(SystemUserTb::getEnabled, criteria.getEnabled());
+      if (args.getEnabled() != null) {
+        wrapper.eq(SystemUserTb::getEnabled, args.getEnabled());
       }
-      if (CollUtil.isNotEmpty(criteria.getDeptIds())) {
-        wrapper.in(SystemUserTb::getDeptId, criteria.getDeptIds());
+      if (CollUtil.isNotEmpty(args.getDeptIds())) {
+        wrapper.in(SystemUserTb::getDeptId, args.getDeptIds());
       }
-      if (StrUtil.isNotBlank(criteria.getBlurry())) {
-        wrapper.and(w -> w.like(SystemUserTb::getUsername, criteria.getBlurry())
-            .or().like(SystemUserTb::getNickName, criteria.getBlurry())
-            .or().like(SystemUserTb::getEmail, criteria.getBlurry()));
+      if (StrUtil.isNotBlank(args.getBlurry())) {
+        wrapper.and(w -> w.like(SystemUserTb::getUsername, args.getBlurry())
+            .or().like(SystemUserTb::getNickName, args.getBlurry())
+            .or().like(SystemUserTb::getEmail, args.getBlurry()));
       }
-      if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) {
-        wrapper.between(SystemUserTb::getCreateTime, criteria.getCreateTime().get(0),
-            criteria.getCreateTime().get(1));
+      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+        wrapper.between(SystemUserTb::getCreateTime, args.getCreateTime().get(0),
+            args.getCreateTime().get(1));
       }
     }
     wrapper.orderByDesc(SystemUserTb::getCreateTime);

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

@@ -70,9 +70,9 @@ public class SystemOssStorageServiceImpl extends ServiceImpl<SystemOssStorageMap
   private SystemOssStorageMapper systemOssStorageMapper;
 
   @Override
-  public KitPageResult<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs criteria,
+  public KitPageResult<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs args,
       Page<SystemOssStorageTb> page) {
-    IPage<SystemOssStorageTb> ossStorageTbs = this.selectOssStorageByArgs(criteria, page);
+    IPage<SystemOssStorageTb> ossStorageTbs = this.selectOssStorageByArgs(args, page);
     IPage<SystemOssStorageVo> convert = ossStorageTbs.convert(c -> {
       SystemOssStorageVo storageVo = BeanUtil.copyProperties(c, SystemOssStorageVo.class);
       storageVo.setFileSizeDesc(KitFileUtil.getSize(storageVo.getFileSize()));
@@ -81,18 +81,18 @@ public class SystemOssStorageServiceImpl extends ServiceImpl<SystemOssStorageMap
     return KitPageUtil.toPage(convert);
   }
 
-  private IPage<SystemOssStorageTb> selectOssStorageByArgs(SystemQueryStorageArgs criteria,
+  private IPage<SystemOssStorageTb> selectOssStorageByArgs(SystemQueryStorageArgs args,
       Page<SystemOssStorageTb> page) {
     LambdaQueryWrapper<SystemOssStorageTb> wrapper = new LambdaQueryWrapper<>();
-    if (criteria != null) {
-      wrapper.and(StrUtil.isNotBlank(criteria.getBlurry()),
-          c -> c.like(SystemOssStorageTb::getFileName, criteria.getBlurry()).or()
-              .like(SystemOssStorageTb::getFilePrefix, criteria.getBlurry()).or()
-              .like(SystemOssStorageTb::getFileMime, criteria.getBlurry()).or()
-              .like(SystemOssStorageTb::getFileMd5, criteria.getBlurry()));
-      if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) {
-        wrapper.between(SystemOssStorageTb::getUpdateTime, criteria.getCreateTime().get(0),
-            criteria.getCreateTime().get(1));
+    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),
+            args.getCreateTime().get(1));
       }
     }
     wrapper.orderByAsc(SystemOssStorageTb::getId);
@@ -100,10 +100,10 @@ public class SystemOssStorageServiceImpl extends ServiceImpl<SystemOssStorageMap
   }
 
   @Override
-  public List<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs criteria) {
+  public List<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs args) {
     // 防止刷数据
     Page<SystemOssStorageTb> page = new Page<>(1, 500);
-    return queryOssStorage(criteria, page).getContent();
+    return queryOssStorage(args, page).getContent();
   }
 
   @Override