修改redis模糊查询服务

pom.xml

@@ -252,6 +252,11 @@
       <classifier>jdk15</classifier>
     </dependency>
     <dependency>
+      <groupId>com.alibaba</groupId>
+      <artifactId>fastjson</artifactId>
+      <version>1.2.47</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.axis2</groupId>
       <artifactId>axis2</artifactId>
       <version>1.6.2</version>

src/main/java/com/cc/controller/RedisRsetController.java

@@ -2,21 +2,23 @@ package com.cc.controller;
 
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.cc.common.pojo.XzxtRestResult;
 import com.cc.pojo.SysDictitem;
-import com.cc.service.JzbhRestService;
 import com.cc.service.RedisService;
 import com.cc.service.SysDictitemService;
-import net.sf.json.JSONArray;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -43,25 +45,72 @@ public class RedisRsetController {
 	 *  key：hkey_CODE_UNIT_141181991700
 	 *  value:字典对应的数据
 	 *  type：save：更新，read：读取
+	 *  name 模糊条件  name
 	 */
-	@RequestMapping(value = "/ReadRedisRest",method = {RequestMethod.POST,RequestMethod.GET})
+	@RequestMapping(value = "/ReadRedisRestList",method = {RequestMethod.POST,RequestMethod.GET})
 	@ResponseBody
-	public XzxtRestResult ReadRedisRest(@RequestParam String hkey, @RequestParam String key) {
+	public List<SysDictitem>  ReadRedisRestList(@RequestParam String hkey, @RequestParam String key, String name) {
 		//存储redis
 		XzxtRestResult result=new XzxtRestResult(100,"","");
 		//读取redis
 		Set<String> dictitemKeys= (Set<String>) (redisService.HkeysRedisRest(hkey)).getData();
 		String AllKey="";
+		List<SysDictitem> SysDictitems=new ArrayList<SysDictitem>();
+		List<SysDictitem> SysDictitems2=new ArrayList<SysDictitem>();
 		//模糊查询
 			for (String key1 : dictitemKeys) {
 				if(key1.contains(key)){
 					AllKey+=key1+"__";
-					result =redisService.ReadRedisRest(hkey, key1);
+					result=redisService.ReadRedisRest(hkey, key1);
+					String json=JSONObject.toJSONString(result);
+					XzxtRestResult XzxtRestResult1= XzxtRestResult.formatToPojo(json,SysDictitem.class);
+					SysDictitems.add((SysDictitem) XzxtRestResult1.getData());
 				}
 			}
 		System.out.print("AllKey========================="+AllKey);
+		//模糊条件2进行筛选
+		if(!StringUtils.isEmpty(name)){
+			for(SysDictitem SysDictitem :SysDictitems){
+				if(SysDictitem.getName().contains(name)){
+					SysDictitems2.add(SysDictitem);
+				}
+			}
+			return SysDictitems2;
+		}else{
+			return SysDictitems;
+		}
+	}
+
+	/**
+	 *  redis存储服务  shiro字典
+	 *  hkey:省份 山西：14
+	 *  key：hkey_CODE_UNIT_141181991700
+	 *  value:字典对应的数据
+	 *  type：save：更新，read：读取
+	 */
+	@RequestMapping(value = "/ReadRedisRest",method = {RequestMethod.POST,RequestMethod.GET})
+	@ResponseBody
+	public XzxtRestResult ReadRedisRest(@RequestParam String hkey, @RequestParam String key) {
+		//存储redis
+		XzxtRestResult result=new XzxtRestResult(100,"","");
+		//读取redis
+		Set<String> dictitemKeys= (Set<String>) (redisService.HkeysRedisRest(hkey)).getData();
+		String AllKey="";
+		List<SysDictitem> SysDictitems=new ArrayList<SysDictitem>();
+		//模糊查询
+		for (String key1 : dictitemKeys) {
+			if(key1.contains(key)){
+				AllKey+=key1+"__";
+				result=redisService.ReadRedisRest(hkey, key1);
+			}
+		}
+		System.out.print("AllKey========================="+AllKey);
 		return result;
 	}
+
+
+
+
 	/**
 	 *  redis存储服务
 	 *  hkey:省份 山西：14
@@ -88,18 +137,18 @@ public class RedisRsetController {
 		    System.out.print("AllKey========================="+AllKey);
 			//存储所有字典------------------------------------------------------
 		    //1.shiro 项目字典特殊处理
-		   if (type.equals("CODE_UNIT_ALL")){
+		   if (type.equals("SHIRO_UNIT")){
 			   dictitem.setGroupid("CODE_UNIT");
 			   dictitem.setCode(hkey+"%");
 			   JSONArray unit = dictitemService.selectDictitemByCondition(dictitem);
-			   result = redisService.SaveRedisRest(hkey, "CODE_UNIT_ALL",unit.toString());
+			   result = redisService.SaveRedisRest(hkey, "SHIRO_UNIT",unit.toString());
 		   }
 		   //2.传统项目字典特殊处理
 		   else{
 			   List<SysDictitem> SysDictitemList = dictitemService.findCodeAllByType(type);
 			   for(SysDictitem node:SysDictitemList){
 				   String nodeStr= JSON.toJSONString(node);
-				   String key1 =hkey+"_"+type+"_"+"_"+node.getPid()+"_"+node.getCode()+"_"+node.getName();
+				   String key1 = hkey+"_"+type+"_"+node.getCode()+"_"+node.getName()+"_"+node.getPid();
 				   result = redisService.SaveRedisRest(hkey, key1,nodeStr);
 			   }
 		   }

src/main/java/com/cc/service/SysDictitemService.java

 package com.cc.service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.cc.pojo.SysDictitem;
-import net.sf.json.JSONArray;
 
 import java.util.List;
 

src/main/java/com/cc/service/imp/SysDictitemImpl.java

 package com.cc.service.imp;
 
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.cc.dao.SysDictitemDao;
 import com.cc.pojo.SysDictitem;
 import com.cc.service.SysDictitemService;
-import net.sf.json.JSONArray;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,7 +26,8 @@ public class SysDictitemImpl implements SysDictitemService {
     public JSONArray selectDictitemByCondition(SysDictitem dictitem) {
         dictitem.setScbz(0);
         List<SysDictitem> dictitems = sysDictitemDao.selectDictitemByCondition(dictitem);
-        JSONArray dictitemjson = JSONArray.fromObject(dictitems);
+        String jsonString = JSONObject.toJSONString(dictitems);
+        JSONArray dictitemjson = JSONArray.parseArray(jsonString);
         return dictitemjson;
     }
 

src/main/resources/resource/db.properties

 jdbc.driver=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@192.168.2.160:1521:XZXT
+jdbc.url=jdbc:oracle:thin:@192.168.193.1:1521:XZXT
 jdbc.username=XZXT
 jdbc.password=XZXT
 
-redis.host=192.168.193.128
+redis.host=127.0.0.1
 redis.port=6379
 redis.pass=