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

jeecg-module-system/jeecg-system-biz/pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.8.25</version>
+            <version>${hutool.version}</version>
         </dependency>
 
         <dependency>
@@ -94,12 +94,7 @@
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-boot-starter3-rabbitmq</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.8.25</version>
-            <scope>compile</scope>
-        </dependency>
+
         <!--dataforseo client https://docs.dataforseo.com/v3/-->
         <dependency>
             <groupId>io.github.dataforseo</groupId>

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

@@ -32,7 +32,7 @@ public class GACountryReportServiceImpl extends ServiceImpl<GACountryReportMappe
     @Cacheable(
             cacheManager = CacheConfig.TTL_CACHE_MANAGER,
             cacheNames =
-                    "getCountryStats" + TTLCacheManager.TTL_SPLITTER + 60 * 30) // Redis TTL为半小时
+                    "getCountryStats" + TTLCacheManager.TTL_SPLITTER + 60 * 10) // Redis TTL为10分钟
     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

@@ -2,13 +2,12 @@ package org.jeecg.modules.adweb.dmp.service.impl;
 
 import static org.jeecg.modules.adweb.dmp.vo.report.SiteOverviewStatsVO.DailyStatsVO;
 
-import cn.hutool.core.lang.Pair;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
+import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.adweb.common.util.DateUtil;
 import org.jeecg.modules.adweb.common.util.NumberUtil;
@@ -55,7 +54,7 @@ public class GADailyReportServiceImpl extends ServiceImpl<GADailyReportMapper, G
             cacheNames =
                     "getDailyStatsWithinPeriod"
                             + TTLCacheManager.TTL_SPLITTER
-                            + 60 * 30) // Redis TTL为半小时
+                            + 60 * 10) // Redis TTL为10分钟
     public List<DailyStatsVO> getDailyStatsForDateRange(String siteCode, Date start, Date end) {
         Map<String, DailyStatsVO> dailyStatsVOs = Maps.newHashMap();
 
@@ -109,9 +108,9 @@ public class GADailyReportServiceImpl extends ServiceImpl<GADailyReportMapper, G
                 });
 
         // 3. 询盘数据补充
-        List<Pair<String, Long>> enquiryDailyCounts =
+        List<ImmutablePair<String, Long>> enquiryDailyCounts =
                 adwebEnquiryMapper.getEnquiryDailyCounts(siteCode, start, end);
-        for (Pair<String, Long> enquiryDailyCount : enquiryDailyCounts) {
+        for (ImmutablePair<String, Long> enquiryDailyCount : enquiryDailyCounts) {
             if (!dailyStatsVOs.containsKey(enquiryDailyCount.getKey())) {
                 continue;
             }
@@ -135,7 +134,7 @@ public class GADailyReportServiceImpl extends ServiceImpl<GADailyReportMapper, G
     @Cacheable(
             cacheManager = CacheConfig.TTL_CACHE_MANAGER,
             cacheNames =
-                    "getPeriodicStats" + TTLCacheManager.TTL_SPLITTER + 60 * 30) // Redis TTL为半小时
+                    "getPeriodicStats" + TTLCacheManager.TTL_SPLITTER + 60 * 10) // Redis TTL为10分钟
     public List<PeriodicStatsVO> getPeriodicStats(String siteCode) {
         // 1. 查询GA统计数据 - UV，PV等
         Map<String, PeriodicStatsVO> periodicStatsVOs =
@@ -148,9 +147,9 @@ public class GADailyReportServiceImpl extends ServiceImpl<GADailyReportMapper, G
                                         LinkedHashMap::new)); // 使用LinkedHashMap保持原查询顺序
 
         // 2. 询盘数据补充
-        List<Pair<String, Long>> enquiryPeriodicCounts =
+        List<ImmutablePair<String, Long>> enquiryPeriodicCounts =
                 adwebEnquiryMapper.getEnquiryPeriodicCounts(siteCode);
-        for (Pair<String, Long> enquiryPeriodicCount : enquiryPeriodicCounts) {
+        for (ImmutablePair<String, Long> enquiryPeriodicCount : enquiryPeriodicCounts) {
             if (!periodicStatsVOs.containsKey(enquiryPeriodicCount.getKey())) {
                 continue;
             }

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

@@ -41,7 +41,7 @@ public class GAPagePathReportServiceImpl
     @Cacheable(
             cacheManager = CacheConfig.TTL_CACHE_MANAGER,
             cacheNames =
-                    "getPagePathStats" + TTLCacheManager.TTL_SPLITTER + 60 * 30) // Redis TTL为半小时
+                    "getPagePathStats" + TTLCacheManager.TTL_SPLITTER + 60 * 10) // Redis TTL为10分钟
     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

@@ -33,7 +33,7 @@ public class GASourceMediumReportServiceImpl
             cacheNames =
                     "getSourceMediumStats"
                             + TTLCacheManager.TTL_SPLITTER
-                            + 60 * 30) // Redis TTL为半小时
+                            + 60 * 10) // Redis TTL为10分钟
     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/adweb/dmp/vo/report/SiteOverviewStatsVO.java

@@ -27,6 +27,8 @@ public class SiteOverviewStatsVO {
 
     private int enquires; // 总询盘数
 
+    private int unreadEnquires; // 未读询盘数
+
     // 计算数据
     private double dailyTotalUsers; // 日均访问量
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/mapper/AdwebEnquiryMapper.java

@@ -1,8 +1,9 @@
 package org.jeecg.modules.adweb.enquiry.mapper;
 
-import cn.hutool.core.lang.Pair;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.adweb.enquiry.dto.EnquiryDTO;
 import org.jeecg.modules.adweb.enquiry.dto.param.EnquirySearchDto;
@@ -75,7 +76,7 @@ public interface AdwebEnquiryMapper extends BaseMapper<AdwebEnquiry> {
      * @param end
      * @return List<Pair < String, Long>> -- MyBatis COUNT()方法默认类型为Long
      */
-    List<Pair<String, Long>> getEnquiryDailyCounts(String siteCode, Date start, Date end);
+    List<ImmutablePair<String, Long>> getEnquiryDailyCounts(String siteCode, Date start, Date end);
 
     /**
      * 获取分时间段的询盘数量 - 今天，昨天，本周，上周，本月，上月，全部
@@ -83,7 +84,7 @@ public interface AdwebEnquiryMapper extends BaseMapper<AdwebEnquiry> {
      * @param siteCode
      * @return List<Pair < String, Long>> -- MyBatis COUNT()方法默认类型为Long
      */
-    List<Pair<String, Long>> getEnquiryPeriodicCounts(String siteCode);
+    List<ImmutablePair<String, Long>> getEnquiryPeriodicCounts(String siteCode);
 
     List<EnquiryDTO> getEnquiryList(String siteCode, String startTime, String endTime);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/mapper/xml/AdwebEnquiryMapper.xml

@@ -304,7 +304,7 @@
         and t1.principal_type != 1
     </update>
 
-    <select id="getEnquiryDailyCounts" resultType="cn.hutool.core.lang.Pair">
+    <select id="getEnquiryDailyCounts" resultType="org.apache.commons.lang3.tuple.ImmutablePair">
         SELECT
         date_format(record_ctime, '%Y-%m-%d') `date`,
         count(id) enquires
@@ -323,7 +323,7 @@
         GROUP BY date
     </select>
 
-    <select id="getEnquiryPeriodicCounts" resultType="cn.hutool.core.lang.Pair">
+    <select id="getEnquiryPeriodicCounts" resultType="org.apache.commons.lang3.tuple.ImmutablePair">
         SELECT
         tp.period AS period,
         COALESCE(COUNT(id), 0) AS enquires