1。修复这些接口的bug

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/StorageController.java

@@ -10,6 +10,7 @@ import vip.xiaonuo.disk.domain.CapacityAuditInfo;
 import vip.xiaonuo.disk.domain.StorageBean;
 import vip.xiaonuo.disk.dto.storage.GetUserStorageDTO;
 import vip.xiaonuo.disk.service.IStorageService;
+import vip.xiaonuo.disk.util.TableDataInfo;
 import vip.xiaonuo.disk.vo.storage.CapacityAuditInfoVo;
 import vip.xiaonuo.disk.vo.storage.StorageBeanVO;
 
@@ -58,7 +59,7 @@ public class StorageController {
      * @return 所有用户的存储空间大小
      */
     @PostMapping("/storage/getUserStorageList")
-    public CommonResult<Page<StorageBeanVO>> getUserStorageList(@RequestBody GetUserStorageDTO getUserStorageDTO) {
+    public CommonResult<TableDataInfo<StorageBeanVO>> getUserStorageList(@RequestBody GetUserStorageDTO getUserStorageDTO) {
         return storageService.getUserStorageList(getUserStorageDTO);
     }
 
@@ -109,11 +110,11 @@ public class StorageController {
      * @return 存储空间大小变更申请列表
      */
     @GetMapping("/storage/getCapacityAuditList")
-    public CommonResult<IPage<CapacityAuditInfoVo>> getCapacityAuditList(@RequestParam(value = "pageNum") Integer pageNum,
+    public CommonResult<TableDataInfo<CapacityAuditInfoVo>> getCapacityAuditList(@RequestParam(value = "pageNum") Integer pageNum,
                                                                          @RequestParam(value = "pageSize") Integer pageSize,
                                                                          @RequestParam(value = "auditState", required = false) Integer auditState,
                                                                          @RequestParam(value = "usernameOrNickname", required = false) String usernameOrNickname) {
-        return storageService.getCapacityAuditList(new Page<>(pageNum, pageSize), auditState, usernameOrNickname);
+        return storageService.getCapacityAuditList(pageNum, pageSize, auditState, usernameOrNickname);
     }
 
     /**
@@ -154,10 +155,10 @@ public class StorageController {
      * @return 申请记录列表
      */
     @GetMapping("/storage/getUserCapacityAuditList")
-    public CommonResult<IPage<CapacityAuditInfoVo>> getUserCapacityAuditList(@RequestParam(value = "pageNum") Integer pageNum,
+    public CommonResult<TableDataInfo<CapacityAuditInfoVo>> getUserCapacityAuditList(@RequestParam(value = "pageNum") Integer pageNum,
                                                                              @RequestParam(value = "pageSize") Integer pageSize,
                                                                              @RequestParam(value = "auditState", required = false) Integer auditState) {
-        return storageService.getUserCapacityAuditList(new Page<>(pageNum, pageSize), auditState);
+        return storageService.getUserCapacityAuditList(pageNum, pageSize, auditState);
     }
 
 

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/dto/storage/GetUserStorageDTO.java

@@ -56,6 +56,16 @@ public class GetUserStorageDTO {
     @ApiModelProperty(value = "每页条数")
     private Integer size;
 
+    /**
+     * 分页大小
+     */
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    private Integer pageNum;
+
     /** 排序字段 */
     @ApiModelProperty(value = "排序字段，字段驼峰名称，如：userName")
     private String sortField;

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/CapacityAuditInfoMapper.java

@@ -21,7 +21,7 @@ public interface CapacityAuditInfoMapper extends BaseMapper<CapacityAuditInfo> {
      * @param usernameOrNickname 用户名或昵称
      * @return 容量审核信息列表
      */
-    Page<CapacityAuditInfoVo> getCapacityAuditList(@Param("page") Page<CapacityAuditInfoVo> page, @Param("auditState") Integer auditState, @Param("usernameOrNickname") String usernameOrNickname);
+    Page<CapacityAuditInfoVo> getCapacityAuditList(@Param("page") Page<?> page, @Param("auditState") Integer auditState, @Param("usernameOrNickname") String usernameOrNickname);
 
     /**
      * 查询存储空间大小变更申请详情
@@ -40,6 +40,6 @@ public interface CapacityAuditInfoMapper extends BaseMapper<CapacityAuditInfo> {
      *
      * @return 申请记录列表
      */
-    Page<CapacityAuditInfoVo> getUserCapacityAuditList(@Param("page") Page<CapacityAuditInfoVo> page, @Param("auditState") Integer auditState, @Param("id") String id);
+    Page<CapacityAuditInfoVo> getUserCapacityAuditList(@Param("page") Page<?> page, @Param("auditState") Integer auditState, @Param("id") String id);
 
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/IStorageService.java

@@ -8,6 +8,7 @@ import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.disk.domain.CapacityAuditInfo;
 import vip.xiaonuo.disk.domain.StorageBean;
 import vip.xiaonuo.disk.dto.storage.GetUserStorageDTO;
+import vip.xiaonuo.disk.util.TableDataInfo;
 import vip.xiaonuo.disk.vo.storage.CapacityAuditInfoVo;
 import vip.xiaonuo.disk.vo.storage.StorageBeanVO;
 
@@ -36,7 +37,7 @@ public interface IStorageService extends IService<StorageBean> {
      *
      * @return 所有用户的存储空间大小
      */
-    CommonResult<Page<StorageBeanVO>> getUserStorageList(GetUserStorageDTO getUserStorageDTO);
+    CommonResult<TableDataInfo<StorageBeanVO>> getUserStorageList(GetUserStorageDTO getUserStorageDTO);
 
     /**
      * 更改用户的存储空间大小 单位MB
@@ -71,7 +72,7 @@ public interface IStorageService extends IService<StorageBean> {
      * @param usernameOrNickname 用户名或昵称
      * @return 审核列表信息
      */
-    CommonResult<IPage<CapacityAuditInfoVo>> getCapacityAuditList(Page<Object> objectPage, Integer auditState, String usernameOrNickname);
+    CommonResult<TableDataInfo<CapacityAuditInfoVo>> getCapacityAuditList(Integer pageNum, Integer pageSize, Integer auditState, String usernameOrNickname);
 
     /**
      * 查询存储空间大小变更申请详情
@@ -99,5 +100,5 @@ public interface IStorageService extends IService<StorageBean> {
      *
      * @return 申请记录列表
      */
-    CommonResult<IPage<CapacityAuditInfoVo>> getUserCapacityAuditList(Page<Object> objectPage, Integer auditState);
+    CommonResult<TableDataInfo<CapacityAuditInfoVo>> getUserCapacityAuditList(Integer pageNum, Integer pageSize, Integer auditState);
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/StorageService.java

@@ -23,6 +23,8 @@ import vip.xiaonuo.disk.mapper.UserFileMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.disk.util.PageQuery;
+import vip.xiaonuo.disk.util.TableDataInfo;
 import vip.xiaonuo.disk.vo.storage.CapacityAuditInfoVo;
 import vip.xiaonuo.disk.vo.storage.StorageBeanVO;
 
@@ -129,9 +131,11 @@ public class StorageService extends ServiceImpl<StorageMapper, StorageBean> impl
     }
 
     @Override
-    public CommonResult<Page<StorageBeanVO>> getUserStorageList(GetUserStorageDTO getUserStorageDTO) {
-        Page<StorageBeanVO> page = new Page<>(getUserStorageDTO.getCurrent(), getUserStorageDTO.getSize());
-        Page<StorageBeanVO> storageBeanList = storageMapper.getUserStorageList(page, getUserStorageDTO);
+    public CommonResult<TableDataInfo<StorageBeanVO>> getUserStorageList(GetUserStorageDTO getUserStorageDTO) {
+        PageQuery pageQuery = new PageQuery();
+        pageQuery.setPageNum(getUserStorageDTO.getPageNum());
+        pageQuery.setPageSize(getUserStorageDTO.getPageSize());
+        Page<StorageBeanVO> storageBeanList = storageMapper.getUserStorageList(pageQuery.build(), getUserStorageDTO);
         if (storageBeanList.getRecords() != null && storageBeanList.getSize() > 0) {
             // 如果查出的数据不为空，关联用户的角色
             for (StorageBeanVO storageBean : storageBeanList.getRecords()) {
@@ -142,7 +146,7 @@ public class StorageService extends ServiceImpl<StorageMapper, StorageBean> impl
                 }
             }
         }
-        return CommonResult.data(storageBeanList);
+        return CommonResult.data(TableDataInfo.build(storageBeanList));
     }
 
     @Override
@@ -214,10 +218,12 @@ public class StorageService extends ServiceImpl<StorageMapper, StorageBean> impl
     }
 
     @Override
-    public CommonResult<IPage<CapacityAuditInfoVo>> getCapacityAuditList(Page<Object> objectPage, Integer auditState, String usernameOrNickname) {
+    public CommonResult<TableDataInfo<CapacityAuditInfoVo>> getCapacityAuditList(Integer pageNum, Integer pageSize, Integer auditState, String usernameOrNickname) {
         // 查询审核列表
-        Page<CapacityAuditInfoVo> page = new Page<>(objectPage.getCurrent(), objectPage.getSize());
-        Page<CapacityAuditInfoVo> capacityAuditInfos = capacityAuditInfoMapper.getCapacityAuditList(page, auditState, usernameOrNickname);
+        PageQuery pageQuery = new PageQuery();
+        pageQuery.setPageNum(pageNum);
+        pageQuery.setPageSize(pageSize);
+        Page<CapacityAuditInfoVo> capacityAuditInfos = capacityAuditInfoMapper.getCapacityAuditList(pageQuery.build(), auditState, usernameOrNickname);
         // 关联申请人的角色
         if (capacityAuditInfos.getRecords().size() > 0) {
             for (CapacityAuditInfoVo record : capacityAuditInfos.getRecords()) {
@@ -228,7 +234,7 @@ public class StorageService extends ServiceImpl<StorageMapper, StorageBean> impl
                 }
             }
         }
-        return CommonResult.data(capacityAuditInfos);
+        return CommonResult.data(TableDataInfo.build(capacityAuditInfos));
     }
 
     @Override
@@ -285,11 +291,13 @@ public class StorageService extends ServiceImpl<StorageMapper, StorageBean> impl
     }
 
     @Override
-    public CommonResult<IPage<CapacityAuditInfoVo>> getUserCapacityAuditList(Page<Object> objectPage, Integer auditState) {
+    public CommonResult<TableDataInfo<CapacityAuditInfoVo>> getUserCapacityAuditList(Integer pageNum, Integer pageSize, Integer auditState) {
         // 查询审核列表
-        Page<CapacityAuditInfoVo> page = new Page<>(objectPage.getCurrent(), objectPage.getSize());
+        PageQuery pageQuery = new PageQuery();
+        pageQuery.setPageNum(pageNum);
+        pageQuery.setPageSize(pageSize);
         String id = StpLoginUserUtil.getLoginUser().getId();
-        Page<CapacityAuditInfoVo> capacityAuditInfos = capacityAuditInfoMapper.getUserCapacityAuditList(page, auditState, id);
+        Page<CapacityAuditInfoVo> capacityAuditInfos = capacityAuditInfoMapper.getUserCapacityAuditList(pageQuery.build(), auditState, id);
         // 关联申请人的角色
         if (capacityAuditInfos.getRecords().size() > 0) {
             for (CapacityAuditInfoVo record : capacityAuditInfos.getRecords()) {
@@ -300,7 +308,7 @@ public class StorageService extends ServiceImpl<StorageMapper, StorageBean> impl
                 }
             }
         }
-        return CommonResult.data(capacityAuditInfos);
+        return CommonResult.data(TableDataInfo.build(capacityAuditInfos));
     }