更新分页查询逻辑

重构ProductController和ProductServiceImpl的分页查询方法，使用新的AmisMessage和AmisPageMessage结构。简化ProductPageQueryCo类，移除冗余分页字段。

更新分页查询逻辑
重构ProductController和ProductServiceImpl的分页查询方法，使用新的AmisMessage和AmisPageMessage结构。简化ProductPageQueryCo类，移除冗余分页字段。
shaofan
1 parent 901035ed
Showing 4 changed files with 40 additions and 28 deletions
boss-report/src/main/java/com/diligrp/boss/report/controller/ProductController.java
boss-report/src/main/java/com/diligrp/boss/report/domain/co/ProductPageQueryCo.java
boss-report/src/main/java/com/diligrp/boss/report/service/impl/ProductServiceImpl.java
boss-shared/src/main/java/com/diligrp/boss/shared/domain/AmisPageMessage.java
@@ -5,6 +5,8 @@ import com.diligrp.boss.report.domain.vo.ProductVo;
 import com.diligrp.boss.report.service.ProductService;
 import com.diligrp.boss.shared.datasource.DataSourceName;
 import com.diligrp.boss.shared.datasource.DataSourceOption;
+import com.diligrp.boss.shared.domain.AmisMessage;
+import com.diligrp.boss.shared.domain.AmisPageMessage;
 import com.diligrp.boss.shared.domain.PageMessage;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -32,8 +34,9 @@ public class ProductController {
      */
     @PostMapping(value = "/paginQuery")
     @DataSourceOption(DataSourceName.SLAVE)
-    public PageMessage<ProductVo> paginQuery(@RequestBody @Validated ProductPageQueryCo productPageQueryCo) {
-        return productService.paginQuery(productPageQueryCo);
+    public AmisMessage<AmisPageMessage<?>> paginQuery(@RequestBody @Validated ProductPageQueryCo productPageQueryCo) {
+        PageMessage<ProductVo> pageMessage = productService.paginQuery(productPageQueryCo);
+        return AmisMessage.success(new AmisPageMessage<>(pageMessage.getData(),pageMessage.getTotal()));
     }
  
  
 package com.diligrp.boss.report.domain.co;
  
  
+import com.diligrp.boss.shared.domain.AmisPageQuery;
+
 import java.io.Serializable;
 import java.util.Date;
  
@@ -9,7 +11,7 @@ import java.util.Date;
  *
  * @author : kt
  */
-public class ProductPageQueryCo implements Serializable {
+public class ProductPageQueryCo extends AmisPageQuery implements Serializable {
  
  
     /**
@@ -39,15 +41,6 @@ public class ProductPageQueryCo implements Serializable {
      */
     private Integer packageType;
  
-    /**
-     * 页码
-     */
-    private Integer pageNo = 1;
-    /**
-     * 每页大小
-     */
-    private Integer pageSize = 20;
-
  
     public Date getCreateStartTime() {
         return createStartTime;
@@ -97,19 +90,4 @@ public class ProductPageQueryCo implements Serializable {
         this.packageType = packageType;
     }
  
-    public Integer getPageNo() {
-        return pageNo;
-    }
-
-    public void setPageNo(Integer pageNo) {
-        this.pageNo = pageNo;
-    }
-
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
 }
@@ -29,7 +29,7 @@ public class ProductServiceImpl implements ProductService {
  
     @Override
     public PageMessage<ProductVo> paginQuery(ProductPageQueryCo pageQueryCo) {
-        PageHelper.startPage(pageQueryCo.getPageNo(), pageQueryCo.getPageSize());
+        PageHelper.startPage(pageQueryCo.getPage(), pageQueryCo.getPerPage());
  
         List<ProductVo> productVos = productDao.queryAllByLimit(pageQueryCo);
  
+package com.diligrp.boss.shared.domain;
+
+import java.util.List;
+
+public class AmisPageMessage<T> {
+
+    private List<T> items;
+
+    private Long total;
+
+    public AmisPageMessage(List<T> items, Long total) {
+        this.items = items;
+        this.total = total;
+    }
+
+    public List<T> getItems() {
+        return items;
+    }
+
+    public void setItems(List<T> items) {
+        this.items = items;
+    }
+
+    public Long getTotal() {
+        return total;
+    }
+
+    public void setTotal(Long total) {
+        this.total = total;
+    }
+}