浏览代码

chore[litemall-core]: 数组对象统一调整成data的list和total

Junling Bu 6 年之前
父节点
当前提交
d60e90b02e
共有 1 个文件被更改,包括 16 次插入6 次删除
  1. 16 6
      litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java

+ 16 - 6
litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java

@@ -1,6 +1,9 @@
 package org.linlinjava.litemall.core.util;
 package org.linlinjava.litemall.core.util;
 
 
+import com.github.pagehelper.Page;
+
 import java.util.HashMap;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 /**
 /**
@@ -52,12 +55,19 @@ public class ResponseUtil {
         return obj;
         return obj;
     }
     }
 
 
-    public static Object ok(String errmsg, Object data) {
-        Map<String, Object> obj = new HashMap<String, Object>();
-        obj.put("errno", 0);
-        obj.put("errmsg", errmsg);
-        obj.put("data", data);
-        return obj;
+    public static Object okList(List list) {
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put("list", list);
+
+        if (list instanceof Page) {
+            Page page = (Page) list;
+            data.put("total", page.getTotal());
+        }
+        else{
+            data.put("total", list.size());
+        }
+
+        return ok(data);
     }
     }
 
 
     public static Object fail() {
     public static Object fail() {