Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving

liujie

8 小时以前 74f8b8074a2fb391b5363b4dca5f99bf31993430

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java

@@ -1,17 +1,13 @@
package com.supersavedriving.driver.modular.system.util;

import com.supersavedriving.driver.core.util.ToolUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
import redis.clients.jedis.Pipeline;

import javax.annotation.Resource;
import java.io.IOException;
import java.util.*;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.TimeUnit;


@@ -21,13 +17,9 @@
@Component
public class RedisUtil {

    @Autowired
    private JedisPool jedisPool;

    private Timer timer;

    @Resource
    private RedisTemplate<String, Object> redisTemplate;


    /**
     * 向redis中存储字符串没有过期时间
@@ -35,11 +27,7 @@
     * @param value
     */
    public void setStrValue(String key, String value){
        if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){
            Jedis resource = jedisPool.getResource();
            String set = resource.set(key, value);
            closeJedis(resource);
        }
        redisTemplate.opsForValue().set(key, value);
    }


@@ -49,7 +37,7 @@
     * @param value
     * @param time 秒
     */
    public void setStrValue(String key, String value, long time){
    public void setStrValue(String key, String value, int time){
        redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
    }

@@ -60,47 +48,11 @@
     * @return
     */
    public String getValue(String key){
        if(ToolUtil.isNotEmpty(key)){
            Jedis resource = jedisPool.getResource();
            String data = resource.get(key);
            closeJedis(resource);
            return data;
        }
        return null;
        return (String) redisTemplate.opsForValue().get(key);
    }


    /**
     * 批量获取
     * @param kes
     * @return
     */
    public List<Object> getValues(List<String> kes){
        if(null != kes){
            Jedis resource = jedisPool.getResource();
            Pipeline pipelined = resource.pipelined();
            for(String key : kes){
                pipelined.get(key);
            }
            List<Object> list = pipelined.syncAndReturnAll();

            closeJedis(resource);
            pipelined.clear();
            try {
                pipelined.close();
            } catch (IOException e) {
                e.printStackTrace();
            }
            List<Object> data = new ArrayList<>();
            for(Object o : list){
                if(null != o){
                    data.add(o);
                }
            }
            return data;
        }
        return null;
    }


    /**
@@ -108,11 +60,7 @@
     * @param key
     */
    public void remove(String key){
        if(ToolUtil.isNotEmpty(key)){
            Jedis resource = jedisPool.getResource();
            Long del = resource.del(key);
            closeJedis(resource);
        }
        redisTemplate.delete(key);
    }


@@ -122,11 +70,7 @@
     * @param members
     */
    public void addSetValue(String key, String...members){
        if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(members)){
            Jedis resource = jedisPool.getResource();
            Long sadd = resource.sadd(key, members);
            resource.close();
        }
        redisTemplate.opsForSet().add(key, members);
    }


@@ -137,11 +81,9 @@
     */
    public Set<String> getSetAllValue(String key){
        Set<String> smembers = new HashSet<>();
        if(ToolUtil.isNotEmpty(key)){
            Jedis resource = jedisPool.getResource();
            smembers = resource.smembers(key);
            resource.close();
        }
        redisTemplate.opsForSet().members(key).forEach(member -> {
            smembers.add(member.toString());
        });
        return smembers;
    }

@@ -153,22 +95,11 @@
     */
    public void delSetValue(String key, String...members){
        if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(members)){
            Jedis resource = jedisPool.getResource();
            Long sadd = resource.srem(key, members);
            resource.close();
            redisTemplate.opsForSet().remove(key, members);
        }
    }


    /**
     * 删除资源
     * @param jedis
     */
    public void closeJedis(Jedis jedis){
        if(null != jedis){
            jedis.close();
        }
    }


    /**
@@ -179,26 +110,8 @@
     * @return
     */
    public boolean lock(String key, String value, int time){
        if(!StringUtils.isEmpty(key)){
            key += "_lock";
            Jedis resource = jedisPool.getResource();
            String set = resource.set(key, value, "nx", "ex", time);
            if("OK".equals(set)){
                String finalKey = key;
                timer = new Timer();
                timer.schedule(new TimerTask() {
                    @Override
                    public void run() {
                        Jedis resource = jedisPool.getResource();
                        resource.setex(finalKey, time, value);
                        resource.close();
                    }
                }, 1000, 500);
            }
            resource.close();
            return "OK".equals(set) ? true : false;
        }
        return false;
        key += "_lock";
        return redisTemplate.opsForValue().setIfAbsent(key, value);
    }

    /**
@@ -257,15 +170,7 @@
     * @return
     */
    public boolean unlock(String key){
        if(!StringUtils.isEmpty(key)){
            key += "_lock";
            Jedis resource = jedisPool.getResource();
            timer.cancel();//取消定时任务
            Long del = resource.del(key);
            resource.close();
            return del != 0 ? true : false;
        }
        return false;
        return redisTemplate.delete(key);
    }

    /**