修改后台分页参数

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/QueryAdminDynamicParam.java

@@ -1,10 +1,12 @@
 package com.chelvc.cloud.vehicle.api.param;
 
+import com.chelvc.framework.common.model.Paging;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -51,4 +53,10 @@ public class QueryAdminDynamicParam implements Serializable {
    * 审核结果：0-未违规；1-疑似违规；2-违规
    */
   private Integer examineResult;
+
+  /**
+   * 分页信息
+   */
+  @NotNull(message = "分页不能为空")
+  private Paging paging;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/QueryPlatformProfitRatioParam.java

@@ -1,10 +1,12 @@
 package com.chelvc.cloud.vehicle.api.param;
 
+import com.chelvc.framework.common.model.Paging;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data
@@ -16,4 +18,10 @@ public class QueryPlatformProfitRatioParam implements Serializable {
     private static final long serialVersionUID = -1491557397318158754L;
 
     private Long userId;
+
+    /**
+     * 分页信息
+     */
+    @NotNull(message = "分页不能为空")
+    private Paging paging;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/QueryProfitRatioConfigParam.java

@@ -1,10 +1,12 @@
 package com.chelvc.cloud.vehicle.api.param;
 
+import com.chelvc.framework.common.model.Paging;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data
@@ -22,4 +24,10 @@ public class QueryProfitRatioConfigParam implements Serializable {
      * 状态：0-正常；1-停用
      */
     private Integer status;
+
+    /**
+     * 分页信息
+     */
+    @NotNull(message = "分页不能为空")
+    private Paging paging;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/QueryRankAwardConfigParam.java

@@ -1,10 +1,12 @@
 package com.chelvc.cloud.vehicle.api.param;
 
+import com.chelvc.framework.common.model.Paging;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data
@@ -26,4 +28,10 @@ public class QueryRankAwardConfigParam implements Serializable {
      * 状态：0-正常；1-停用
      */
     private Integer status;
+
+    /**
+     * 分页信息
+     */
+    @NotNull(message = "分页不能为空")
+    private Paging paging;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/QueryRankAwardRecordParam.java

@@ -1,10 +1,12 @@
 package com.chelvc.cloud.vehicle.api.param;
 
+import com.chelvc.framework.common.model.Paging;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data
@@ -26,4 +28,10 @@ public class QueryRankAwardRecordParam implements Serializable {
      * 周期
      */
     private Integer period;
+
+    /**
+     * 分页信息
+     */
+    @NotNull(message = "分页不能为空")
+    private Paging paging;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/DynamicCommentService.java

@@ -24,8 +24,7 @@ public interface DynamicCommentService {
     /**
      * 查询动态信息列表
      */
-    Pagination<DynamicCommentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
-                                                  Long pageSize);
+    Pagination<DynamicCommentDTO> queryAdminPageList(QueryAdminDynamicParam param);
 
     /**
      * 修改动态评论

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/DynamicContentService.java

@@ -31,8 +31,7 @@ public interface DynamicContentService {
   /**
    * 查询动态信息列表
    */
-  Pagination<DynamicContentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
-                                                Long pageSize);
+  Pagination<DynamicContentDTO> queryAdminPageList(QueryAdminDynamicParam param);
 
   /**
    * 查询动态信息列表

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/PlatformProfitRatioService.java

@@ -9,5 +9,5 @@ public interface PlatformProfitRatioService {
 
     void edit(EditPlatformProfitRatioParam param);
 
-    Pagination<PlatformProfitRatioDTO> queryPageList(QueryPlatformProfitRatioParam param, Long pageNum, Long pageSize);
+    Pagination<PlatformProfitRatioDTO> queryPageList(QueryPlatformProfitRatioParam param);
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/ProfitRatioConfigService.java

@@ -5,7 +5,6 @@ import com.chelvc.cloud.vehicle.api.param.AddProfitRatioConfigParams;
 import com.chelvc.cloud.vehicle.api.param.EditProfitRatioConfigParams;
 import com.chelvc.cloud.vehicle.api.param.QueryProfitRatioConfigParam;
 import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.common.model.Paging;
 
 public interface ProfitRatioConfigService {
 
@@ -15,6 +14,6 @@ public interface ProfitRatioConfigService {
 
     void delete(Long id, Long userId);
 
-    Pagination<ProfitRatioConfigDTO> queryPageList(QueryProfitRatioConfigParam param, Paging paging);
+    Pagination<ProfitRatioConfigDTO> queryPageList(QueryProfitRatioConfigParam param);
 
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/RankAwardConfigService.java

@@ -14,6 +14,6 @@ public interface RankAwardConfigService {
 
     void delete(Long id, Long userId);
 
-    Pagination<RankAwardConfigDTO> queryPageList(QueryRankAwardConfigParam param, int number, int size);
+    Pagination<RankAwardConfigDTO> queryPageList(QueryRankAwardConfigParam param);
 
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/RankAwardRecordService.java

@@ -7,8 +7,7 @@ import com.chelvc.framework.common.model.Pagination;
 
 public interface RankAwardRecordService {
 
-    Pagination<RankAwardRecordDTO> queryPageList(QueryRankAwardRecordParam param, Integer pageNum,
-                                                 Integer pageSize);
+    Pagination<RankAwardRecordDTO> queryPageList(QueryRankAwardRecordParam param);
 
     void handOutPrize(HandRankAwardParam param);
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/DynamicCommentService.java

@@ -4,7 +4,6 @@ package com.chelvc.cloud.vehicle.server.service;
 import com.chelvc.cloud.vehicle.api.constant.ExamineType;
 import com.chelvc.cloud.vehicle.api.dto.DynamicCommentDTO;
 import com.chelvc.cloud.vehicle.api.param.AddDynamicCommentParam;
-import com.chelvc.cloud.vehicle.api.param.QueryAdminDynamicParam;
 import com.chelvc.cloud.vehicle.api.param.QueryDynamicCommentParam;
 import com.chelvc.framework.common.model.Pagination;
 
@@ -21,12 +20,6 @@ public interface DynamicCommentService {
      */
     Pagination<DynamicCommentDTO> queryPageList(QueryDynamicCommentParam param, Integer pageNum, Integer pageSize);
 
-    /**
-     * 查询动态信息列表
-     */
-    Pagination<DynamicCommentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
-                                                  Long pageSize);
-
     /**
      * 修改动态评论
      */

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/DynamicContentService.java

@@ -3,7 +3,6 @@ package com.chelvc.cloud.vehicle.server.service;
 import com.chelvc.cloud.vehicle.api.constant.ExamineType;
 import com.chelvc.cloud.vehicle.api.dto.DynamicContentDTO;
 import com.chelvc.cloud.vehicle.api.param.AddDynamicContentParam;
-import com.chelvc.cloud.vehicle.api.param.QueryAdminDynamicParam;
 import com.chelvc.cloud.vehicle.api.param.QueryDynamicContentParam;
 import com.chelvc.framework.common.model.Pagination;
 
@@ -28,12 +27,6 @@ public interface DynamicContentService {
   Pagination<DynamicContentDTO> queryPageList(QueryDynamicContentParam param, Integer pageNum,
                                               Integer pageSize, Long userId);
 
-  /**
-   * 查询动态信息列表
-   */
-  Pagination<DynamicContentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
-                                                Long pageSize);
-
   /**
    * 查询动态信息列表
    */

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicCommentServiceImpl.java

@@ -1,11 +1,5 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.lock.annotation.Lock4j;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -31,6 +25,7 @@ import com.chelvc.cloud.vehicle.server.service.DynamicContentService;
 import com.chelvc.cloud.vehicle.server.service.DynamicEvaluateRecordService;
 import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 import com.chelvc.framework.common.util.ObjectUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -41,6 +36,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
  * @PACKAGE_NAME: net.yeeu.collision.dynamic.service.impl
  * @NAME: DynamicCommentServiceImpl
@@ -110,9 +111,9 @@ public class DynamicCommentServiceImpl implements DynamicCommentService,
     }
 
     @Override
-    public Pagination<DynamicCommentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
-                                                            Long pageSize) {
-        Page<DynamicCommentDTO> page = new Page<>(pageNum, pageSize);
+    public Pagination<DynamicCommentDTO> queryAdminPageList(QueryAdminDynamicParam param) {
+        Paging paging = param.getPaging();
+        Page<DynamicCommentDTO> page = new Page<>(paging.getNumber(), paging.getSize());
         IPage<DynamicCommentDTO> result = null;
         if (param == null) {
             return new Pagination<>();

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicContentServiceImpl.java

@@ -26,6 +26,7 @@ import com.chelvc.cloud.vehicle.server.service.DynamicEvaluateRecordService;
 import com.chelvc.cloud.vehicle.server.service.DynamicResourceService;
 import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -203,9 +204,9 @@ public class DynamicContentServiceImpl implements DynamicContentService, com.che
   }
 
   @Override
-  public Pagination<DynamicContentDTO> queryAdminPageList(QueryAdminDynamicParam param,
-                                                          Long pageNum, Long pageSize) {
-    Page<DynamicContentDTO> page = new Page<>(pageNum, pageSize);
+  public Pagination<DynamicContentDTO> queryAdminPageList(QueryAdminDynamicParam param) {
+    Paging paging = param.getPaging();
+    Page<DynamicContentDTO> page = new Page<>(paging.getNumber(), paging.getSize());
     IPage<DynamicContentDTO> result = null;
     if (param == null) {
       return new Pagination<>();

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/PlatformProfitRatioServiceImpl.java

@@ -16,6 +16,7 @@ import com.chelvc.cloud.vehicle.server.service.IOmsOrderService;
 import com.chelvc.cloud.vehicle.server.service.PlatformProfitRatioService;
 import com.chelvc.cloud.vehicle.server.service.ProfitRatioConfigService;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +56,7 @@ public class PlatformProfitRatioServiceImpl extends ServiceImpl<PlatformProfitRa
         }
         while (pageNum <= pages) {
             Pagination<PlatformProfitRatioDTO> platformProfitRatioDTOPagination =
-                    queryPageList(null, new Integer(pageNum).longValue(), new Integer(pageSize).longValue());
+                    queryPageList(pageNum, pageSize);
             List<PlatformProfitRatioDTO> records = platformProfitRatioDTOPagination.getRecords();
             if (!CollectionUtils.isEmpty(records)) {
                 for (PlatformProfitRatioDTO dto : records) {
@@ -86,13 +87,20 @@ public class PlatformProfitRatioServiceImpl extends ServiceImpl<PlatformProfitRa
     }
 
     @Override
-    public Pagination<PlatformProfitRatioDTO> queryPageList(QueryPlatformProfitRatioParam param, Long pageNum,
-                                                            Long pageSize) {
-        Page<PlatformProfitRatioDTO> page = new Page<>(pageNum, pageSize);
+    public Pagination<PlatformProfitRatioDTO> queryPageList(QueryPlatformProfitRatioParam param) {
+        Paging paging = param.getPaging();
+        Page<PlatformProfitRatioDTO> page = new Page<>(paging.getNumber(), paging.getSize());
+        QueryWrapper<PlatformProfitRatioDTO> wrapper = Wrappers.query();
+        wrapper.eq(param.getUserId() != null, "t.user_id", param.getUserId());
+        wrapper.orderByAsc("t.create_time");
+        IPage<PlatformProfitRatioDTO> result = baseMapper.queryPageList(page, wrapper);
+        return Pagination.<PlatformProfitRatioDTO>builder().total(result.getTotal()).pages(result.getPages())
+                .records(result.getRecords()).build();
+    }
+
+    public Pagination<PlatformProfitRatioDTO> queryPageList(Integer number, Integer size) {
+        Page<PlatformProfitRatioDTO> page = new Page<>(number, size);
         QueryWrapper<PlatformProfitRatioDTO> wrapper = Wrappers.query();
-        if (param != null) {
-            wrapper.eq(param.getUserId() != null, "t.user_id", param.getUserId());
-        }
         wrapper.orderByAsc("t.create_time");
         IPage<PlatformProfitRatioDTO> result = baseMapper.queryPageList(page, wrapper);
         return Pagination.<PlatformProfitRatioDTO>builder().total(result.getTotal()).pages(result.getPages())

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/ProfitRatioConfigServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.vehicle.api.dto.ProfitRatioConfigDTO;
 import com.chelvc.cloud.vehicle.api.param.AddProfitRatioConfigParams;
@@ -78,7 +77,8 @@ public class ProfitRatioConfigServiceImpl extends ServiceImpl<ProfitRatioConfigM
     }
 
     @Override
-    public Pagination<ProfitRatioConfigDTO> queryPageList(QueryProfitRatioConfigParam param, Paging paging) {
+    public Pagination<ProfitRatioConfigDTO> queryPageList(QueryProfitRatioConfigParam param) {
+        Paging paging = param.getPaging();
         QueryWrapper<ProfitRatioConfig> wrapper = Wrappers.query();
         wrapper.eq(param.getType() != null, "type", param.getType());
         wrapper.eq(param.getStatus() != null, "status", param.getStatus());

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/RankAwardConfigServiceImpl.java

@@ -16,6 +16,7 @@ import com.chelvc.cloud.vehicle.server.entity.RankAwardConfig;
 import com.chelvc.cloud.vehicle.server.service.RankAwardConfigService;
 import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -115,8 +116,9 @@ public class RankAwardConfigServiceImpl extends ServiceImpl<RankAwardConfigMappe
     }
 
     @Override
-    public Pagination<RankAwardConfigDTO> queryPageList(QueryRankAwardConfigParam param, int number, int size) {
-        Page<RankAwardConfigDTO> page = new Page<>(number, size);
+    public Pagination<RankAwardConfigDTO> queryPageList(QueryRankAwardConfigParam param) {
+        Paging paging = param.getPaging();
+        Page<RankAwardConfigDTO> page = new Page<>(paging.getNumber(), paging.getSize());
         QueryWrapper<RankAwardConfig> wrapper = Wrappers.query();
         wrapper.eq(param.getType() != null, "type", param.getType());
         wrapper.eq(param.getPlatformType() != null, "platform_type", param.getPlatformType());

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/RankAwardRecordServiceImpl.java

@@ -1,14 +1,5 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -32,6 +23,7 @@ import com.chelvc.cloud.vehicle.server.service.MerchantService;
 import com.chelvc.cloud.vehicle.server.service.RankAwardConfigService;
 import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 import com.chelvc.framework.common.util.ObjectUtils;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
@@ -39,6 +31,15 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 @DubboService(interfaceClass = com.chelvc.cloud.vehicle.api.service.RankAwardRecordService.class)
 public class RankAwardRecordServiceImpl extends ServiceImpl<RankAwardRecordMapper, RankAwardRecord> implements RankAwardRecordService {
@@ -50,8 +51,9 @@ public class RankAwardRecordServiceImpl extends ServiceImpl<RankAwardRecordMappe
     private final MerchantService merchantService;
 
     @Override
-    public Pagination<RankAwardRecordDTO> queryPageList(QueryRankAwardRecordParam param, Integer pageNum, Integer pageSize) {
-        Page<RankAwardRecordDTO> page = new Page<>(pageNum, pageSize);
+    public Pagination<RankAwardRecordDTO> queryPageList(QueryRankAwardRecordParam param) {
+        Paging paging = param.getPaging();
+        Page<RankAwardRecordDTO> page = new Page<>(paging.getNumber(), paging.getSize());
         QueryWrapper<RankAwardConfig> wrapper = Wrappers.query();
         wrapper.eq(param.getType() != null, "r.type", param.getType());
         wrapper.eq(param.getPlatformType() != null, "r.platform_type", param.getPlatformType());