zouxuan 3 gadi atpakaļ
vecāks
revīzija
b4cd52366e

+ 9 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysTenantConfigServiceImpl.java

@@ -9,6 +9,8 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.redis.service.RedisCache;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
@@ -26,7 +28,7 @@ public class SysTenantConfigServiceImpl extends BaseServiceImpl<Integer, SysTena
 	@Autowired
 	private SysTenantConfigDao sysTenantConfigDao;
 	@Autowired
-	private RedisCache<String,ConcurrentHashMap<Integer,ConcurrentHashMap<String,String>>> redisCache;
+	private RedissonClient redissonClient;
 	private static final String tenantKey = "sysTenantConfig";
 
 	@Override
@@ -44,12 +46,14 @@ public class SysTenantConfigServiceImpl extends BaseServiceImpl<Integer, SysTena
 
 	@Override
 	public void setTenantConfig(ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>> tenantConfig) {
-		redisCache.put(tenantKey,tenantConfig);
+		RBucket<ConcurrentHashMap<Integer,ConcurrentHashMap<String,String>>> bucket = redissonClient.getBucket(tenantKey);
+		bucket.set(tenantConfig);
 	}
 
 	@Override
 	public String getTenantConfigValue(String paramName,Integer tenantId) {
-		ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>> tenantConfigMap = redisCache.get(tenantKey);
+		RBucket<ConcurrentHashMap<Integer,ConcurrentHashMap<String,String>>> bucket = redissonClient.getBucket(tenantKey);
+		ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>> tenantConfigMap = bucket.get();
 		ConcurrentHashMap<String, String> map = tenantConfigMap.get(tenantId);
 		if(map != null){
 			return map.get(paramName);
@@ -60,7 +64,8 @@ public class SysTenantConfigServiceImpl extends BaseServiceImpl<Integer, SysTena
 
 	@Override
 	public ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>> getAllTenantConfig() {
-		return redisCache.get(tenantKey);
+		RBucket<ConcurrentHashMap<Integer,ConcurrentHashMap<String,String>>> bucket = redissonClient.getBucket(tenantKey);
+		return bucket.get();
 	}
 
 	@Override