From 952291aafc67a9b5604831ed677927b1d86f601c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 25 Sep 2024 10:07:41 +0800 Subject: [PATCH] 'commit' --- .../Controller/LoginPersonController.java | 4 +- .../com/dsideal/base/Util/CommonUtil.java | 103 ------------------ .../java/com/dsideal/base/Util/RetKit.java | 97 +++++++++++++++++ 3 files changed, 99 insertions(+), 105 deletions(-) create mode 100644 dsBase/src/main/java/com/dsideal/base/Util/RetKit.java diff --git a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java index 54e46442..160a1c70 100644 --- a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java +++ b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java @@ -32,7 +32,7 @@ public class LoginPersonController extends Controller { boolean success = jo.getBoolean("success"); String msg = jo.getString("message"); if (!success) { - renderJson(CommonUtil.renderFail(msg)); + renderJson(RetKit.renderFail(msg)); return; } int identity_id = jo.getInteger("identity_id"); @@ -46,7 +46,7 @@ public class LoginPersonController extends Controller { map.put("bureau_id", bureau_id); map.put("person_name", person_name); map.put("jwt", jwt); - renderJson(CommonUtil.renderSuccess(msg, map)); + renderJson(RetKit.renderSuccess(msg, map)); } } diff --git a/dsBase/src/main/java/com/dsideal/base/Util/CommonUtil.java b/dsBase/src/main/java/com/dsideal/base/Util/CommonUtil.java index d6eb4b9b..a4ad020c 100644 --- a/dsBase/src/main/java/com/dsideal/base/Util/CommonUtil.java +++ b/dsBase/src/main/java/com/dsideal/base/Util/CommonUtil.java @@ -415,107 +415,4 @@ public class CommonUtil { String base64Rule = "^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)$"; 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(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/dsBase/src/main/java/com/dsideal/base/Util/RetKit.java b/dsBase/src/main/java/com/dsideal/base/Util/RetKit.java new file mode 100644 index 00000000..c89a718b --- /dev/null +++ b/dsBase/src/main/java/com/dsideal/base/Util/RetKit.java @@ -0,0 +1,97 @@ +package com.dsideal.base.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; + } +}