'commit'

ds-base/dsBase.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$/../dsBase" dumb="true">
+      <sourceFolder url="file://$MODULE_DIR$/../dsBase/src/main/resource" type="java-resource" />
+    </content>
+  </component>
+</module>

dsBase/src/main/java/com/dsideal/base/Const/ResConst.java

@@ -1,8 +0,0 @@
-package com.dsideal.base.Const;
-
-public class ResConst {
-    public static final Integer SUCCESS = 200;
-    public static final Integer ERROR = 500;
-    public static final Integer OVERDUE = 401;
-    public static final Integer TIMEOUT = 30000;
-}

dsBase/src/main/java/com/dsideal/base/Const/RetJsonArray.java

@@ -1,20 +0,0 @@
-package com.dsideal.base.Const;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-@Setter
-@Getter
-public class RetJsonArray {
-    private int code;
-    private String msg;
-    private List<Record> data;
-
-    public RetJsonArray(int code, String msg, List<Record> list) {
-        this.code = code;
-        this.msg = msg;
-        this.data = list;
-    }
-}

dsBase/src/main/java/com/dsideal/base/Const/RetJsonObject.java

@@ -1,20 +0,0 @@
-package com.dsideal.base.Const;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.Getter;
-import lombok.Setter;
-
-@Setter
-@Getter
-public class RetJsonObject {
-
-    private int code;
-    private String msg;
-    private JSONObject data;
-
-    public RetJsonObject(int code, String msg, JSONObject data) {
-        this.code = code;
-        this.msg = msg;
-        this.data = data;
-    }
-}

dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java

@@ -14,6 +14,8 @@ import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
 
 import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 
 @SuppressWarnings("unchecked")
@@ -22,9 +24,30 @@ public class LoginPersonController extends Controller {
     LoginPersonModel model = new LoginPersonModel();
 
     @Before({POST.class})
-    public void doLogin(String username, String password, String platform) {
+    public void doLogin(String username, String password, String platform, int forVue) {
         JSONObject jo = model.doLogin(username, password, platform, getResponse());
-        renderJson(jo);
+        if (forVue == 0) {
+            renderJson(jo);
+        } else {
+            boolean success = jo.getBoolean("success");
+            String msg = jo.getString("message");
+            if (!success) {
+                renderJson(CommonUtil.renderFail(msg));
+                return;
+            }
+            int identity_id = jo.getInteger("identity_id");
+            String person_id = jo.getString("person_id");
+            String bureau_id = jo.getString("bureau_id");
+            String person_name = jo.getString("person_name");
+            String jwt = jo.getString("jwt");
+            Map<String, Object> map = new HashMap<>();
+            map.put("identity_id", identity_id);
+            map.put("person_id", person_id);
+            map.put("bureau_id", bureau_id);
+            map.put("person_name", person_name);
+            map.put("jwt", jwt);
+            renderJson(CommonUtil.renderSuccess(msg, map));
+        }
     }
 
     @Before({GET.class})

dsBase/src/main/java/com/dsideal/base/Util/CommonUtil.java

@@ -284,7 +284,6 @@ public class CommonUtil {
     }
 
 
-
     /**
      * 功能：验证是否为手机号
      * 作者：吴缤
@@ -402,16 +401,6 @@ public class CommonUtil {
         return false;
     }
 
-    /***
-     * delete CRLF; delete  empty line ;delete blank lines
-     *
-     * @param input
-     * @return
-     */
-    private static String deleteCRLFOnce(String input) {
-        return input.replaceAll("((\r\n)|\n)[\\s\t ]*(\\1)+", "$1");
-    }
-
 
     public static boolean checkPass(String pass) {
         //注释掉必须要有符号这个要求：&& pass.matches(".*[~!@#$%^&*\\.?]{1,}.*")
@@ -427,4 +416,106 @@ public class CommonUtil {
         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));
+    }
 }

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<MenuModel.Menu> menuList = mm.fetchMenu(160);
-        Kv kv = Kv.by("success", true);
+        renderJson(CommonUtil.renderSuccess(JSONUtil.parseArray(menuList)));
-        kv.set("message", "获取成功");
+
-        kv.set("data", JSONUtil.parseArray(menuList));
-        renderJson(kv);
         //后续需要根据人员角色菜单关系，去掉不可见菜单
     }
 }

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<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(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;
+    }
 }