Commit 245f294a by liuyongshuai

修改读取redis方式

parent d05d2009
...@@ -28,9 +28,8 @@ ...@@ -28,9 +28,8 @@
<commons-net.version>3.3</commons-net.version> <commons-net.version>3.3</commons-net.version>
<pagehelper.version>3.4.1</pagehelper.version> <pagehelper.version>3.4.1</pagehelper.version>
<jsqlparser.version>0.9.1</jsqlparser.version> <jsqlparser.version>0.9.1</jsqlparser.version>
<jedis.version>2.7.2</jedis.version> <jedis.version>2.5.2</jedis.version>
<solrj.version>4.10.3</solrj.version> <solrj.version>4.10.3</solrj.version>
<jedis.version>2.7.2</jedis.version>
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format> <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
</properties> </properties>
<!-- 公司的maven仓库 --> <!-- 公司的maven仓库 -->
......
...@@ -27,7 +27,6 @@ public class RedisController { ...@@ -27,7 +27,6 @@ public class RedisController {
if (!StringUtils.isBlank(xzxtRestResult.getData().toString())) { if (!StringUtils.isBlank(xzxtRestResult.getData().toString())) {
xzxtRestResult = xzxtRestResult.format(xzxtRestResult.getData().toString()); xzxtRestResult = xzxtRestResult.format(xzxtRestResult.getData().toString());
} }
System.out.println("XzxtRestResult========================================"+xzxtRestResult.getData());
return xzxtRestResult; return xzxtRestResult;
}; };
} }
...@@ -292,7 +292,6 @@ public class SysUserController { ...@@ -292,7 +292,6 @@ public class SysUserController {
*/ */
@RequestMapping(value = "/queryUserJGZ/{id}", method = RequestMethod.GET) @RequestMapping(value = "/queryUserJGZ/{id}", method = RequestMethod.GET)
public void queryUserJGZ(@PathVariable("id") String id,String zpType,HttpServletResponse response){ public void queryUserJGZ(@PathVariable("id") String id,String zpType,HttpServletResponse response){
System.out.println("zpType===================================="+zpType);
OutputStream os = null; OutputStream os = null;
try { try {
......
...@@ -58,16 +58,13 @@ public class ZtreeDataUtil { ...@@ -58,16 +58,13 @@ public class ZtreeDataUtil {
RedisServiceUtil redisServiceUtil = new RedisServiceUtil(); RedisServiceUtil redisServiceUtil = new RedisServiceUtil();
xzxtRestResult= redisServiceUtil.ReadRedisRest(unitStr.substring(0,2)+"_"+dictitem.getGroupid(),redisUtils); xzxtRestResult= redisServiceUtil.ReadRedisRest(unitStr.substring(0,2)+"_"+dictitem.getGroupid(),redisUtils);
String result=""; String result="";
System.out.println(xzxtRestResult);
if(xzxtRestResult.getStatus()==202) { if(xzxtRestResult.getStatus()==202) {
result= (String) xzxtRestResult.getData(); result= (String) xzxtRestResult.getData();
model.addAttribute("unit", result); model.addAttribute("unit", result);
} }else{
//向缓存中添加内容
else{
try { try {
/* //先存储 //先存储
RedisServiceUtil.UpdateRedisRest(unitStr.substring(0,2),dictitem.getGroupid());*/ RedisServiceUtil.UpdateRedisRest(unitStr.substring(0,2),dictitem.getGroupid());
//读取 //读取
xzxtRestResult= redisServiceUtil.ReadRedisRest(unitStr.substring(0,2)+"_"+dictitem.getGroupid(),redisUtils); xzxtRestResult= redisServiceUtil.ReadRedisRest(unitStr.substring(0,2)+"_"+dictitem.getGroupid(),redisUtils);
result= (String) xzxtRestResult.getData(); result= (String) xzxtRestResult.getData();
......
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
<!-- redis连接池配置--> <!-- redis连接池配置-->
<bean id="jedisPoolConfig" class="redis.clients.jedis.JedisPoolConfig" > <bean id="jedisPoolConfig" class="redis.clients.jedis.JedisPoolConfig" >
<!--最大空闲数--> <!--最大空闲数-->
<property name="maxIdle" value="${redis.maxIdle}" /> <!--<property name="maxIdle" value="${redis.maxIdle}" />-->
<!--连接池的最大数据库连接数 --> <!--连接池的最大数据库连接数 -->
<property name="maxTotal" value="${redis.maxTotal}" /> <!--<property name="maxTotal" value="${redis.maxTotal}" />-->
<!--最大建立连接等待时间--> <!--最大建立连接等待时间-->
<property name="maxWaitMillis" value="${redis.maxWaitMillis}" /> <!--<property name="maxWaitMillis" value="${redis.maxWaitMillis}" />-->
<!--逐出连接的最小空闲时间 默认1800000毫秒(30分钟)--> <!--逐出连接的最小空闲时间 默认1800000毫秒(30分钟)-->
<property name="minEvictableIdleTimeMillis" value="${redis.minEvictableIdleTimeMillis}" /> <property name="minEvictableIdleTimeMillis" value="${redis.minEvictableIdleTimeMillis}" />
<!--每次逐出检查时 逐出的最大数目 如果为负数就是 : 1/abs(n), 默认3--> <!--每次逐出检查时 逐出的最大数目 如果为负数就是 : 1/abs(n), 默认3-->
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<!--逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1--> <!--逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1-->
<property name="timeBetweenEvictionRunsMillis" value="${redis.timeBetweenEvictionRunsMillis}" /> <property name="timeBetweenEvictionRunsMillis" value="${redis.timeBetweenEvictionRunsMillis}" />
<!--是否在从池中取出连接前进行检验,如果检验失败,则从池中去除连接并尝试取出另一个--> <!--是否在从池中取出连接前进行检验,如果检验失败,则从池中去除连接并尝试取出另一个-->
<property name="testOnBorrow" value="${redis.testOnBorrow}" /> <!--<property name="testOnBorrow" value="${redis.testOnBorrow}" />-->
<!--在空闲时检查有效性, 默认false --> <!--在空闲时检查有效性, 默认false -->
<property name="testWhileIdle" value="${redis.testWhileIdle}" /> <property name="testWhileIdle" value="${redis.testWhileIdle}" />
</bean > </bean >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment