Skip to content

Commit 01c1831

Browse files
linlinjavalinlinjava
committed
chore: 利用PageHelper的PageInfo简化代码。
1 parent d40b914 commit 01c1831

File tree

50 files changed

+70
-461
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+70
-461
lines changed

‎litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.linlinjava.litemall.admin.service;
22

3+
import com.github.pagehelper.PageInfo;
34
import org.apache.commons.logging.Log;
45
import org.apache.commons.logging.LogFactory;
56
import org.linlinjava.litemall.admin.dao.GoodsAllinone;
@@ -49,7 +50,7 @@ public class AdminGoodsService {
4950
public Object list(String goodsSn, String name,
5051
Integer page, Integer limit, String sort, String order) {
5152
List<LitemallGoods> goodsList = goodsService.querySelective(goodsSn, name, page, limit, sort, order);
52-
int total = goodsService.countSelective(goodsSn, name, page, limit, sort, order);
53+
long total = PageInfo.of(goodsList).getTotal();
5354
Map<String, Object> data = new HashMap<>();
5455
data.put("total", total);
5556
data.put("items", goodsList);

‎litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
55
import com.github.binarywang.wxpay.exception.WxPayException;
66
import com.github.binarywang.wxpay.service.WxPayService;
7+
import com.github.pagehelper.PageInfo;
78
import org.apache.commons.logging.Log;
89
import org.apache.commons.logging.LogFactory;
910
import org.linlinjava.litemall.core.notify.NotifyService;
@@ -52,7 +53,7 @@ public class AdminOrderService {
5253
public Object list(Integer userId, String orderSn, List<Short> orderStatusArray,
5354
Integer page, Integer limit, String sort, String order) {
5455
List<LitemallOrder> orderList = orderService.querySelective(userId, orderSn, orderStatusArray, page, limit, sort, order);
55-
int total = orderService.countSelective(userId, orderSn, orderStatusArray, page, limit, sort, order);
56+
long total = PageInfo.of(orderList).getTotal();
5657

5758
Map<String, Object> data = new HashMap<>();
5859
data.put("total", total);

‎litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.linlinjava.litemall.admin.web;
22

3+
import com.github.pagehelper.PageInfo;
34
import org.apache.commons.logging.Log;
45
import org.apache.commons.logging.LogFactory;
56
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -37,7 +38,7 @@ public Object list(String name, String content,
3738
@Sort @RequestParam(defaultValue = "add_time") String sort,
3839
@Order @RequestParam(defaultValue = "desc") String order) {
3940
List<LitemallAd> adList = adService.querySelective(name, content, page, limit, sort, order);
40-
int total = adService.countSelective(name, content, page, limit, sort, order);
41+
long total = PageInfo.of(adList).getTotal();
4142
Map<String, Object> data = new HashMap<>();
4243
data.put("total", total);
4344
data.put("items", adList);

‎litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAddressController.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.linlinjava.litemall.admin.web;
22

3+
import com.github.pagehelper.PageInfo;
34
import org.apache.commons.logging.Log;
45
import org.apache.commons.logging.LogFactory;
56
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -63,7 +64,7 @@ public Object list(Integer userId, String name,
6364
@Order @RequestParam(defaultValue = "desc") String order) {
6465

6566
List<LitemallAddress> addressList = addressService.querySelective(userId, name, page, limit, sort, order);
66-
int total = addressService.countSelective(userId, name, page, limit, sort, order);
67+
long total = PageInfo.of(addressList).getTotal();
6768

6869
List<Map<String, Object>> addressVoList = new ArrayList<>(addressList.size());
6970
for (LitemallAddress address : addressList) {

‎litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.linlinjava.litemall.admin.web;
22

3+
import com.github.pagehelper.PageInfo;
34
import org.apache.commons.logging.Log;
45
import org.apache.commons.logging.LogFactory;
56
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -41,7 +42,7 @@ public Object list(String username,
4142
@Sort @RequestParam(defaultValue = "add_time") String sort,
4243
@Order @RequestParam(defaultValue = "desc") String order) {
4344
List<LitemallAdmin> adminList = adminService.querySelective(username, page, limit, sort, order);
44-
int total = adminService.countSelective(username, page, limit, sort, order);
45+
long total = PageInfo.of(adminList).getTotal();
4546
Map<String, Object> data = new HashMap<>();
4647
data.put("total", total);
4748
data.put("items", adminList);

‎litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminBrandController.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.linlinjava.litemall.admin.web;
22

3+
import com.github.pagehelper.PageInfo;
34
import org.apache.commons.logging.Log;
45
import org.apache.commons.logging.LogFactory;
56
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -38,7 +39,7 @@ public Object list(String id, String name,
3839
@Sort @RequestParam(defaultValue = "add_time") String sort,
3940
@Order @RequestParam(defaultValue = "desc") String order) {
4041
List<LitemallBrand> brandList = brandService.querySelective(id, name, page, limit, sort, order);
41-
int total = brandService.countSelective(id, name, page, limit, sort, order);
42+
long total = PageInfo.of(brandList).getTotal();
4243
Map<String, Object> data = new HashMap<>();
4344
data.put("total", total);
4445
data.put("items", brandList);

‎litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.linlinjava.litemall.admin.web;
22

3+
import com.github.pagehelper.PageInfo;
34
import org.apache.commons.logging.Log;
45
import org.apache.commons.logging.LogFactory;
56
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -38,7 +39,7 @@ public Object list(String id, String name,
3839
@Sort @RequestParam(defaultValue = "add_time") String sort,
3940
@Order @RequestParam(defaultValue = "desc") String order) {
4041
List<LitemallCategory> collectList = categoryService.querySelective(id, name, page, limit, sort, order);
41-
int total = categoryService.countSelective(id, name, page, limit, sort, order);
42+
long total = PageInfo.of(collectList).getTotal();
4243
Map<String, Object> data = new HashMap<>();
4344
data.put("total", total);
4445
data.put("items", collectList);

‎litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCollectController.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.linlinjava.litemall.admin.web;
22

3+
import com.github.pagehelper.PageInfo;
34
import org.apache.commons.logging.Log;
45
import org.apache.commons.logging.LogFactory;
56
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -39,7 +40,7 @@ public Object list(String userId, String valueId,
3940
@Sort @RequestParam(defaultValue = "add_time") String sort,
4041
@Order @RequestParam(defaultValue = "desc") String order) {
4142
List<LitemallCollect> collectList = collectService.querySelective(userId, valueId, page, limit, sort, order);
42-
int total = collectService.countSelective(userId, valueId, page, limit, sort, order);
43+
long total = PageInfo.of(collectList).getTotal();
4344
Map<String, Object> data = new HashMap<>();
4445
data.put("total", total);
4546
data.put("items", collectList);

‎litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCommentController.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.linlinjava.litemall.admin.web;
22

3+
import com.github.pagehelper.PageInfo;
34
import org.apache.commons.logging.Log;
45
import org.apache.commons.logging.LogFactory;
56
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -35,7 +36,7 @@ public Object list(String userId, String valueId,
3536
@Sort @RequestParam(defaultValue = "add_time") String sort,
3637
@Order @RequestParam(defaultValue = "desc") String order) {
3738
List<LitemallComment> brandList = commentService.querySelective(userId, valueId, page, limit, sort, order);
38-
int total = commentService.countSelective(userId, valueId, page, limit, sort, order);
39+
long total = PageInfo.of(brandList).getTotal();
3940
Map<String, Object> data = new HashMap<>();
4041
data.put("total", total);
4142
data.put("items", brandList);

‎litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.linlinjava.litemall.admin.web;
22

3+
import com.github.pagehelper.PageInfo;
34
import org.apache.commons.logging.Log;
45
import org.apache.commons.logging.LogFactory;
56
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -42,7 +43,7 @@ public Object list(String name, Short type, Short status,
4243
@Sort @RequestParam(defaultValue = "add_time") String sort,
4344
@Order @RequestParam(defaultValue = "desc") String order) {
4445
List<LitemallCoupon> couponList = couponService.querySelective(name, type, status, page, limit, sort, order);
45-
int total = couponService.countSelective(name, type, status, page, limit, sort, order);
46+
long total = PageInfo.of(couponList).getTotal();
4647
Map<String, Object> data = new HashMap<>();
4748
data.put("total", total);
4849
data.put("items", couponList);
@@ -59,7 +60,7 @@ public Object listuser(Integer userId, Integer couponId, Short status,
5960
@Sort @RequestParam(defaultValue = "add_time") String sort,
6061
@Order @RequestParam(defaultValue = "desc") String order) {
6162
List<LitemallCouponUser> couponList = couponUserService.queryList(userId, couponId, status, page, limit, sort, order);
62-
int total = couponUserService.countList(userId, couponId, status, page, limit, sort, order);
63+
long total = PageInfo.of(couponList).getTotal();
6364
Map<String, Object> data = new HashMap<>();
6465
data.put("total", total);
6566
data.put("items", couponList);

0 commit comments

Comments
 (0)