diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java index 1c961197..5c24a2e2 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java +++ b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java @@ -1,7 +1,7 @@ package com.dsideal.resource.Base.Controller; import com.dsideal.resource.Base.Model.BaseModel; -import com.dsideal.resource.Util.CommonUtil; +import com.dsideal.resource.Util.RetKit; import com.jfinal.core.Controller; import com.jfinal.plugin.activerecord.Record; @@ -15,6 +15,6 @@ public class BaseController extends Controller { */ public void getStageList() { List list = bm.getStageList(); - renderJson(CommonUtil.renderSuccess(list)); + renderJson(RetKit.renderSuccess(list)); } } 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 a3ea119e..2fb6b630 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.dsideal.resource.Menu.Model.MenuModel; import com.dsideal.resource.Util.CommonUtil; import com.dsideal.resource.Util.JwtUtil; +import com.dsideal.resource.Util.RetKit; import com.jfinal.aop.Before; import com.jfinal.core.Controller; import com.jfinal.ext.interceptor.GET; @@ -22,7 +23,7 @@ public class MenuController extends Controller { //当前登录的人员是谁? String token = getRequest().getHeader("Authorization"); if (token == null) { - renderJson(CommonUtil.renderFail("JWT token 为空,无法解析人员信息,请重新登录!")); + renderJson(RetKit.renderFail("JWT token 为空,无法解析人员信息,请重新登录!")); return; } Claims claims = JwtUtil.getClaims(token); @@ -31,7 +32,7 @@ public class MenuController extends Controller { //所有菜单 List menuList = mm.fetchMenu(160); - renderJson(CommonUtil.renderSuccess(JSONUtil.parseArray(menuList))); + renderJson(RetKit.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 9254e8c4..c24ba5dd 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Util/CommonUtil.java +++ b/dsRes/src/main/java/com/dsideal/resource/Util/CommonUtil.java @@ -427,88 +427,4 @@ public class CommonUtil { } - /** - * 按VUE的要求返回List数据格式 - *

- * data: Map - */ - public static Map renderSuccess(List list) { - return renderSuccess(null, list, null, 0, 0, 0); - } - 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; - } } diff --git a/dsRes/src/main/java/com/dsideal/resource/Util/RetKit.java b/dsRes/src/main/java/com/dsideal/resource/Util/RetKit.java new file mode 100644 index 00000000..43ea2eb2 --- /dev/null +++ b/dsRes/src/main/java/com/dsideal/resource/Util/RetKit.java @@ -0,0 +1,97 @@ +package com.dsideal.resource.Util; + +import com.jfinal.kit.StrKit; +import com.jfinal.plugin.activerecord.Page; +import com.jfinal.plugin.activerecord.Record; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class RetKit { + + /** + * 按VUE的要求返回List数据格式 + *

+ * data: Map + */ + public static Map renderSuccess(List list) { + return renderSuccess(null, list, null, 0, 0, 0); + } + 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; + } +}