refactor(system): 重构系统模块的数据查询和分页功能

2026-01-12 15:12:40 +08:00
parent e511ccdd6d
commit ff22d3072c
49 changed files with 102 additions and 211 deletions
@@ -72,9 +72,8 @@ public class SystemRoleController {
  @ApiOperation("查询角色")
  @PostMapping(value = "/searchRole")
  @PreAuthorize("@el.check('roles:list')")
-  public ResponseEntity<KitPageResult<SystemRoleVo>> queryRoleByArgs(
-      @Validated @RequestBody KitPageArgs<SystemQueryRoleArgs> pageArgs) {
-    Page<Object> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
+  public ResponseEntity<KitPageResult<SystemRoleVo>> queryRoleByArgs(@Validated @RequestBody KitPageArgs<SystemQueryRoleArgs> pageArgs) {
+    Page<SystemRoleTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
    return ResponseEntity.ok(systemRoleService.searchRoleByArgs(pageArgs.getArgs(), page));
  }

@@ -23,8 +23,4 @@ public class SystemQueryDictArgs {

  @ApiModelProperty(value = "模糊查询")
  private String blurry;
-  @ApiModelProperty(value = "页码", example = "1")
-  private Integer page = 1;
-  @ApiModelProperty(value = "每页数据量", example = "10")
-  private Integer size = 10;
 }
@@ -31,8 +31,4 @@ public class SystemQueryJobArgs {
  private Boolean enabled;
  @ApiModelProperty(value = "创建时间")
  private List<Date> createTime;
-  @ApiModelProperty(value = "页码", example = "1")
-  private Integer page = 1;
-  @ApiModelProperty(value = "每页数据量", example = "10")
-  private Integer size = 10;
 }
@@ -27,10 +27,4 @@ public class SystemQueryRoleArgs {
  private String blurry;
  @ApiModelProperty(value = "创建时间")
  private List<Date> createTime;
-  @ApiModelProperty(value = "页码", example = "1")
-  private Integer page = 1;
-  @ApiModelProperty(value = "每页数据量", example = "10")
-  private Integer size = 10;
-  @ApiModelProperty(value = "偏移量", hidden = true)
-  private long offset;
 }
@@ -40,8 +40,4 @@ public class SystemQueryUserArgs extends KitObject {
  private Long deptId;
  @ApiModelProperty(value = "创建时间")
  private List<Date> createTime;
-  @ApiModelProperty(value = "页码", example = "1")
-  private Integer page = 1;
-  @ApiModelProperty(value = "每页数据量", example = "10")
-  private Integer size = 10;
 }
@@ -18,7 +18,6 @@ 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;

 /**
@@ -29,10 +28,6 @@ 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);
@@ -43,8 +43,8 @@ public class BizLockAspect {
  public Object around(ProceedingJoinPoint joinPoint, BizLock bizLock) throws Throwable {
    // 解析SpEL表达式生成最终的lockKey
    String lockKey = parseLockKey(joinPoint, bizLock);
-    Boolean success = redisHelper.setIfAbsent(lockKey, lockKey, bizLock.leaseTime(), bizLock.timeUnit());
-    if (success == null || !success) {
+    boolean success = redisHelper.setIfAbsent(lockKey, lockKey, bizLock.leaseTime(), bizLock.timeUnit());
+    if (!success) {
      throw new BadRequestException(bizLock.errorMessage());
    }
    try {
@@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package cn.odboy.system.framework.mybatisplus;

 import cn.hutool.core.date.DateTime;
@@ -55,4 +54,3 @@ public class MpMetaObjectHandler implements MetaObjectHandler {
    this.strictUpdateFill(metaObject, "updateBy", String.class, username);
  }
 }
-
@@ -27,8 +27,8 @@ import cn.odboy.util.KitBrowserUtil;
 import cn.odboy.util.KitIPUtil;
 import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiOperation;
-import jakarta.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -96,7 +96,7 @@ public class OperationLogAspect {
      }
    }
    if (StrUtil.isBlank(bizName)) {
-      bizName = "Default";
+      bizName = "默认业务";
    }
    String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
    Object[] args = joinPoint.getArgs();
@@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package cn.odboy.system.framework.storage;

 import cn.odboy.framework.exception.BadRequestException;
@@ -13,13 +13,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package cn.odboy.system.framework.storage.local;

 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.properties.AppProperties;
-import jakarta.servlet.MultipartConfigElement;
 import java.io.File;
+import jakarta.servlet.MultipartConfigElement;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package cn.odboy.system.framework.storage.minio;

 import cn.hutool.core.io.FastByteArrayOutputStream;
@@ -44,13 +43,13 @@ import io.minio.Result;
 import io.minio.http.Method;
 import io.minio.messages.Bucket;
 import io.minio.messages.Item;
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -153,13 +152,11 @@ public class MinioRepository {
    String type = FileTypeUtil.getType(tempFile);
    String prefix = KitFileUtil.getPrefix(tempFile);
    String suffix = KitFileUtil.getSuffix(tempFile);
-
    String fileCode = IdUtil.fastSimpleUUID();
    String fileName = fileCode + FileUtil.getSuffix(originalFilename);
    String objectName = KitDateUtil.getNowDateStr() + "/" + fileName;
    log.info("上传文件，原文件名：{}，上传后文件名：{}", originalFilename, fileName);
    String fileUrl = ossMinioConfig.getEndpoint() + "/" + ossMinioConfig.getBucketName() + "/" + objectName;
-
    SystemOssStorageTb systemOssStorageTb = new SystemOssStorageTb();
    systemOssStorageTb.setServiceType("minio");
    systemOssStorageTb.setEndpoint(ossMinioConfig.getEndpoint());
@@ -173,7 +170,6 @@ public class MinioRepository {
    systemOssStorageTb.setFileUrl(fileUrl);
    systemOssStorageTb.setFileCode(fileCode);
    systemOssStorageTb.setObjectName(objectName);
-
    try (InputStream fileInputStream = KitFileUtil.getInputStream(tempFile)) {
      PutObjectArgs objectArgs = PutObjectArgs.builder().bucket(ossMinioConfig.getBucketName()).object(objectName)
          .stream(fileInputStream, fileSize, -1).contentType(contentType).build();
@@ -203,14 +199,11 @@ public class MinioRepository {
    if (StrUtil.isBlank(originalFilename)) {
      throw new BadRequestException("文件名不能为空");
    }
-
    long size = file.getSize();
    KitFileUtil.checkSize(properties.getOss().getMaxSize(), size);
-
    String fileName = UUID.randomUUID() + FileUtil.getSuffix(originalFilename);
    // yyyy/MM/dd/fileName.xxx
    String objectName = KitDateUtil.getNowDateTimeStr() + "/" + fileName;
-
    log.info("准备上传文件，原文件名：{}，上传后文件名：{}", originalFilename, fileName);
    try (InputStream fileInputStream = file.getInputStream()) {
      PutObjectArgs objectArgs =
@@ -286,17 +279,14 @@ public class MinioRepository {
  public void download(String fileName, HttpServletResponse res) {
    GetObjectArgs objectArgs =
        GetObjectArgs.builder().bucket(properties.getOss().getMinio().getBucketName()).object(fileName).build();
-
    try (GetObjectResponse response = minioClient.getObject(objectArgs);
        FastByteArrayOutputStream os = new FastByteArrayOutputStream()) {
-
      byte[] buf = new byte[1024];
      int len;
      while ((len = response.read(buf)) != -1) {
        os.write(buf, 0, len);
      }
      os.flush();
-
      byte[] bytes = os.toByteArray();
      res.setCharacterEncoding("utf-8");
      res.addHeader("Content-Disposition", "attachment;fileName=" + fileName);
@@ -318,12 +308,10 @@ public class MinioRepository {
  public void downloadOptimizedVersion(String fileName, HttpServletResponse res) {
    GetObjectArgs objectArgs =
        GetObjectArgs.builder().bucket(properties.getOss().getMinio().getBucketName()).object(fileName).build();
-
    try (GetObjectResponse response = minioClient.getObject(objectArgs)) {
      // 增大缓冲区
      byte[] buf = new byte[1024 * 4];
      int len;
-
      // 分块下载并输出到响应流
      try (ServletOutputStream stream = res.getOutputStream()) {
        res.setCharacterEncoding("utf-8");
@@ -331,7 +319,6 @@ public class MinioRepository {
        res.setHeader("Cache-Control", "no-store");
        res.setHeader("Pragma", "no-cache");
        res.setHeader("Expires", "0");
-
        while ((len = response.read(buf)) != -1) {
          stream.write(buf, 0, len);
          // 确保实时写入
@@ -92,7 +92,7 @@ public class SystemDictService {
   */
  public KitPageResult<SystemDictTb> searchDict(SystemQueryDictArgs args, Page<SystemDictTb> page) {
    LambdaQueryWrapper<SystemDictTb> wrapper = new LambdaQueryWrapper<>();
-    injectQueryParams(args, wrapper);
+    this.injectQueryParams(args, wrapper);
    Page<SystemDictTb> selectPage = systemDictMapper.selectPage(page, wrapper);
    return KitPageUtil.toPage(selectPage);
  }
@@ -105,7 +105,7 @@ public class SystemDictService {

  public List<SystemDictTb> queryDictByArgs(SystemQueryDictArgs args) {
    LambdaQueryWrapper<SystemDictTb> wrapper = new LambdaQueryWrapper<>();
-    injectQueryParams(args, wrapper);
+    this.injectQueryParams(args, wrapper);
    return systemDictMapper.selectList(wrapper);
  }

@@ -20,6 +20,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.framework.exception.BadRequestException;
+import cn.odboy.framework.logging.ExecutionTimeStatisticsFace;
 import cn.odboy.system.constant.SystemTransferProtocolConst;
 import cn.odboy.system.constant.SystemYesOrNoChConst;
 import cn.odboy.system.dal.dataobject.SystemMenuTb;
@@ -68,7 +68,7 @@ public class SystemRoleService {
  @Transactional(rollbackFor = Exception.class)
  public void saveRole(SystemCreateRoleArgs args) {
    checkRoleLevels(args.getLevel());
-    if (this.getRoleByName(args.getName()) != null) {
+    if (this.countRoleByName(args.getName()) > 0) {
      throw new BadRequestException("角色名称已存在");
    }
    SystemRoleTb roleTb = KitBeanUtil.copyToClass(args, SystemRoleTb.class);
@@ -85,6 +85,12 @@ public class SystemRoleService {
    return systemRoleMapper.selectOne(wrapper);
  }

+  private long countRoleByName(String name) {
+    LambdaQueryWrapper<SystemRoleTb> wrapper = new LambdaQueryWrapper<>();
+    wrapper.eq(SystemRoleTb::getName, name);
+    return systemRoleMapper.selectCount(wrapper);
+  }
+
  /**
   * 修改
   *
@@ -166,10 +172,11 @@ public class SystemRoleService {
  /**
   * 根据条件查询全部角色
   *
-   * @param args 条件
+   * @param args     条件
+   * @param rolePage 分页参数
   * @return /
   */
-  public List<SystemRoleVo> queryRoleByArgs(SystemQueryRoleArgs args) {
+  public List<SystemRoleVo> queryRoleByArgs(SystemQueryRoleArgs args, Page<SystemRoleTb> rolePage) {
    KitValidUtil.notNull(args);
    // 查询角色基本信息
    LambdaQueryWrapper<SystemRoleTb> wrapper = new LambdaQueryWrapper<>();
@@ -181,27 +188,25 @@ public class SystemRoleService {
          args.getCreateTime().get(1));
    }
    wrapper.orderByAsc(SystemRoleTb::getLevel);
-    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();
-      return roles.stream().map(systemUserRoleService::convertToRoleVo).collect(Collectors.toList());
+    List<SystemRoleTb> roles;
+    if (rolePage == null) {
+      roles = systemRoleMapper.selectList(wrapper);
    } else {
-      List<SystemRoleTb> roles = systemRoleMapper.selectList(wrapper);
-      return roles.stream().map(systemUserRoleService::convertToRoleVo).collect(Collectors.toList());
+      Page<SystemRoleTb> page = systemRoleMapper.selectPage(rolePage, wrapper);
+      roles = page.getRecords();
    }
+    return roles.stream().map(systemUserRoleService::convertToRoleVo).collect(Collectors.toList());
  }

  /**
   * 分页查询角色
   *
   * @param args 条件
-   * @param page 分页参数
+   * @param page 分页条件
   * @return /
   */
-  public KitPageResult<SystemRoleVo> searchRoleByArgs(SystemQueryRoleArgs args, Page<Object> page) {
-    args.setOffset(page.offset());
-    List<SystemRoleVo> roles = this.queryRoleByArgs(args);
+  public KitPageResult<SystemRoleVo> searchRoleByArgs(SystemQueryRoleArgs args, Page<SystemRoleTb> page) {
+    List<SystemRoleVo> roles = this.queryRoleByArgs(args, page);
    Long total = this.countRoleByArgs(args);
    return KitPageUtil.toPage(roles, total);
  }
@@ -280,7 +285,7 @@ public class SystemRoleService {
  }

  public void exportRoleXlsx(HttpServletResponse response, SystemQueryRoleArgs args) {
-    List<SystemRoleVo> systemRoleVos = this.queryRoleByArgs(args);
+    List<SystemRoleVo> systemRoleVos = this.queryRoleByArgs(args, null);
    List<SystemRoleExportRowVo> rowVos = new ArrayList<>();
    for (SystemRoleVo dataObject : systemRoleVos) {
      SystemRoleExportRowVo rowVo = new SystemRoleExportRowVo();
@@ -343,20 +343,6 @@ public class SystemUserService {
    return KitPageUtil.toPage(userVos, userPage.getTotal());
  }

-//  /**
-//   * 查询全部不分页
-//   *
-//   * @param args 条件
-//   * @return /
-//   */
-//  public List<SystemUserVo> queryUserVoByArgs(SystemQueryUserArgs args) {
-//    // 查询用户基本信息
-//    LambdaQueryWrapper<SystemUserTb> wrapper = buildUserQueryWrapper(args);
-//    List<SystemUserTb> users = systemUserMapper.selectList(wrapper);
-//    // 转换为SystemUserVo并关联查询
-//    return users.stream().map(this::convertToUserVo).collect(Collectors.toList());
-//  }
-
  public long countUserByArgs(SystemQueryUserArgs args) {
    LambdaQueryWrapper<SystemUserTb> wrapper = buildUserQueryWrapper(args);
    return systemUserMapper.selectCount(wrapper);
@@ -385,7 +371,7 @@ public class SystemUserService {
      c.or();
      c.like(SystemUserTb::getNickName, args.getBlurry());
    });
-    return systemUserMapper.selectPage(new Page<>(args.getPage(), 50), wrapper).getRecords().stream().map(m -> {
+    return systemUserMapper.selectPage(new Page<>(pageArgs.getPage(), 50), wrapper).getRecords().stream().map(m -> {
      Map<String, Object> ext = new HashMap<>(1);
      ext.put("id", m.getId());
      ext.put("deptId", m.getDeptId());