数据格式
+ *
+ * data: Map
+ */
+ public static Map renderSuccess(String msg, List list) {
+ return renderSuccess(msg, list, null, 0, 0, 0);
+ }
+
+ public static Map renderSuccess(String msg, Page page, String dataName) {
+ return renderSuccess(msg, page.getList(), dataName, page.getPageNumber(), page.getPageSize(), page.getTotalRow());
+ }
+
+ public static Map renderSuccess(String msg, Map map) {
+ Map rMap = new HashMap<>();
+ rMap.put("code", 200);
+ if (!StrKit.isBlank(msg)) {
+ rMap.put("msg", msg);
+ }
+ rMap.put("data", map);
+ return rMap;
+ }
+
+ public static Map renderSuccess(String msg, List list, String dataName, int pageNum, int pageSize, int total) {
+ Map rMap = new HashMap<>();
+ rMap.put("code", 200);
+ if (!StrKit.isBlank(msg)) {
+ rMap.put("msg", msg);
+ }
+ if (StrKit.isBlank(dataName)) {
+ //没有List的名称，直接把list放到data中，[]数组形式
+ rMap.put("data", list);
+ } else {
+ //有List的名称，则把list放到data中,也需要把list的 size()做为一个属性，放到data上的count属性中
+ Map _map = new HashMap<>();
+ _map.put(dataName, list);
+ _map.put("total", list.size());
+ if (pageNum > 0) {
+ _map.put("pageNum", pageNum);
+ }
+ if (pageSize > 0) {
+ _map.put("pageSize", pageSize);
+ }
+ if (total > 0) {
+ _map.put("total", total);
+ }
+ rMap.put("data", _map);
+ }
+
+ return rMap;
+ }
+
+ public static Map renderFail(String msg) {
+ return renderFail(msg, null);
+ }
+
+ public static Map renderFail(String msg, Map map) {
+ Map rMap = new HashMap<>();
+ rMap.put("code", 500);
+ if (!StrKit.isBlank(msg)) {
+ rMap.put("msg", msg);
+ }
+ if (map != null) {
+ rMap.put("data", map);
+ }
+ return rMap;
+ }
+
+ public static void main(String[] args) {
+ List list = new ArrayList<>();
+ Record record = new Record();
+ record.set("name", "张三");
+ record.set("age", 18);
+ record.set("sex", "男");
+ list.add(record);
+
+ record = new Record();
+ record.set("name", "李四");
+ record.set("age", 18);
+ record.set("sex", "男");
+ list.add(record);
+
+ System.out.println(renderSuccess("成功", list));
+
+ Page page = new Page<>();
+ page.setList(list);
+ page.setPageNumber(1);
+ page.setPageSize(100);
+ page.setTotalRow(page.getTotalRow());
+
+ System.out.println(renderSuccess("成功", page, "list"));
+
+ Map map = new HashMap<>();
+ map.put("name", "张三");
+ map.put("age", 18);
+ map.put("sex", "男");
+ System.out.println(renderSuccess("成功", map));
+
+ System.out.println(renderFail("失败"));
+ System.out.println(renderFail("失败", map));
+ }
}
diff --git a/dsRes/src/main/java/com/dsideal/resource/Menu/Controller/MenuController.java b/dsRes/src/main/java/com/dsideal/resource/Menu/Controller/MenuController.java
index 4b3f1282..6aea10d7 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Menu/Controller/MenuController.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Menu/Controller/MenuController.java
@@ -4,6 +4,7 @@ import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.dsideal.resource.Const.RetBean;
import com.dsideal.resource.Menu.Model.MenuModel;
+import com.dsideal.resource.Util.CommonUtil;
import com.dsideal.resource.Util.JwtUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.jfinal.aop.Before;
@@ -21,7 +22,7 @@ public class MenuController extends Controller {
* 功能：获取人员可以看到的菜单
*/
@Before({GET.class})
- public void getPersonMenu() throws JsonProcessingException {
+ public void getPersonMenu() {
//当前登录的人员是谁？
String token = getRequest().getHeader("Authorization");
if (token == null) {
@@ -36,10 +37,8 @@ public class MenuController extends Controller {
//所有菜单
List menuList = mm.fetchMenu(160);
- Kv kv = Kv.by("success", true);
- kv.set("message", "获取成功");
- kv.set("data", JSONUtil.parseArray(menuList));
- renderJson(kv);
+ renderJson(CommonUtil.renderSuccess(JSONUtil.parseArray(menuList)));
+
//后续需要根据人员角色菜单关系，去掉不可见菜单
}
}
diff --git a/dsRes/src/main/java/com/dsideal/resource/Util/CommonUtil.java b/dsRes/src/main/java/com/dsideal/resource/Util/CommonUtil.java
index 9af55160..b231ae10 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Util/CommonUtil.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Util/CommonUtil.java
@@ -284,7 +284,6 @@ public class CommonUtil {
}
-
/**
* 功能：验证是否为手机号
* 作者：吴缤
@@ -427,4 +426,86 @@ public class CommonUtil {
return Pattern.matches(base64Rule, str);
}
+
+ /**
+ * 按VUE的要求返回List数据格式
+ *
+ * data: Map
+ */
+ public static Map renderSuccess(String msg, List list) {
+ return renderSuccess(msg, list, null, 0, 0, 0);
+ }
+
+ public static Map renderSuccess(String msg, Page page, String dataName) {
+ return renderSuccess(msg, page.getList(), dataName, page.getPageNumber(), page.getPageSize(), page.getTotalRow());
+ }
+
+ public static Map renderSuccess(String msg, Map map) {
+ Map rMap = new HashMap<>();
+ rMap.put("code", 200);
+ if (!StrKit.isBlank(msg)) {
+ rMap.put("msg", msg);
+ }
+ rMap.put("data", map);
+ return rMap;
+ }
+
+ public static Map renderSuccess(cn.hutool.json.JSONArray jsonArray) {
+ return renderSuccess(null, jsonArray);
+ }
+
+ public static Map renderSuccess(String msg, cn.hutool.json.JSONArray jsonArray) {
+ Map rMap = new HashMap<>();
+ rMap.put("code", 200);
+ if (!StrKit.isBlank(msg)) {
+ rMap.put("msg", msg);
+ }
+ rMap.put("data", jsonArray);
+ return rMap;
+ }
+
+ public static Map renderSuccess(String msg, List list, String dataName, int pageNum, int pageSize, int total) {
+ Map rMap = new HashMap<>();
+ rMap.put("code", 200);
+ if (!StrKit.isBlank(msg)) {
+ rMap.put("msg", msg);
+ }
+ if (StrKit.isBlank(dataName)) {
+ //没有List的名称，直接把list放到data中，[]数组形式
+ rMap.put("data", list);
+ } else {
+ //有List的名称，则把list放到data中,也需要把list的 size()做为一个属性，放到data上的count属性中
+ Map _map = new HashMap<>();
+ _map.put(dataName, list);
+ _map.put("total", list.size());
+ if (pageNum > 0) {
+ _map.put("pageNum", pageNum);
+ }
+ if (pageSize > 0) {
+ _map.put("pageSize", pageSize);
+ }
+ if (total > 0) {
+ _map.put("total", total);
+ }
+ rMap.put("data", _map);
+ }
+
+ return rMap;
+ }
+
+ public static Map renderFail(String msg) {
+ return renderFail(msg, null);
+ }
+
+ public static Map renderFail(String msg, Map map) {
+ Map rMap = new HashMap<>();
+ rMap.put("code", 500);
+ if (!StrKit.isBlank(msg)) {
+ rMap.put("msg", msg);
+ }
+ if (map != null) {
+ rMap.put("data", map);
+ }
+ return rMap;
+ }
}