huanghai
/
dsProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'commit'

Browse Source
main
黄海 10 months ago
parent c250e7a325
commit 952291aafc
3 changed files with 99 additions and 105 deletions
Show Stats Download Patch File Download Diff File

4
dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java
Unescape View File

@ -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));
}
}

103
dsBase/src/main/java/com/dsideal/base/Util/CommonUtil.java
Unescape View File

@ -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<Record>数据格式
* <p>
* data: Map<String,Object>
*/
public static Map<String, Object> renderSuccess(String msg, List<Record> list) {
return renderSuccess(msg, list, null, 0, 0, 0);
}
public static Map<String, Object> renderSuccess(String msg, Page<Record> page, String dataName) {
return renderSuccess(msg, page.getList(), dataName, page.getPageNumber(), page.getPageSize(), page.getTotalRow());
}
public static Map<String, Object> renderSuccess(String msg, Map<String, Object> map) {
Map<String, Object> rMap = new HashMap<>();
rMap.put("code", 200);
if (!StrKit.isBlank(msg)) {
rMap.put("msg", msg);
}
rMap.put("data", map);
return rMap;
}
public static Map<String, Object> renderSuccess(String msg, List<Record> list, String dataName, int pageNum, int pageSize, int total) {
Map<String, Object> 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<String, Object> _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<String, Object> renderFail(String msg) {
return renderFail(msg, null);
}
public static Map<String, Object> renderFail(String msg, Map<String, Object> map) {
Map<String, Object> 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<Record> 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<Record> page = new Page<>();
page.setList(list);
page.setPageNumber(1);
page.setPageSize(100);
page.setTotalRow(page.getTotalRow());
System.out.println(renderSuccess("成功", page, "list"));
Map<String, Object> 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));
}
}

97
dsBase/src/main/java/com/dsideal/base/Util/RetKit.java
Unescape View File

@ -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<Record>数据格式
* <p>
* data: Map<String,Object>
*/
public static Map<String, Object> renderSuccess(List<Record> list) {
return renderSuccess(null, list, null, 0, 0, 0);
}
public static Map<String, Object> renderSuccess(String msg, List<Record> list) {
return renderSuccess(msg, list, null, 0, 0, 0);
}
public static Map<String, Object> renderSuccess(String msg, Page<Record> page, String dataName) {
return renderSuccess(msg, page.getList(), dataName, page.getPageNumber(), page.getPageSize(), page.getTotalRow());
}
public static Map<String, Object> renderSuccess(String msg, Map<String, Object> map) {
Map<String, Object> rMap = new HashMap<>();
rMap.put("code", 200);
if (!StrKit.isBlank(msg)) {
rMap.put("msg", msg);
}
rMap.put("data", map);
return rMap;
}
public static Map<String, Object> renderSuccess(cn.hutool.json.JSONArray jsonArray) {
return renderSuccess(null, jsonArray);
}
public static Map<String, Object> renderSuccess(String msg, cn.hutool.json.JSONArray jsonArray) {
Map<String, Object> rMap = new HashMap<>();
rMap.put("code", 200);
if (!StrKit.isBlank(msg)) {
rMap.put("msg", msg);
}
rMap.put("data", jsonArray);
return rMap;
}
public static Map<String, Object> renderSuccess(String msg, List<Record> list, String dataName, int pageNum, int pageSize, int total) {
Map<String, Object> 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<String, Object> _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<String, Object> renderFail(String msg) {
return renderFail(msg, null);
}
public static Map<String, Object> renderFail(String msg, Map<String, Object> map) {
Map<String, Object> rMap = new HashMap<>();
rMap.put("code", 500);
if (!StrKit.isBlank(msg)) {
rMap.put("msg", msg);
}
if (map != null) {
rMap.put("data", map);
}
return rMap;
}
}
Write Preview
Loading…
Cancel
Save