Merge branch 'refs/heads/master' into dev-zenas-20241018

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/controller/GADataController.java

@@ -7,7 +7,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.adweb.common.util.DateUtil;
+import org.jeecg.modules.adweb.dmp.service.IGACountryReportService;
 import org.jeecg.modules.adweb.dmp.service.IGAPagePathReportService;
+import org.jeecg.modules.adweb.dmp.vo.report.CountryStatsVO;
 import org.jeecg.modules.adweb.dmp.vo.report.PagePathStatsVO;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +35,7 @@ public class GADataController {
 
     @Autowired private IAdwebSiteService adwebSiteService;
 
+    @Autowired private IGACountryReportService gaCountryReportService;
     @Autowired private IGAPagePathReportService gaPagePathReportService;
 
     //    /** 网站流量分析统计 */
@@ -53,6 +56,23 @@ public class GADataController {
     //        }
     //    }
 
+    @GetMapping("/country/stats")
+    public Result<List<CountryStatsVO>> getCountryStats(
+            String siteCode,
+            String dateType,
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date start,
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date end) {
+        // 1. 计算时间区间
+        if (StringUtils.isNotBlank(dateType)) {
+            Map<String, Date> dateRange = DateUtil.getDateRangeByType(dateType);
+            start = dateRange.get("start");
+            end = dateRange.get("end");
+        }
+
+        // 2. 查询并返回
+        return Result.ok(gaCountryReportService.getCountryStats(siteCode, start, end));
+    }
+
     @GetMapping("/page-path/stats")
     public Result<List<PagePathStatsVO>> getPagePathStats(
             String siteCode,

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/mapper/GACountryReportMapper.java

@@ -1,16 +1,17 @@
 package org.jeecg.modules.adweb.dmp.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import org.jeecg.modules.adweb.dmp.entity.GACountryReport;
+import org.jeecg.modules.adweb.dmp.vo.report.CountryStatsVO;
+
+import java.util.Date;
+import java.util.List;
 
 /**
- * @Description: dmp_ga_country_report
- * @Author: jeecg-boot
- * @Date:   2024-10-11
- * @Version: V1.0
+ * @Description: dmp_ga_country_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 public interface GACountryReportMapper extends BaseMapper<GACountryReport> {
 
+    List<CountryStatsVO> getCountryStats(String siteCode, Date start, Date end);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/mapper/xml/GACountryReportMapper.xml

@@ -2,4 +2,32 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.adweb.dmp.mapper.GACountryReportMapper">
 
+    <select id="getCountryStats" resultType="org.jeecg.modules.adweb.dmp.vo.report.CountryStatsVO">
+        SELECT
+        t1.*,
+        LOWER(t2.country_iso_code) country_code,
+        t2.country_name
+        FROM
+        (
+        SELECT
+        country,
+        SUM(total_users) `total_users`
+        FROM
+        dmp_ga_country_report
+        WHERE
+        site_code = #{siteCode}
+        <if test="start != null">
+            AND date >= #{start}
+        </if>
+        <if test="end != null">
+            AND date &lt; DATE_ADD(#{end}, INTERVAL 1 DAY)
+        </if>
+        GROUP BY
+        country
+        ) t1
+        LEFT JOIN adweb_country t2 ON t1.country = t2.country_name_en
+        ORDER BY
+        t1.total_users DESC
+    </select>
+
 </mapper>

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

@@ -1,14 +1,16 @@
 package org.jeecg.modules.adweb.dmp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import org.jeecg.modules.adweb.dmp.entity.GACountryReport;
+import org.jeecg.modules.adweb.dmp.vo.report.CountryStatsVO;
+
+import java.util.Date;
+import java.util.List;
 
 /**
- * @Description: dmp_ga_country_report
- * @Author: jeecg-boot
- * @Date:   2024-10-11
- * @Version: V1.0
+ * @Description: dmp_ga_country_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 public interface IGACountryReportService extends IService<GACountryReport> {
-
+    List<CountryStatsVO> getCountryStats(String siteCode, Date start, Date end);
 }

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

@@ -2,18 +2,49 @@ package org.jeecg.modules.adweb.dmp.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import org.apache.commons.collections4.CollectionUtils;
+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.stereotype.Service;
 
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
 /**
- * @Description: dmp_ga_country_report
- * @Author: jeecg-boot
- * @Date:   2024-10-11
- * @Version: V1.0
+ * @Description: dmp_ga_country_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 @Service
-public class GACountryReportServiceImpl extends ServiceImpl<GACountryReportMapper, GACountryReport> implements IGACountryReportService {
+public class GACountryReportServiceImpl extends ServiceImpl<GACountryReportMapper, GACountryReport>
+        implements IGACountryReportService {
+
+    @Autowired private GACountryReportMapper gaCountryReportMapper;
+
+    @Override
+    public List<CountryStatsVO> getCountryStats(String siteCode, Date start, Date end) {
+        List<CountryStatsVO> countryStatsVOs =
+                gaCountryReportMapper.getCountryStats(siteCode, start, end);
+        if (CollectionUtils.isEmpty(countryStatsVOs)) {
+            return Collections.EMPTY_LIST;
+        }
+
+        // 1. 时间区间内所有国家totalUsers总数
+        int totalUsersSum = countryStatsVOs.stream().mapToInt(CountryStatsVO::getTotalUsers).sum();
+
+        // 2. VO数据填充
+        for (CountryStatsVO countryStatsVO : countryStatsVOs) {
+            countryStatsVO.setTotalUsersProportion(
+                    NumberUtil.formatPercentage(
+                            totalUsersSum == 0
+                                    ? 0
+                                    : (double) countryStatsVO.getTotalUsers() / totalUsersSum,
+                            2));
+        }
 
+        return countryStatsVOs;
+    }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/vo/report/CountryStatsVO.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.adweb.dmp.vo.report;
+
+import lombok.Data;
+
+import org.jeecg.modules.adweb.dmp.dto.google.analytics.report.data.CountryChartData;
+import org.jeecg.modules.adweb.dmp.entity.GACountryReport;
+
+/**
+ * GA国家分布统计数据VO，see {@link CountryChartData} and {@link GACountryReport}
+ *
+ * @author wfansh
+ */
+@Data
+public class CountryStatsVO {
+
+    private String country;
+
+    private String countryName;
+
+    private String countryCode;
+
+    private int totalUsers;
+
+    private String totalUsersProportion;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/controller/AdwebEnquiryController.java

@@ -669,6 +669,24 @@ public class AdwebEnquiryController extends JeecgController<AdwebEnquiry, IAdweb
         return Result.OK("批量复原成功!");
     }
 
+    @GetMapping("/getWastedEnquiry")
+    public Result<List<EnquiryListDto>> getWastedEnquiry(EnquiryListSearchDto enquiryListSearchDto) {
+
+        List<EnquiryListDto> wasterEnquiries = adwebEnquiryMapper.getWastedEnquiry(
+                enquiryListSearchDto.getWasteEnquiryType()
+                ,enquiryListSearchDto.getIp()
+                ,enquiryListSearchDto.getEmail()
+                ,enquiryListSearchDto.getKeyword()
+                ,enquiryListSearchDto.getSearchText()
+                ,enquiryListSearchDto.getType()
+                ,enquiryListSearchDto.getSiteId()
+        );
+
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        return Result.OK(wasterEnquiries);
+    }
+
 
     /**
      * 根据询盘信息创建邮件发送记录

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

@@ -63,4 +63,7 @@ public interface AdwebEnquiryMapper extends BaseMapper<AdwebEnquiry> {
                                                 @Param("whatsApp") String whatsApp,
                                                 @Param("principalUid") String principalUid);
 
+    List<EnquiryListDto> getWastedEnquiry(String wasteEnquiryType, String ip, String email, String keyword, String searchText, String type, Integer siteId);
+
+
 }

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

@@ -195,6 +195,96 @@
         t1.record_ctime DESC
     </select>
 
+    <select id="getWastedEnquiry" resultType="org.jeecg.modules.adweb.enquiry.dto.result.EnquiryListDto">
+        SELECT t1.id,
+        t2.`name` AS siteName,
+        t1.`no`,
+        t1.no_out AS noOut,
+        t1.modular,
+        t1.record_ctime AS recordCtime,
+        t1.from_email AS fromEmail,
+        t1.country,
+        t1.site_host AS siteHost,
+        t1.uid,
+        t1.`status`,
+        t1.tracker,
+        t1.site_code AS siteCode,
+        t1.site_id AS siteId,
+        t1.phase,
+        t1.track_status AS trackStatus,
+        t1.replay_status AS replayStatus,
+        t1.sys_effective AS sysEffective,
+        t1.user_effective AS userEffective,
+        t1.sensitive_message AS sensitiveMessage,
+        t1.company_id AS companyId,
+        t1.contact_ids AS contactIds,
+        t1.trans_content AS transContent,
+        t1.whats_app AS whatsApp,
+        t1.name contact,
+        t1.phone,
+        t1.company formCompany,
+        t1.from_page,
+        t1.message context,
+        t1.from_page path,
+        t1.from_ip fromIp,
+        t1.customer_ip customerIp,
+        t1.read_status,
+        t1.visit_id,
+        t1.special_field,
+        t1.country_name countryName,
+        t1.effective_reason effectiveReason,
+        t1.plugin_name pluginName FROM adweb_enquiry t1
+        LEFT JOIN adweb_site t2 ON t1.site_code = t2.`code`
+        WHERE
+        t1.status = 1 AND t1.user_effective = 0 AND t1.sys_effective = 1 AND t1.waste_enquiry_type = #{wasteEnquiryType}
+        <if test="ip != null and ip != ''">
+            <if test="siteId != null and siteId != ''">
+                AND t1.site_id = #{siteId}
+            </if>
+            AND t1.customer_ip = #{ip}
+            <if test="null != searchText and '' != searchText">
+                AND (
+                t1.from_email like CONCAT('%', #{searchText}, '%')
+                OR t1.name like CONCAT('%', #{searchText}, '%')
+                )
+            </if>
+        </if>
+        <if test="email != null and email != ''">
+            <if test="type == null or type == ''">
+                AND t1.from_email = #{email}
+            </if>
+            <if test="type == 0">
+                AND (
+                t1.from_email like CONCAT('%', #{email}, '%')
+                AND t1.from_email != #{email} and t1.site_id = #{siteId}
+                )
+            </if>
+            <if test="type == 1">
+                and t1.from_email = #{email} and t1.site_id = #{siteId}
+            </if>
+            <if test="null != searchText and '' != searchText">
+                and (
+                t1.from_email like CONCAT('%', #{searchText}, '%')
+                or t1.name like CONCAT('%', #{searchText}, '%')
+                )
+            </if>
+
+        </if>
+        <if test="keyword != null and keyword != ''">
+            <if test="siteId != null and siteId != ''">
+                AND t1.site_id = #{siteId}
+            </if>
+            AND SUBSTRING_INDEX(effective_reason,'-',-1) = #{keyword}
+            <if test="null != searchText and '' != searchText">
+                and (
+                t1.from_email like CONCAT('%', #{searchText}, '%')
+                or t1.name like CONCAT('%', #{searchText}, '%')
+                )
+            </if>
+        </if>
+        ORDER BY t1.record_ctime DESC
+    </select>
+
     <update id="updatePrincipalUidByRegion">
         update
         adweb_enquiry t1,