From e97b71caed03d1f1aa3ae21b1ea0deac4dd9ffe0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 14:28:38 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/ConfigTaoLiJinServiceImpl.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/ConfigTaoLiJinServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/ConfigTaoLiJinServiceImpl.java
index a3741bd..31e740b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/ConfigTaoLiJinServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/ConfigTaoLiJinServiceImpl.java
@@ -1,5 +1,7 @@
package com.yeshi.fanli.service.impl.tlj;
+import java.util.Date;
+
import javax.annotation.Resource;
import org.springframework.cache.annotation.Cacheable;
@@ -10,27 +12,42 @@
import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
@Service
-public class ConfigTaoLiJinServiceImpl implements ConfigTaoLiJinService{
+public class ConfigTaoLiJinServiceImpl implements ConfigTaoLiJinService {
@Resource
private ConfigTaoLiJinMapper configTaoLiJinMapper;
@Override
public ConfigTaoLiJin getByKey(String key) {
- return configTaoLiJinMapper.getByKey(key);
+ return configTaoLiJinMapper.getByKey(key, new Date());
}
-
@Override
@Cacheable(value = "config", key = "'getValueByKey-' + #key")
public String getValueByKey(String key) {
- ConfigTaoLiJin config = configTaoLiJinMapper.getByKey(key);
- if(config != null) {
+ ConfigTaoLiJin config = configTaoLiJinMapper.getByKey(key, new Date());
+ if (config != null) {
return config.getValue();
}
return null;
}
-
-
+ @Override
+ public ConfigTaoLiJin getByKey(String key, Date date) {
+ if (date == null)
+ return getByKey(key);
+ return configTaoLiJinMapper.getByKey(key, date);
+ }
+
+ @Override
+ public String getValueByKey(String key, Date date) {
+ if (date == null)
+ return getValueByKey(key);
+ ConfigTaoLiJin config = configTaoLiJinMapper.getByKey(key, date);
+ if (config != null) {
+ return config.getValue();
+ }
+ return null;
+ }
+
}
--
Gitblit v1.8.0