Merge branch 'cache' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/service/impl/GACountryReportServiceImpl.java

@@ -10,6 +10,7 @@ import org.jeecg.modules.adweb.dmp.mapper.GACountryReportMapper;
 import org.jeecg.modules.adweb.dmp.service.IGACountryReportService;
 import org.jeecg.modules.adweb.dmp.vo.report.CountryStatsVO;
 import org.jeecg.modules.redis.CacheConfig;
+import org.jeecg.modules.redis.TTLCacheManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -30,7 +31,8 @@ public class GACountryReportServiceImpl extends ServiceImpl<GACountryReportMappe
     @Override
     @Cacheable(
             cacheManager = CacheConfig.TTL_CACHE_MANAGER,
-            cacheNames = "getCountryStats#" + 60 * 30) // Redis TTL为半小时
+            cacheNames =
+                    "getCountryStats" + TTLCacheManager.TTL_SPLITTER + 60 * 30) // Redis TTL为半小时
     public List<CountryStatsVO> getCountryStats(String siteCode, Date start, Date end) {
         List<CountryStatsVO> countryStatsVOs =
                 gaCountryReportMapper.getCountryStats(siteCode, start, end);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/service/impl/GADailyReportServiceImpl.java

@@ -17,6 +17,7 @@ import org.jeecg.modules.adweb.dmp.service.IGADailyReportService;
 import org.jeecg.modules.adweb.enquiry.mapper.AdwebEnquiryMapper;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.jeecg.modules.redis.CacheConfig;
+import org.jeecg.modules.redis.TTLCacheManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -45,7 +46,10 @@ public class GADailyReportServiceImpl extends ServiceImpl<GADailyReportMapper, G
     @Override
     @Cacheable(
             cacheManager = CacheConfig.TTL_CACHE_MANAGER,
-            cacheNames = "getDailyStatsWithinPeriod#" + 60 * 30) // Redis TTL为半小时
+            cacheNames =
+                    "getDailyStatsWithinPeriod"
+                            + TTLCacheManager.TTL_SPLITTER
+                            + 60 * 30) // Redis TTL为半小时
     public List<DailyStatsVO> getDailyStatsWithinPeriod(String siteCode, Date start, Date end) {
         Map<String, DailyStatsVO> dailyStatsVOs = Maps.newHashMap();
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/service/impl/GAPagePathReportServiceImpl.java

@@ -15,6 +15,7 @@ import org.jeecg.modules.adweb.dmp.vo.report.PagePathStatsVO;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.jeecg.modules.redis.CacheConfig;
+import org.jeecg.modules.redis.TTLCacheManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -39,7 +40,8 @@ public class GAPagePathReportServiceImpl
     @Override
     @Cacheable(
             cacheManager = CacheConfig.TTL_CACHE_MANAGER,
-            cacheNames = "getPagePathStats#" + 60 * 30) // Redis TTL为半小时
+            cacheNames =
+                    "getPagePathStats" + TTLCacheManager.TTL_SPLITTER + 60 * 30) // Redis TTL为半小时
     public List<PagePathStatsVO> getPagePathStats(
             String siteCode, Date start, Date end, int limit) {
         List<PagePathStatsVO> pagePathStatsVOs =

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/service/impl/GASourceMediumReportServiceImpl.java

@@ -9,6 +9,7 @@ import org.jeecg.modules.adweb.dmp.mapper.GASourceMediumReportMapper;
 import org.jeecg.modules.adweb.dmp.service.IGASourceMediumReportService;
 import org.jeecg.modules.adweb.dmp.vo.report.SourceMediumStatsVO;
 import org.jeecg.modules.redis.CacheConfig;
+import org.jeecg.modules.redis.TTLCacheManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -29,7 +30,10 @@ public class GASourceMediumReportServiceImpl
     @Override
     @Cacheable(
             cacheManager = CacheConfig.TTL_CACHE_MANAGER,
-            cacheNames = "getSourceMediumStats#" + 60 * 30) // Redis TTL为半小时
+            cacheNames =
+                    "getSourceMediumStats"
+                            + TTLCacheManager.TTL_SPLITTER
+                            + 60 * 30) // Redis TTL为半小时
     public List<SourceMediumStatsVO> getSourceMediumStats(String siteCode, Date start, Date end) {
         List<SourceMediumStatsVO> sourceMediumStatsVOs =
                 gaSourceMediumReportMapper.getSourceMediumStats(siteCode, start, end);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/redis/TTLCacheManager.java

@@ -22,6 +22,8 @@ import java.util.Date;
 @Slf4j
 public class TTLCacheManager extends RedisCacheManager {
 
+    public static final char TTL_SPLITTER = '#';
+
     public TTLCacheManager(
             RedisCacheWriter cacheWriter, RedisCacheConfiguration cacheConfiguration) {
         super(cacheWriter, cacheConfiguration);
@@ -29,7 +31,7 @@ public class TTLCacheManager extends RedisCacheManager {
 
     @Override
     protected RedisCache createRedisCache(String name, RedisCacheConfiguration cacheConfiguration) {
-        final int idx = StringUtils.lastIndexOf(name, '#');
+        final int idx = StringUtils.lastIndexOf(name, TTL_SPLITTER);
         if (idx > -1) {
             long ttl = Long.parseLong(StringUtils.substring(name, idx + 1));
             name = StringUtils.substring(name, 0, idx);