Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xzxtshiro/pojo/XzxtRestResult.java

+package com.xzxtshiro.pojo;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.List;
+
+/**
+ * Xzxt-Rest自定义响应结构
+ */
+public class XzxtRestResult {
+
+    // 定义jackson对象
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+
+    // 响应业务状态
+    private Integer status;
+
+    // 响应消息
+    private String msg;
+
+    // 响应中的数据
+    private Object data;
+
+    public static XzxtRestResult build(Integer status, String msg, Object data) {
+        return new XzxtRestResult(status, msg, data);
+    }
+
+    public static XzxtRestResult ok(Object data) {
+        return new XzxtRestResult(data);
+    }
+
+    public static XzxtRestResult ok(int i, String count, List<Object> list) {
+        return new XzxtRestResult(null);
+    }
+
+    public XzxtRestResult() {
+
+    }
+
+    public static XzxtRestResult build(Integer status, String msg) {
+        return new XzxtRestResult(status, msg, null);
+    }
+
+    public XzxtRestResult(Integer status, String msg, Object data) {
+        this.status = status;
+        this.msg = msg;
+        this.data = data;
+    }
+
+    public XzxtRestResult(Object data) {
+        this.status = 200;
+        this.msg = "OK";
+        this.data = data;
+    }
+
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    /**
+     * 将json结果集转化为Xzxt-Rest对象
+     * 
+     * @param jsonData json数据
+     * @param clazz Xzxt-Rest中的object类型
+     * @return
+     */
+    public static XzxtRestResult formatToPojo(String jsonData, Class<?> clazz) {
+        try {
+            if (clazz == null) {
+                return MAPPER.readValue(jsonData, XzxtRestResult.class);
+            }
+            JsonNode jsonNode = MAPPER.readTree(jsonData);
+            JsonNode data = jsonNode.get("data");
+            Object obj = null;
+            if (clazz != null) {
+                if (data.isObject()) {
+                    obj = MAPPER.readValue(data.traverse(), clazz);
+                } else if (data.isTextual()) {
+                    obj = MAPPER.readValue(data.asText(), clazz);
+                }
+            }
+            return build(jsonNode.get("status").intValue(), jsonNode.get("msg").asText(), obj);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * object对象的转化
+     * 
+     * @param json
+     * @return
+     */
+    public static XzxtRestResult format(String json) {
+        try {
+            return MAPPER.readValue(json, XzxtRestResult.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * Object是集合转化
+     * 
+     * @param jsonData json数据
+     * @param clazz 集合中的类型
+     * @return
+     */
+    public static XzxtRestResult formatToList(String jsonData, Class<?> clazz) {
+        try {
+            JsonNode jsonNode = MAPPER.readTree(jsonData);
+            JsonNode data = jsonNode.get("data");
+            Object obj = null;
+            if (data.isArray() && data.size() > 0) {
+                obj = MAPPER.readValue(data.traverse(),
+                        MAPPER.getTypeFactory().constructCollectionType(List.class, clazz));
+            }
+            return build(jsonNode.get("status").intValue(), jsonNode.get("msg").asText(), obj);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+}

src/main/java/com/xzxtshiro/util/RedisUtil.java

+package com.xzxtshiro.util;
+
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class RedisUtil {
+	//读取redis服务
+	/**
+	 *
+	 *  hkey:省份 山西：14
+	 *  key： :14_CODE_UNIT_141181991700
+	 * @return
+	 */
+	public static XzxtRestResult ReadRedisRest(String hkey,String key) {
+		//查询参数
+		Map<String, String> param = new HashMap<>();
+		XzxtRestResult xzxtRestResult = new XzxtRestResult();
+		param.put("hkey", hkey);
+		param.put("key", key);
+		//调用redisrest的服务
+		String json = HttpClientUtil.doPost("http://127.0.0.1:9043/xzxt-rest/ReadRedisRest", param);
+		if (!StringUtils.isBlank(json)) {
+			xzxtRestResult = XzxtRestResult.format(json);
+		}
+		return xzxtRestResult;
+	}
+	//更新edis服务
+	/**
+	 *
+	 *  hkey:省份 山西：14
+	 *  tpye：CODE_UNIT
+	 * @return
+	 */
+	public static XzxtRestResult UpdateRedisRest(String hkey,String tpye) {
+		//查询参数
+		Map<String, String> param = new HashMap<>();
+		XzxtRestResult xzxtRestResult = new XzxtRestResult();
+		param.put("hkey", hkey);
+		param.put("type", tpye);
+		//调用redisrest的服务
+		String json = HttpClientUtil.doPost("http://127.0.0.1:9043/xzxt-rest/UpdateRedisRest", param);
+		if (!StringUtils.isBlank(json)) {
+			xzxtRestResult = XzxtRestResult.format(json);
+		}
+		return xzxtRestResult;
+	}
+}

src/main/java/com/xzxtshiro/util/ZtreeDataUtil.java

@@ -10,8 +10,8 @@ import com.xzxtshiro.service.SysPermissionNewService;
 import com.xzxtshiro.service.SysRoleService;
 import com.xzxtshiro.service.SysUserService;
 import net.sf.json.JSONArray;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -49,38 +49,30 @@ public class ZtreeDataUtil {
         String unitStr = user.getUnitcode();
         String usergrade = user.getGrade();
         SysDictitem dictitem = new SysDictitem();
-        dictitem.setGroupid("CODE_UNIT");
+        dictitem.setGroupid("CODE_UNIT_ALL");
         dictitem.setCodeStr(unitStr.substring(0,2)+"%");
-//        if(usergrade==null||usergrade.equals("")){
-//
-//        }else{
-//            if (usergrade.equals("S") || usergrade.equals("T")) {
-//                dictitem.setCodeStr(unitStr.substring(0,2)+"%");
-//            } else if (usergrade.equals("D")) {
-//                dictitem.setCodeStr(unitStr.substring(0,4)+"%");
-//            } else if (usergrade.equals("X")) {
-//                dictitem.setCodeStr(unitStr.substring(0,6)+"%");
-//            }
-//            else if (usergrade.equals("P")) {
-//                dictitem.setCodeStr(unitStr+"%");
-//            }
-//        }
+        XzxtRestResult xzxtRestResult=new XzxtRestResult();
         //从缓存中取内容
         try {
-            String result = jedisClient.hget("CODE_UNIT", dictitem.getCodeStr());
-            if (!StringUtils.isBlank(result)) {
+            xzxtRestResult=RedisUtil.ReadRedisRest(unitStr.substring(0,2),dictitem.getGroupid());
+            String  result="";
+            if(xzxtRestResult.getStatus()==202) {
+                result= (String) xzxtRestResult.getData();
                 model.addAttribute("unit", result);
             }
             //向缓存中添加内容
             else{
-                JSONArray unit = dictitemService.selectDictitemByCondition(dictitem);
-                try {
-                    jedisClient.hset("CODE_UNIT", dictitem.getCodeStr(), unit.toString());
-                    model.addAttribute("unit", unit);
-                } catch (Exception e) {
-                    e.printStackTrace();
+                    try {
+                        //先存储
+                        RedisUtil.UpdateRedisRest(unitStr.substring(0,2),dictitem.getGroupid());
+                        //读取
+                        xzxtRestResult=RedisUtil.ReadRedisRest(unitStr.substring(0,2),dictitem.getGroupid());
+                        result= (String) xzxtRestResult.getData();
+                        model.addAttribute("unit", result);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
-            }
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/resources/resource/db.properties

 jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
 
 jdbc.driver=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@192.168.126.129:1521:XZXT3
+jdbc.url=jdbc:oracle:thin:@192.168.2.160:1521:XZXT
 jdbc.username=XZXT
 jdbc.password=XZXT