refactor(system): 重构系统模块中的数据查询和删除方法命名

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

@@ -55,14 +55,14 @@ public class SystemLocalStorageController {
       @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));
+    return ResponseEntity.ok(localStorageService.searchLocalStorage(args, page));
   }
 
   @ApiOperation("导出数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('storage:list')")
   public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException {
-    localStorageService.exportLocalStorageExcel(localStorageService.queryLocalStorage(args), response);
+    localStorageService.exportLocalStorageExcel(localStorageService.queryLocalStorageByArgs(args), response);
   }
 
   @ApiOperation("上传文件")
@@ -96,7 +96,7 @@ public class SystemLocalStorageController {
   @ApiOperation("多选删除")
   @PostMapping(value = "/removeFileByIds")
   public ResponseEntity<Void> deleteFileByIds(@RequestBody Long[] ids) {
-    localStorageService.removeFileByIds(ids);
+    localStorageService.deleteFileByIds(ids);
     return ResponseEntity.ok(null);
   }
 }

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

@@ -66,7 +66,7 @@ public class SystemMenuController {
   @PostMapping(value = "/buildMenus")
   @ApiOperation("获取前端所需菜单")
   public ResponseEntity<List<SystemMenuVo>> buildMenus() {
-    List<SystemMenuTb> menuList = systemMenuService.queryMenuListByUserId(KitSecurityHelper.getCurrentUserId());
+    List<SystemMenuTb> menuList = systemMenuService.listMenuByUserId(KitSecurityHelper.getCurrentUserId());
     List<SystemMenuTb> menus = systemMenuService.buildMenuTree(menuList);
     return ResponseEntity.ok(systemMenuService.buildMenuVo(menus));
   }
@@ -75,7 +75,7 @@ public class SystemMenuController {
   @PostMapping(value = "/queryMenuListByPid")
   @PreAuthorize("@el.check('menu:list','roles:list')")
   public ResponseEntity<List<SystemMenuTb>> queryMenuListByPid(@RequestParam Long pid) {
-    return ResponseEntity.ok(systemMenuService.queryMenuByPid(pid));
+    return ResponseEntity.ok(systemMenuService.listMenuByPid(pid));
   }
 
   @ApiOperation("根据菜单ID返回所有子节点ID, 包含自身ID")
@@ -83,9 +83,9 @@ public class SystemMenuController {
   @PreAuthorize("@el.check('menu:list','roles:list')")
   public ResponseEntity<Set<Long>> queryChildMenuSet(@RequestParam Long id) {
     Set<SystemMenuTb> menuSet = new HashSet<>();
-    List<SystemMenuTb> menuList = systemMenuService.queryMenuByPid(id);
+    List<SystemMenuTb> menuList = systemMenuService.listMenuByPid(id);
     menuSet.add(systemMenuMapper.selectById(id));
-    menuSet = systemMenuService.queryChildMenu(menuList, menuSet);
+    menuSet = systemMenuService.queryChildMenuByArgs(menuList, menuSet);
     Set<Long> ids = menuSet.stream().map(SystemMenuTb::getId).collect(Collectors.toSet());
     return ResponseEntity.ok(ids);
   }
@@ -116,7 +116,7 @@ public class SystemMenuController {
     if (CollectionUtil.isNotEmpty(ids)) {
       menus = new LinkedHashSet<>(systemMenuService.listMenuByIds(ids));
       for (SystemMenuTb menu : menus) {
-        List<SystemMenuTb> menuList = systemMenuService.querySuperiorMenuList(menu, new ArrayList<>());
+        List<SystemMenuTb> menuList = systemMenuService.querySuperiorMenuByArgs(menu, new ArrayList<>());
         for (SystemMenuTb data : menuList) {
           if (data.getId().equals(menu.getPid())) {
             data.setSubCount(data.getSubCount() - 1);
@@ -128,7 +128,7 @@ public class SystemMenuController {
       menus = menus.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toSet());
       return ResponseEntity.ok(systemMenuService.buildMenuTree(new ArrayList<>(menus)));
     }
-    return ResponseEntity.ok(systemMenuService.queryMenuByPid(null));
+    return ResponseEntity.ok(systemMenuService.listMenuByPid(null));
   }
 
   @ApiOperation("新增菜单")
@@ -154,7 +154,7 @@ public class SystemMenuController {
   @PostMapping(value = "/removeMenuByIds")
   @PreAuthorize("@el.check('menu:del')")
   public ResponseEntity<Void> removeMenuByIds(@RequestBody Set<Long> ids) {
-    systemMenuService.removeMenuByIds(ids);
+    systemMenuService.deleteMenuByIds(ids);
     return ResponseEntity.ok(null);
   }
 }

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

@@ -38,6 +38,6 @@ public class SystemMonitorController {
   @ApiOperation("查询服务监控")
   @PreAuthorize("@el.check('monitor:list')")
   public ResponseEntity<Map<String, Object>> queryServerMonitorInfo() {
-    return ResponseEntity.ok(systemMonitorService.queryServerMonitorInfo());
+    return ResponseEntity.ok(systemMonitorService.getServerMonitorInfo());
   }
 }

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

@@ -55,7 +55,7 @@ public class SystemOssStorageController {
       @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));
+    return ResponseEntity.ok(systemOssStorageService.searchOssStorage(args, page));
   }
 
   @ApiOperation("导出数据")
@@ -76,7 +76,7 @@ public class SystemOssStorageController {
   @ApiOperation("多选删除")
   @PostMapping(value = "/removeFileByIds")
   public ResponseEntity<Void> removeFileByIds(@RequestBody Long[] ids) {
-    systemOssStorageService.removeFileByIds(ids);
+    systemOssStorageService.deleteFileByIds(ids);
     return ResponseEntity.ok(null);
   }
 }

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

@@ -59,7 +59,7 @@ public class SystemQuartzJobController {
       @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));
+    return ResponseEntity.ok(systemQuartzJobService.searchQuartzJobByArgs(args, page));
   }
 
   @ApiOperation("导出任务数据")
@@ -81,7 +81,7 @@ public class SystemQuartzJobController {
   @PreAuthorize("@el.check('quartzJob:list')")
   public ResponseEntity<KitPageResult<SystemQuartzLogTb>> queryQuartzJobLog(SystemQueryQuartzJobArgs args) {
     Page<SystemQuartzLogTb> page = new Page<>(args.getPage(), args.getSize());
-    return ResponseEntity.ok(systemQuartzJobService.queryQuartzLogByArgs(args, page));
+    return ResponseEntity.ok(systemQuartzJobService.searchQuartzLogByArgs(args, page));
   }
 
   @ApiOperation("新增定时任务")
@@ -128,7 +128,7 @@ public class SystemQuartzJobController {
   @PostMapping(value = "/removeJobByIds")
   @PreAuthorize("@el.check('quartzJob:del')")
   public ResponseEntity<Void> removeJobByIds(@RequestBody Set<Long> ids) {
-    systemQuartzJobService.removeJobByIds(ids);
+    systemQuartzJobService.deleteJobByIds(ids);
     return ResponseEntity.ok(null);
   }
 

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

@@ -70,7 +70,7 @@ public class SystemRoleController {
   @PostMapping(value = "/queryRoleList")
   @PreAuthorize("@el.check('roles:list','user:add','user:edit')")
   public ResponseEntity<List<SystemRoleTb>> queryRoleList() {
-    return ResponseEntity.ok(systemRoleService.queryAllRole());
+    return ResponseEntity.ok(systemRoleService.listAllRole());
   }
 
   @ApiOperation("查询角色")
@@ -80,7 +80,7 @@ public class SystemRoleController {
       @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));
+    return ResponseEntity.ok(systemRoleService.searchRoleByArgs(args, page));
   }
 
   @ApiOperation("获取用户级别")
@@ -127,7 +127,7 @@ public class SystemRoleController {
     }
     // 验证是否被用户关联
     systemRoleService.verifyBindRelationByIds(ids);
-    systemRoleService.removeRoleByIds(ids);
+    systemRoleService.deleteRoleByIds(ids);
     return ResponseEntity.ok(null);
   }
 

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

@@ -110,12 +110,12 @@ public class SystemUserController {
       // 取交集
       args.getDeptIds().retainAll(dataScopes);
       if (!CollectionUtil.isEmpty(args.getDeptIds())) {
-        return ResponseEntity.ok(systemUserService.queryUserByArgs(args, page));
+        return ResponseEntity.ok(systemUserService.searchUserByArgs(args, page));
       }
     } else {
       // 否则取并集
       args.getDeptIds().addAll(dataScopes);
-      return ResponseEntity.ok(systemUserService.queryUserByArgs(args, page));
+      return ResponseEntity.ok(systemUserService.searchUserByArgs(args, page));
     }
     return ResponseEntity.ok(KitPageUtil.emptyData());
   }

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

@@ -16,7 +16,9 @@
 package cn.odboy.system.dal.mysql;
 
 import cn.odboy.system.dal.dataobject.SystemDictTb;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -27,4 +29,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SystemDictMapper extends BaseMapper<SystemDictTb> {
 
+  default List<SystemDictTb> listAll() {
+    return selectList(null);
+  }
+
+  default SystemDictTb getByName(String dictName) {
+    LambdaQueryWrapper<SystemDictTb> wrapper = new LambdaQueryWrapper<>();
+    wrapper.eq(SystemDictTb::getName, dictName);
+    return selectOne(wrapper);
+  }
 }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java

@@ -40,7 +40,7 @@ public class ActiveJobRegister implements ApplicationRunner {
    */
   @Override
   public void run(ApplicationArguments applicationArguments) {
-    List<SystemQuartzJobTb> quartzJobs = systemQuartzJobService.queryEnableQuartzJob();
+    List<SystemQuartzJobTb> quartzJobs = systemQuartzJobService.listEnableQuartzJob();
     quartzJobs.forEach(quartzManage::addJob);
     log.info("Timing task injection complete");
   }

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

@@ -78,7 +78,7 @@ public class SystemDataService {
    * @return 数据权限ID
    */
   private List<Long> queryCustomDataPermissionByArgs(List<Long> deptIds, SystemRoleTb role) {
-    List<SystemDeptTb> deptList = systemRoleDeptService.selectDeptByRoleId(role.getId());
+    List<SystemDeptTb> deptList = systemRoleDeptService.listDeptByRoleId(role.getId());
     for (SystemDeptTb dept : deptList) {
       deptIds.add(dept.getId());
       List<SystemDeptTb> deptChildren = systemDeptService.listDeptByPid(dept.getId());

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

@@ -25,6 +25,7 @@ import cn.odboy.system.dal.model.SystemCreateDictDetailArgs;
 import cn.odboy.system.dal.model.SystemDictDetailVo;
 import cn.odboy.system.dal.model.SystemQueryDictDetailArgs;
 import cn.odboy.system.dal.mysql.SystemDictDetailMapper;
+import cn.odboy.system.dal.mysql.SystemDictMapper;
 import cn.odboy.util.KitPageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -40,11 +41,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class SystemDictDetailService {
-
   @Autowired
   private SystemDictDetailMapper systemDictDetailMapper;
   @Autowired
-  private SystemDictService systemDictService;
+  private SystemDictMapper systemDictMapper;
 
   /**
    * 创建
@@ -115,14 +115,14 @@ public class SystemDictDetailService {
     List<SystemDictTb> dictTbs = new ArrayList<>();
 
     if (args == null) {
-      dictTbs.addAll(systemDictService.listAll());
+      dictTbs.addAll(systemDictMapper.listAll());
       dictIds = dictTbs.stream().map(SystemDictTb::getId).collect(Collectors.toList());
     } else {
       String dictName = args.getDictName();
       if (StrUtil.isBlank(dictName)) {
         return KitPageUtil.toPage(iPage);
       }
-      SystemDictTb dictTb = systemDictService.getByName(dictName);
+      SystemDictTb dictTb = systemDictMapper.getByName(dictName);
       if (dictTb == null) {
         return KitPageUtil.toPage(iPage);
       } else {
@@ -150,7 +150,7 @@ public class SystemDictDetailService {
     if (StrUtil.isBlank(name)) {
       return new ArrayList<>();
     }
-    SystemDictTb systemDictTb = systemDictService.getByName(name);
+    SystemDictTb systemDictTb = systemDictMapper.getByName(name);
     if (systemDictTb == null) {
       return new ArrayList<>();
     }

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

@@ -144,14 +144,4 @@ public class SystemDictService {
     injectQueryParams(args, wrapper);
     return systemDictMapper.selectList(wrapper);
   }
-
-  public SystemDictTb getByName(String name) {
-    LambdaQueryWrapper<SystemDictTb> wrapper = new LambdaQueryWrapper<>();
-    wrapper.eq(SystemDictTb::getName, name);
-    return systemDictMapper.selectOne(wrapper);
-  }
-
-  public List<SystemDictTb> listAll() {
-    return systemDictMapper.selectList(null);
-  }
 }

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

@@ -30,7 +30,6 @@ import cn.odboy.system.dal.mysql.SystemLocalStorageMapper;
 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.File;
 import java.io.IOException;
@@ -111,7 +110,7 @@ public class SystemLocalStorageService {
    * @param ids /
    */
   @Transactional(rollbackFor = Exception.class)
-  public void removeFileByIds(Long[] ids) {
+  public void deleteFileByIds(Long[] ids) {
     for (Long id : ids) {
       SystemLocalStorageTb storage = systemLocalStorageMapper.selectById(id);
       try {
@@ -153,22 +152,15 @@ public class SystemLocalStorageService {
    * @param page 分页参数
    * @return /
    */
-  public KitPageResult<SystemLocalStorageTb> queryLocalStorage(SystemQueryStorageArgs args,
+  public KitPageResult<SystemLocalStorageTb> searchLocalStorage(SystemQueryStorageArgs args,
       Page<SystemLocalStorageTb> page) {
-    return KitPageUtil.toPage(this.selectLocalStorageByArgs(args, page));
+    LambdaQueryWrapper<SystemLocalStorageTb> wrapper = new LambdaQueryWrapper<>();
+    this.injectQueryParams(args, wrapper);
+    Page<SystemLocalStorageTb> selectPage = systemLocalStorageMapper.selectPage(page, wrapper);
+    return KitPageUtil.toPage(selectPage);
   }
 
-  /**
+  private void injectQueryParams(SystemQueryStorageArgs args, LambdaQueryWrapper<SystemLocalStorageTb> wrapper) {
-   * 查询全部数据
-   *
-   * @param args 条件
-   * @return /
-   */
-  public List<SystemLocalStorageTb> queryLocalStorage(SystemQueryStorageArgs args) {
-    return this.selectLocalStorageByArgs(args);
-  }
-
-  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()
@@ -183,16 +175,9 @@ public class SystemLocalStorageService {
     wrapper.orderByDesc(SystemLocalStorageTb::getId);
   }
 
-  public List<SystemLocalStorageTb> selectLocalStorageByArgs(SystemQueryStorageArgs args) {
+  public List<SystemLocalStorageTb> queryLocalStorageByArgs(SystemQueryStorageArgs args) {
     LambdaQueryWrapper<SystemLocalStorageTb> wrapper = new LambdaQueryWrapper<>();
     this.injectQueryParams(args, wrapper);
     return systemLocalStorageMapper.selectList(wrapper);
   }
-
-  public IPage<SystemLocalStorageTb> selectLocalStorageByArgs(SystemQueryStorageArgs args,
-      Page<SystemLocalStorageTb> page) {
-    LambdaQueryWrapper<SystemLocalStorageTb> wrapper = new LambdaQueryWrapper<>();
-    this.injectQueryParams(args, wrapper);
-    return systemLocalStorageMapper.selectPage(page, wrapper);
-  }
 }

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

@@ -154,17 +154,17 @@ public class SystemMenuService {
    * 删除
    */
   @Transactional(rollbackFor = Exception.class)
-  public void removeMenuByIds(Set<Long> ids) {
+  public void deleteMenuByIds(Set<Long> ids) {
     Set<SystemMenuTb> menuSet = new HashSet<>();
     for (Long id : ids) {
-      List<SystemMenuTb> menuList = this.queryMenuByPid(id);
+      List<SystemMenuTb> menuList = this.listMenuByPid(id);
       menuSet.add(systemMenuMapper.selectById(id));
-      menuSet = this.queryChildMenu(menuList, menuSet);
+      menuSet = this.queryChildMenuByArgs(menuList, menuSet);
     }
     List<Long> menuIds =
         menuSet.stream().map(SystemMenuTb::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
     if (CollUtil.isNotEmpty(menuIds)) {
-      KitSpringBeanHolder.getBean(SystemMenuService.class).removeRoleMenuByMenuIds(menuIds);
+      KitSpringBeanHolder.getBean(SystemMenuService.class).deleteRoleMenuByMenuIds(menuIds);
       systemMenuMapper.deleteByIds(menuIds);
     }
     for (SystemMenuTb menu : menuSet) {
@@ -173,7 +173,7 @@ public class SystemMenuService {
   }
 
   @Transactional(rollbackFor = Exception.class)
-  public void removeRoleMenuByMenuIds(List<Long> menuIds) {
+  public void deleteRoleMenuByMenuIds(List<Long> menuIds) {
     if (CollUtil.isNotEmpty(menuIds)) {
       LambdaQueryWrapper<SystemRoleMenuTb> wrapper = new LambdaQueryWrapper<>();
       wrapper.in(SystemRoleMenuTb::getMenuId, menuIds);
@@ -250,10 +250,10 @@ public class SystemMenuService {
    * @param currentUserId /
    * @return /
    */
-  public List<SystemMenuTb> queryMenuListByUserId(Long currentUserId) {
+  public List<SystemMenuTb> listMenuByUserId(Long currentUserId) {
     List<SystemRoleVo> roles = systemRoleService.queryRoleByUsersId(currentUserId);
     Set<Long> roleIds = roles.stream().map(SystemRoleTb::getId).collect(Collectors.toSet());
-    return new ArrayList<>(systemRoleMenuService.queryMenuByRoleIdsAndType(roleIds, 2));
+    return new ArrayList<>(systemRoleMenuService.queryMenuByRoleIds(roleIds));
   }
 
   /**
@@ -263,12 +263,12 @@ public class SystemMenuService {
    * @param menuSet  /
    * @return /
    */
-  public Set<SystemMenuTb> queryChildMenu(List<SystemMenuTb> menuList, Set<SystemMenuTb> menuSet) {
+  public Set<SystemMenuTb> queryChildMenuByArgs(List<SystemMenuTb> menuList, Set<SystemMenuTb> menuSet) {
     for (SystemMenuTb menu : menuList) {
       menuSet.add(menu);
-      List<SystemMenuTb> menus = this.getMenuByPid(menu.getId());
+      List<SystemMenuTb> menus = this.listMenuByPid(menu.getId());
       if (CollUtil.isNotEmpty(menus)) {
-        queryChildMenu(menus, menuSet);
+        queryChildMenuByArgs(menus, menuSet);
       }
     }
     return menuSet;
@@ -280,10 +280,13 @@ public class SystemMenuService {
    * @param pid /
    * @return /
    */
-  public List<SystemMenuTb> queryMenuByPid(Long pid) {
+  public List<SystemMenuTb> listMenuByPid(Long pid) {
     List<SystemMenuTb> menus;
     if (pid != null && !pid.equals(0L)) {
-      menus = this.getMenuByPid(pid);
+      LambdaQueryWrapper<SystemMenuTb> wrapper = new LambdaQueryWrapper<>();
+      wrapper.eq(SystemMenuTb::getPid, pid);
+      wrapper.orderByAsc(SystemMenuTb::getMenuSort);
+      return systemMenuMapper.selectList(wrapper);
     } else {
       menus = this.listRootMenu();
     }
@@ -297,13 +300,13 @@ public class SystemMenuService {
    * @param menus /
    * @return /
    */
-  public List<SystemMenuTb> querySuperiorMenuList(SystemMenuTb menu, List<SystemMenuTb> menus) {
+  public List<SystemMenuTb> querySuperiorMenuByArgs(SystemMenuTb menu, List<SystemMenuTb> menus) {
     if (menu.getPid() == null) {
       menus.addAll(this.listRootMenu());
       return menus;
     }
-    menus.addAll(this.getMenuByPid(menu.getPid()));
+    menus.addAll(this.listMenuByPid(menu.getPid()));
-    return querySuperiorMenuList(systemMenuMapper.selectById(menu.getPid()), menus);
+    return querySuperiorMenuByArgs(systemMenuMapper.selectById(menu.getPid()), menus);
   }
 
   /**
@@ -445,13 +448,6 @@ public class SystemMenuService {
     return systemMenuMapper.selectList(wrapper);
   }
 
-  private List<SystemMenuTb> getMenuByPid(Long pid) {
-    LambdaQueryWrapper<SystemMenuTb> wrapper = new LambdaQueryWrapper<>();
-    wrapper.eq(SystemMenuTb::getPid, pid);
-    wrapper.orderByAsc(SystemMenuTb::getMenuSort);
-    return systemMenuMapper.selectList(wrapper);
-  }
-
   private List<SystemMenuTb> listRootMenu() {
     LambdaQueryWrapper<SystemMenuTb> wrapper = new LambdaQueryWrapper<>();
     wrapper.isNull(SystemMenuTb::getPid);

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

@@ -51,7 +51,7 @@ public class SystemMonitorService {
    *
    * @return Map<String, Object>
    */
-  public Map<String, Object> queryServerMonitorInfo() {
+  public Map<String, Object> getServerMonitorInfo() {
     Map<String, Object> resultMap = new LinkedHashMap<>(8);
     try {
       SystemInfo si = new SystemInfo();

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

@@ -36,7 +36,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public interface SystemOssStorageService extends IService<SystemOssStorageTb> {
 
-  KitPageResult<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs args, Page<SystemOssStorageTb> page);
+  KitPageResult<SystemOssStorageVo> searchOssStorage(SystemQueryStorageArgs args, Page<SystemOssStorageTb> page);
 
   List<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs args);
 
@@ -44,5 +44,5 @@ public interface SystemOssStorageService extends IService<SystemOssStorageTb> {
 
   String uploadFile(MultipartFile file);
 
-  void removeFileByIds(Long[] ids);
+  void deleteFileByIds(Long[] ids);
 }

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

@@ -126,7 +126,7 @@ public class SystemQuartzJobService {
    * @param ids /
    */
   @Transactional(rollbackFor = Exception.class)
-  public void removeJobByIds(Set<Long> ids) {
+  public void deleteJobByIds(Set<Long> ids) {
     for (Long id : ids) {
       SystemQuartzJobTb quartzJob = systemQuartzJobMapper.selectById(id);
       quartzManage.deleteJob(quartzJob);
@@ -229,7 +229,7 @@ public class SystemQuartzJobService {
    * @param page 分页参数
    * @return /
    */
-  public KitPageResult<SystemQuartzJobTb> queryQuartzJobByArgs(SystemQueryQuartzJobArgs args,
+  public KitPageResult<SystemQuartzJobTb> searchQuartzJobByArgs(SystemQueryQuartzJobArgs args,
       Page<SystemQuartzJobTb> page) {
     LambdaQueryWrapper<SystemQuartzJobTb> wrapper = new LambdaQueryWrapper<>();
     this.injectQuartzJobQueryParams(args, wrapper);
@@ -270,7 +270,7 @@ public class SystemQuartzJobService {
    * @param page 分页参数
    * @return /
    */
-  public KitPageResult<SystemQuartzLogTb> queryQuartzLogByArgs(SystemQueryQuartzJobArgs args,
+  public KitPageResult<SystemQuartzLogTb> searchQuartzLogByArgs(SystemQueryQuartzJobArgs args,
       Page<SystemQuartzLogTb> page) {
     LambdaQueryWrapper<SystemQuartzLogTb> wrapper = new LambdaQueryWrapper<>();
     this.injectQuartzLogQueryParams(args, wrapper);
@@ -305,7 +305,7 @@ public class SystemQuartzJobService {
     return systemQuartzJobMapper.selectById(id);
   }
 
-  public List<SystemQuartzJobTb> queryEnableQuartzJob() {
+  public List<SystemQuartzJobTb> listEnableQuartzJob() {
     LambdaQueryWrapper<SystemQuartzJobTb> wrapper = new LambdaQueryWrapper<>();
     wrapper.eq(SystemQuartzJobTb::getIsPause, 0);
     return systemQuartzJobMapper.selectList(wrapper);

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

@@ -66,7 +66,7 @@ public class SystemRoleDeptService {
    * @param roleId /
    * @return /
    */
-  public List<SystemDeptTb> selectDeptByRoleId(Long roleId) {
+  public List<SystemDeptTb> listDeptByRoleId(Long roleId) {
     LambdaQueryWrapper<SystemRoleDeptTb> wrapper = new LambdaQueryWrapper<>();
     wrapper.eq(SystemRoleDeptTb::getRoleId, roleId);
     List<SystemRoleDeptTb> systemRoleDeptTbs = systemRoleDeptMapper.selectList(wrapper);

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

@@ -68,7 +68,7 @@ public class SystemRoleMenuService {
     }
   }
 
-  public LinkedHashSet<SystemMenuTb> queryMenuByRoleIdsAndType(Set<Long> roleIds, int menuType) {
+  public LinkedHashSet<SystemMenuTb> queryMenuByRoleIds(Set<Long> roleIds) {
     if (CollUtil.isEmpty(roleIds)) {
       return new LinkedHashSet<>();
     }
@@ -79,7 +79,6 @@ public class SystemRoleMenuService {
     if (CollUtil.isEmpty(menuIds)) {
       return new LinkedHashSet<>();
     }
-
     LambdaQueryWrapper<SystemMenuTb> menuWrapper = new LambdaQueryWrapper<>();
     menuWrapper.in(SystemMenuTb::getId, menuIds);
     // 排除"按钮"

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

@@ -57,7 +57,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class SystemRoleService {
-
   @Autowired
   private SystemRoleMapper systemRoleMapper;
   @Autowired
@@ -65,8 +64,6 @@ public class SystemRoleService {
   @Autowired
   private SystemRoleDeptService systemRoleDeptService;
   @Autowired
-  private SystemRoleMenuMapper systemRoleMenuMapper;
-  @Autowired
   private SystemRoleDeptMapper systemRoleDeptMapper;
   @Autowired
   private SystemUserRoleMapper systemUserRoleMapper;
@@ -143,7 +140,7 @@ public class SystemRoleService {
    * @param ids /
    */
   @Transactional(rollbackFor = Exception.class)
-  public void removeRoleByIds(Set<Long> ids) {
+  public void deleteRoleByIds(Set<Long> ids) {
     systemRoleMapper.deleteByIds(ids);
     // 删除角色部门关联数据、角色菜单关联数据
     systemRoleDeptService.batchDeleteRoleDept(ids);
@@ -172,14 +169,8 @@ public class SystemRoleService {
 
   /**
    * 查询全部角色
-   *
-   * @return
    */
-  public List<SystemRoleTb> queryAllRole() {
+  public List<SystemRoleTb> listAllRole() {
-    return this.selectAllRole();
-  }
-
-  private List<SystemRoleTb> selectAllRole() {
     LambdaQueryWrapper<SystemRoleTb> wrapper = new LambdaQueryWrapper<>();
     wrapper.orderByAsc(SystemRoleTb::getLevel);
     return systemRoleMapper.selectList(wrapper);
@@ -204,10 +195,8 @@ public class SystemRoleService {
       }
     }
     wrapper.orderByAsc(SystemRoleTb::getLevel);
-
+    if (args != null && args.getSize() != null) {
-    // 分页处理
+      Page<SystemRoleTb> rolePage = new Page<>(args.getPage(), args.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());
@@ -224,7 +213,7 @@ public class SystemRoleService {
    * @param page 分页参数
    * @return
    */
-  public KitPageResult<SystemRoleVo> queryRoleByArgs(SystemQueryRoleArgs args, Page<Object> page) {
+  public KitPageResult<SystemRoleVo> searchRoleByArgs(SystemQueryRoleArgs args, Page<Object> page) {
     args.setOffset(page.offset());
     List<SystemRoleVo> roles = this.queryRoleByArgs(args);
     Long total = this.countRoleByArgs(args);
@@ -242,14 +231,11 @@ public class SystemRoleService {
     LambdaQueryWrapper<SystemUserRoleTb> userRoleWrapper = new LambdaQueryWrapper<>();
     userRoleWrapper.eq(SystemUserRoleTb::getUserId, userId);
     List<SystemUserRoleTb> userRoles = systemUserRoleMapper.selectList(userRoleWrapper);
-
     if (CollUtil.isEmpty(userRoles)) {
       return new ArrayList<>();
     }
-
     Set<Long> roleIds = userRoles.stream().map(SystemUserRoleTb::getRoleId).collect(Collectors.toSet());
     List<SystemRoleTb> roles = systemRoleMapper.selectByIds(roleIds);
-
     return roles.stream().map(this::convertToRoleVo).collect(Collectors.toList());
   }
 
@@ -310,42 +296,6 @@ public class SystemRoleService {
     return systemRoleMapper.selectById(id);
   }
 
-  /**
-   * 根据ID查询角色详情（包含关联信息）
-   *
-   * @param id /
-   * @return /
-   */
-  public SystemRoleVo getRoleVoById(Long id) {
-    SystemRoleTb role = systemRoleMapper.selectById(id);
-    if (role == null) {
-      return null;
-    }
-    return convertToRoleVo(role);
-  }
-
-  /**
-   * 根据菜单ID查询角色
-   *
-   * @param menuId 菜单ID
-   * @return /
-   */
-  public List<SystemRoleVo> queryRoleByMenuId(Long menuId) {
-    // 查询包含该菜单的角色ID列表
-    LambdaQueryWrapper<SystemRoleMenuTb> roleMenuWrapper = new LambdaQueryWrapper<>();
-    roleMenuWrapper.eq(SystemRoleMenuTb::getMenuId, menuId);
-    List<SystemRoleMenuTb> roleMenuList = systemRoleMenuMapper.selectList(roleMenuWrapper);
-
-    if (CollUtil.isEmpty(roleMenuList)) {
-      return new ArrayList<>();
-    }
-
-    Set<Long> roleIds = roleMenuList.stream().map(SystemRoleMenuTb::getRoleId).collect(Collectors.toSet());
-    List<SystemRoleTb> roles = systemRoleMapper.selectByIds(roleIds);
-
-    return roles.stream().map(this::convertToRoleVo).collect(Collectors.toList());
-  }
-
   /**
    * 根据部门ID统计角色数量
    *
@@ -374,14 +324,13 @@ public class SystemRoleService {
     }
 
     SystemRoleVo roleVo = BeanUtil.copyProperties(role, SystemRoleVo.class);
-
     // 查询关联的菜单信息
-    Set<SystemMenuTb> menus = systemRoleMenuService.queryMenuByRoleIdsAndType(
+    Set<SystemMenuTb> menus = systemRoleMenuService.queryMenuByRoleIds(
-        Collections.singleton(role.getId()), -1);
+        Collections.singleton(role.getId()));
     roleVo.setMenus(menus);
 
     // 查询关联的部门信息
-    List<SystemDeptTb> depts = systemRoleDeptService.selectDeptByRoleId(role.getId());
+    List<SystemDeptTb> depts = systemRoleDeptService.listDeptByRoleId(role.getId());
     roleVo.setDepts(new LinkedHashSet<>(depts));
 
     return roleVo;

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

@@ -306,15 +306,13 @@ public class SystemUserService {
    * @param page 分页参数
    * @return /
    */
-  public KitPageResult<SystemUserVo> queryUserByArgs(SystemQueryUserArgs args, Page<SystemUserTb> page) {
+  public KitPageResult<SystemUserVo> searchUserByArgs(SystemQueryUserArgs args, Page<SystemUserTb> page) {
     // 查询用户基本信息
     LambdaQueryWrapper<SystemUserTb> wrapper = buildUserQueryWrapper(args);
     IPage<SystemUserTb> userPage = systemUserMapper.selectPage(page, wrapper);
     List<SystemUserTb> users = userPage.getRecords();
-
     // 转换为SystemUserVo并关联查询
     List<SystemUserVo> userVos = users.stream().map(this::convertToUserVo).collect(Collectors.toList());
-
     return KitPageUtil.toPage(userVos, userPage.getTotal());
   }
 
@@ -328,7 +326,6 @@ public class SystemUserService {
     // 查询用户基本信息
     LambdaQueryWrapper<SystemUserTb> wrapper = buildUserQueryWrapper(args);
     List<SystemUserTb> users = systemUserMapper.selectList(wrapper);
-
     // 转换为SystemUserVo并关联查询
     return users.stream().map(this::convertToUserVo).collect(Collectors.toList());
   }
@@ -366,57 +363,6 @@ public class SystemUserService {
     }).collect(Collectors.toList());
   }
 
-  /**
-   * 根据角色ID查询用户
-   *
-   * @param roleId 角色ID
-   * @return /
-   */
-  public List<SystemUserVo> selectUserByRoleId(Long roleId) {
-    // 查询用户角色关联
-    LambdaQueryWrapper<SystemUserRoleTb> userRoleWrapper = new LambdaQueryWrapper<>();
-    userRoleWrapper.eq(SystemUserRoleTb::getRoleId, roleId);
-    List<SystemUserRoleTb> userRoles = systemUserRoleMapper.selectList(userRoleWrapper);
-
-    if (CollUtil.isEmpty(userRoles)) {
-      return new ArrayList<>();
-    }
-
-    Set<Long> userIds = userRoles.stream().map(SystemUserRoleTb::getUserId).collect(Collectors.toSet());
-    List<SystemUserTb> users = systemUserMapper.selectByIds(userIds);
-
-    return users.stream().map(this::convertToUserVo).collect(Collectors.toList());
-  }
-
-  /**
-   * 根据部门ID查询用户
-   *
-   * @param deptId 部门ID
-   * @return /
-   */
-  public List<SystemUserVo> selectUserByDeptId(Long deptId) {
-    // 查询部门关联的角色
-    LambdaQueryWrapper<SystemUserTb> userWrapper = new LambdaQueryWrapper<>();
-    userWrapper.eq(SystemUserTb::getDeptId, deptId);
-    List<SystemUserTb> users = systemUserMapper.selectList(userWrapper);
-
-    return users.stream().map(this::convertToUserVo).collect(Collectors.toList());
-  }
-
-  /**
-   * 根据菜单ID查询用户
-   *
-   * @param menuId 菜单ID
-   * @return /
-   */
-  public List<SystemUserVo> selectUserByMenuId(Long menuId) {
-    // 查询菜单角色关联
-    LambdaQueryWrapper<SystemUserRoleTb> userRoleWrapper = new LambdaQueryWrapper<>();
-    // 这里需要通过菜单角色关联表查询，暂时简化处理
-    List<SystemUserTb> users = systemUserMapper.selectList(null);
-    return users.stream().map(this::convertToUserVo).collect(Collectors.toList());
-  }
-
   /**
    * 根据岗位ID统计用户数量
    *
@@ -447,20 +393,6 @@ public class SystemUserService {
     return systemUserRoleMapper.selectCount(wrapper);
   }
 
-  /**
-   * 根据用户名查询用户详情（包含关联信息）
-   *
-   * @param username 用户名
-   * @return /
-   */
-  public SystemUserVo getUserVoByUsername(String username) {
-    SystemUserTb user = this.getUserByUsername(username);
-    if (user == null) {
-      return null;
-    }
-    return convertToUserVo(user);
-  }
-
   /**
    * 构建用户查询条件
    *

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

@@ -70,7 +70,7 @@ public class SystemOssStorageServiceImpl extends ServiceImpl<SystemOssStorageMap
   private SystemOssStorageMapper systemOssStorageMapper;
 
   @Override
-  public KitPageResult<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs args,
+  public KitPageResult<SystemOssStorageVo> searchOssStorage(SystemQueryStorageArgs args,
       Page<SystemOssStorageTb> page) {
     IPage<SystemOssStorageTb> ossStorageTbs = this.selectOssStorageByArgs(args, page);
     IPage<SystemOssStorageVo> convert = ossStorageTbs.convert(c -> {
@@ -103,7 +103,7 @@ public class SystemOssStorageServiceImpl extends ServiceImpl<SystemOssStorageMap
   public List<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs args) {
     // 防止刷数据
     Page<SystemOssStorageTb> page = new Page<>(1, 500);
-    return queryOssStorage(args, page).getContent();
+    return searchOssStorage(args, page).getContent();
   }
 
   @Override
@@ -145,7 +145,7 @@ public class SystemOssStorageServiceImpl extends ServiceImpl<SystemOssStorageMap
     }
     // 校验文件md5, 看是否已存在云端（不确定, 可能云端已经删除, 但是正常来说云端是不允许私自删除的, 所以这里忽略云端不存在的情况）
     String md5 = KitFileUtil.getMd5(tempFile);
-    SystemOssStorageTb systemOssStorageTb = this.getByMd5(md5);
+    SystemOssStorageTb systemOssStorageTb = this.getOssStorageByMd5(md5);
     if (systemOssStorageTb != null) {
       // 重新生成7天链接
       return minioRepository.generatePreviewUrl(systemOssStorageTb.getObjectName());
@@ -166,7 +166,7 @@ public class SystemOssStorageServiceImpl extends ServiceImpl<SystemOssStorageMap
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
-  public void removeFileByIds(Long[] ids) {
+  public void deleteFileByIds(Long[] ids) {
     for (Long id : ids) {
       SystemOssStorageTb storage = getById(id);
       minioRepository.removeBucketFile(storage.getObjectName());
@@ -174,7 +174,7 @@ public class SystemOssStorageServiceImpl extends ServiceImpl<SystemOssStorageMap
     }
   }
 
-  private SystemOssStorageTb getByMd5(String md5) {
+  private SystemOssStorageTb getOssStorageByMd5(String md5) {
     return lambdaQuery().eq(SystemOssStorageTb::getFileMd5, md5).one();
   }
 }