chore[litemall-admin, litemall-admin-api]: 调整管理后台的数组对象使用场景

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

 package org.linlinjava.litemall.admin.service;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.admin.dto.GoodsAllinone;
@@ -49,12 +48,7 @@ public class AdminGoodsService {
     public Object list(String goodsSn, String name,
                        Integer page, Integer limit, String sort, String order) {
         List<LitemallGoods> goodsList = goodsService.querySelective(goodsSn, name, page, limit, sort, order);
-        long total = PageInfo.of(goodsList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", goodsList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(goodsList);
     }
 
     private Object validate(GoodsAllinone goodsAllinone) {

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

@@ -4,7 +4,6 @@ import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
 import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.core.notify.NotifyService;
@@ -55,13 +54,7 @@ public class AdminOrderService {
     public Object list(Integer userId, String orderSn, List<Short> orderStatusArray,
                        Integer page, Integer limit, String sort, String order) {
         List<LitemallOrder> orderList = orderService.querySelective(userId, orderSn, orderStatusArray, page, limit, sort, order);
-        long total = PageInfo.of(orderList).getTotal();
-
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", orderList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(orderList);
     }
 
     public Object detail(Integer id) {

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -16,9 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/admin/ad")
@@ -38,12 +35,7 @@ public class AdminAdController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallAd> adList = adService.querySelective(name, content, page, limit, sort, order);
-        long total = PageInfo.of(adList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", adList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(adList);
     }
 
     private Object validate(LitemallAd ad) {

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -18,10 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/admin/address")
@@ -44,13 +40,6 @@ public class AdminAddressController {
                        @Order @RequestParam(defaultValue = "desc") String order) {
 
         List<LitemallAddress> addressList = addressService.querySelective(userId, name, page, limit, sort, order);
-        long total = PageInfo.of(addressList).getTotal();
-
-
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", addressList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(addressList);
     }
 }

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.SecurityUtils;
@@ -21,9 +20,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import static org.linlinjava.litemall.admin.util.AdminResponseCode.*;
 
@@ -47,12 +44,7 @@ public class AdminAdminController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallAdmin> adminList = adminService.querySelective(username, page, limit, sort, order);
-        long total = PageInfo.of(adminList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", adminList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(adminList);
     }
 
     private Object validate(LitemallAdmin admin) {

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -17,9 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/admin/brand")
@@ -39,12 +36,7 @@ public class AdminBrandController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallBrand> brandList = brandService.querySelective(id, name, page, limit, sort, order);
-        long total = PageInfo.of(brandList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", brandList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(brandList);
     }
 
     private Object validate(LitemallBrand brand) {

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

@@ -64,7 +64,7 @@ public class AdminCategoryController {
             categoryVoList.add(categoryVO);
         }
 
-        return ResponseUtil.ok(categoryVoList);
+        return ResponseUtil.okList(categoryVoList);
     }
 
     private Object validate(LitemallCategory category) {
@@ -148,6 +148,6 @@ public class AdminCategoryController {
             d.put("label", category.getName());
             data.add(d);
         }
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(data);
     }
 }

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -17,9 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/admin/collect")
@@ -40,11 +37,6 @@ public class AdminCollectController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallCollect> collectList = collectService.querySelective(userId, valueId, page, limit, sort, order);
-        long total = PageInfo.of(collectList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", collectList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(collectList);
     }
 }

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -14,9 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/admin/comment")
@@ -35,13 +32,8 @@ public class AdminCommentController {
                        @RequestParam(defaultValue = "10") Integer limit,
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
-        List<LitemallComment> brandList = commentService.querySelective(userId, valueId, page, limit, sort, order);
-        long total = PageInfo.of(brandList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", brandList);
-
-        return ResponseUtil.ok(data);
+        List<LitemallComment> commentList = commentService.querySelective(userId, valueId, page, limit, sort, order);
+        return ResponseUtil.okList(commentList);
     }
 
     @RequiresPermissions("admin:comment:delete")

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -19,9 +18,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/admin/coupon")
@@ -43,12 +40,7 @@ public class AdminCouponController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallCoupon> couponList = couponService.querySelective(name, type, status, page, limit, sort, order);
-        long total = PageInfo.of(couponList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", couponList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(couponList);
     }
 
     @RequiresPermissions("admin:coupon:listuser")
@@ -60,12 +52,7 @@ public class AdminCouponController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallCouponUser> couponList = couponUserService.queryList(userId, couponId, status, page, limit, sort, order);
-        long total = PageInfo.of(couponList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", couponList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(couponList);
     }
 
     private Object validate(LitemallCoupon coupon) {

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -17,9 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author Yogeek
@@ -43,11 +40,6 @@ public class AdminFeedbackController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallFeedback> feedbackList = feedbackService.querySelective(userId, username, page, limit, sort, order);
-        long total = PageInfo.of(feedbackList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", feedbackList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(feedbackList);
     }
 }

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -17,9 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/admin/footprint")
@@ -39,11 +36,6 @@ public class AdminFootprintController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallFootprint> footprintList = footprintService.querySelective(userId, goodsId, page, limit, sort, order);
-        long total = PageInfo.of(footprintList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", footprintList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(footprintList);
     }
 }

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

@@ -70,7 +70,7 @@ public class AdminGrouponController {
 
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
-        data.put("items", records);
+        data.put("list", records);
 
         return ResponseUtil.ok(data);
     }
@@ -84,12 +84,7 @@ public class AdminGrouponController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallGrouponRules> rulesList = rulesService.querySelective(goodsId, page, limit, sort, order);
-        long total = PageInfo.of(rulesList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", rulesList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(rulesList);
     }
 
     private Object validate(LitemallGrouponRules grouponRules) {

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -16,9 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/admin/history")
@@ -36,12 +33,7 @@ public class AdminHistoryController {
                        @RequestParam(defaultValue = "10") Integer limit,
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
-        List<LitemallSearchHistory> footprintList = searchHistoryService.querySelective(userId, keyword, page, limit, sort, order);
-        long total = PageInfo.of(footprintList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", footprintList);
-
-        return ResponseUtil.ok(data);
+        List<LitemallSearchHistory> historyList = searchHistoryService.querySelective(userId, keyword, page, limit, sort, order);
+        return ResponseUtil.okList(historyList);
     }
 }

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -16,9 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/admin/issue")
@@ -38,12 +35,7 @@ public class AdminIssueController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallIssue> issueList = issueService.querySelective(question, page, limit, sort, order);
-        long total = PageInfo.of(issueList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", issueList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(issueList);
     }
 
     private Object validate(LitemallIssue issue) {

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -16,9 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/admin/keyword")
@@ -38,12 +35,7 @@ public class AdminKeywordController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallKeyword> keywordList = keywordService.querySelective(keyword, url, page, limit, sort, order);
-        long total = PageInfo.of(keywordList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", keywordList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(keywordList);
     }
 
     private Object validate(LitemallKeyword keywords) {

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -14,10 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/admin/log")
@@ -37,11 +33,6 @@ public class AdminLogController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallLog> logList = logService.querySelective(name, page, limit, sort, order);
-        long total = PageInfo.of(logList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", logList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(logList);
     }
 }

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

@@ -28,7 +28,7 @@ public class AdminRegionController {
     @GetMapping("/clist")
     public Object clist(@NotNull Integer id) {
         List<LitemallRegion> regionList = regionService.queryByPid(id);
-        return ResponseUtil.ok(regionList);
+        return ResponseUtil.okList(regionList);
     }
 
     @GetMapping("/list")
@@ -70,6 +70,6 @@ public class AdminRegionController {
             regionVoList.add(provinceVO);
         }
 
-        return ResponseUtil.ok(regionVoList);
+        return ResponseUtil.okList(regionVoList);
     }
 }

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -53,12 +52,7 @@ public class AdminRoleController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallRole> roleList = roleService.querySelective(name, page, limit, sort, order);
-        long total = PageInfo.of(roleList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", roleList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(roleList);
     }
 
     @GetMapping("/options")
@@ -73,7 +67,7 @@ public class AdminRoleController {
             options.add(option);
         }
 
-        return ResponseUtil.ok(options);
+        return ResponseUtil.okList(options);
     }
 
     @RequiresPermissions("admin:role:read")

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

 package org.linlinjava.litemall.admin.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -19,9 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.constraints.NotNull;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/admin/storage")
@@ -43,12 +40,7 @@ public class AdminStorageController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallStorage> storageList = litemallStorageService.querySelective(key, name, page, limit, sort, order);
-        long total = PageInfo.of(storageList).getTotal();
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", storageList);
-
-        return ResponseUtil.ok(data);
+        return ResponseUtil.okList(storageList);
     }
 
     @RequiresPermissions("admin:storage:create")