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

@@ -3,12 +3,14 @@ package org.jeecg.modules.adweb.dmp.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.modules.adweb.common.util.NumberUtil;
 import org.jeecg.modules.adweb.dmp.entity.GACountryReport;
 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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
@@ -25,6 +27,7 @@ public class GACountryReportServiceImpl extends ServiceImpl<GACountryReportMappe
     @Autowired private GACountryReportMapper gaCountryReportMapper;
 
     @Override
+    @Cacheable(cacheNames = "getCountryStats", key = "{#siteCode, #start, #end}")
     public List<CountryStatsVO> getCountryStats(String siteCode, Date start, Date end) {
         List<CountryStatsVO> countryStatsVOs =
                 gaCountryReportMapper.getCountryStats(siteCode, start, end);
@@ -37,6 +40,13 @@ public class GACountryReportServiceImpl extends ServiceImpl<GACountryReportMappe
 
         // 2. VO数据填充
         for (CountryStatsVO countryStatsVO : countryStatsVOs) {
+            // adweb_country表无记录时，如CountryStatsVO.country = (not set)
+            if (StringUtils.isBlank(countryStatsVO.getCountryName())
+                    || StringUtils.isBlank(countryStatsVO.getCountryCode())) {
+                countryStatsVO.setCountryName(countryStatsVO.getCountry());
+                countryStatsVO.setCountryCode(countryStatsVO.getCountry());
+            }
+
             countryStatsVO.setTotalUsersProportion(
                     NumberUtil.formatPercentage(
                             NumberUtil.safeDivide(countryStatsVO.getTotalUsers(), totalUsersSum),

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java

@@ -1,15 +1,17 @@
 package org.jeecg;
 
 import com.xkcoding.justauth.autoconfigure.JustAuthAutoConfiguration;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.jeecg.common.util.oConvertUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Import;
 import org.springframework.core.env.Environment;
 
 import java.net.InetAddress;
@@ -22,6 +24,7 @@ import java.net.UnknownHostException;
 @Slf4j
 @SpringBootApplication
 @ImportAutoConfiguration(JustAuthAutoConfiguration.class)  // spring boot 3.x justauth 兼容性处理
+@EnableCaching // @Cacheable Redis缓存
 //@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class})
 public class JeecgSystemApplication extends SpringBootServletInitializer {