Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-16 e97b71caed03d1f1aa3ae21b1ea0deac4dd9ffe0

 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;

@@ -17,20 +19,35 @@


   @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);

      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;

   }

   

}