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

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/Jedis/Message.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/jedis/Message.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.common.Jedis;
+package org.jeecg.modules.adweb.common.jedis;
 
 import lombok.Getter;
 import lombok.Setter;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/Jedis/ObjectUtil.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/jedis/ObjectUtil.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.common.Jedis;
+package org.jeecg.modules.adweb.common.jedis;
 
 import java.io.*;
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/analytics/report/ReportConstant.java

@@ -20,4 +20,5 @@ public class ReportConstant {
     public static final String DIMENSION_SESSION_SOURCE_MEDIUM = "sessionSourceMedium";
     public static final String DIMENSION_PAGE_PATH = "pagePath";
     public static final String DIMENSION_DATE = "date";
+    public static final String DIMENSION_PLATFORM_DEVICE_CATEGORY = "platformDeviceCategory";
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/entity/GADeviceReport.java

@@ -0,0 +1,92 @@
+package org.jeecg.modules.adweb.dmp.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: dmp_ga_device_report
+ * @Author: jeecg-boot
+ * @Date: 2024-12-16
+ * @Version: V1.0
+ */
+@Data
+@TableName("dmp_ga_device_report")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "dmp_ga_device_report")
+public class GADeviceReport implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    @TableId(type = IdType.AUTO)
+    @Schema(description = "id")
+    private Long id;
+
+    /** 站点code */
+    @Excel(name = "站点code", width = 15)
+    @Schema(description = "站点code")
+    private String siteCode;
+
+    /** 统计时间 */
+    @Excel(name = "统计时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Schema(description = "统计时间")
+    private Date date;
+
+    /** device */
+    @Excel(name = "device", width = 15)
+    @Schema(description = "device")
+    private String device;
+
+    /** 访问量 */
+    @Excel(name = "访问量", width = 15)
+    @Schema(description = "访问量")
+    private Integer totalUsers;
+
+    /** 新用户数量 */
+    @Excel(name = "新用户数量", width = 15)
+    @Schema(description = "新用户数量")
+    private Integer newUsers;
+
+    /** 会话数量 */
+    @Excel(name = "会话数量", width = 15)
+    @Schema(description = "会话数量")
+    private Integer sessions;
+
+    /** avgSessionDuration */
+    @Excel(name = "avgSessionDuration", width = 15)
+    @Schema(description = "avgSessionDuration")
+    private Double avgSessionDuration;
+
+    /** 页面访问量 */
+    @Excel(name = "页面访问量", width = 15)
+    @Schema(description = "页面访问量")
+    private Integer pageViews;
+
+    /** pageViewsPerSession */
+    @Excel(name = "pageViewsPerSession", width = 15)
+    @Schema(description = "pageViewsPerSession")
+    private Double pageViewsPerSession;
+
+    /** ctime */
+    @Excel(name = "ctime", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "ctime")
+    private Date ctime;
+}

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

@@ -0,0 +1,10 @@
+package org.jeecg.modules.adweb.dmp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import org.jeecg.modules.adweb.dmp.entity.GADeviceReport;
+
+/**
+ * @Description: dmp_ga_device_report @Author: jeecg-boot @Date: 2024-12-16 @Version: V1.0
+ */
+public interface GADeviceReportMapper extends BaseMapper<GADeviceReport> {}

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.GADeviceReportMapper">
+
+</mapper>

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

@@ -0,0 +1,10 @@
+package org.jeecg.modules.adweb.dmp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import org.jeecg.modules.adweb.dmp.entity.GADeviceReport;
+
+/**
+ * @Description: dmp_ga_device_report @Author: jeecg-boot @Date: 2024-12-16 @Version: V1.0
+ */
+public interface IGADeviceReportService extends IService<GADeviceReport> {}

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

@@ -0,0 +1,18 @@
+package org.jeecg.modules.adweb.dmp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.adweb.dmp.entity.GADeviceReport;
+import org.jeecg.modules.adweb.dmp.mapper.GADeviceReportMapper;
+import org.jeecg.modules.adweb.dmp.service.IGADeviceReportService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: dmp_ga_device_report @Author: jeecg-boot @Date: 2024-12-16 @Version: V1.0
+ */
+@Service
+@Slf4j
+public class GADeviceReportServiceImpl extends ServiceImpl<GADeviceReportMapper, GADeviceReport>
+        implements IGADeviceReportService {}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/service/impl/AdwebEnquiryServiceImpl.java

@@ -19,7 +19,7 @@ import org.jeecg.common.constant.WebsocketConst;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictPropertyModel;
 import org.jeecg.common.util.FastJsonUtil;
-import org.jeecg.modules.adweb.common.Jedis.ObjectUtil;
+import org.jeecg.modules.adweb.common.jedis.ObjectUtil;
 import org.jeecg.modules.adweb.common.constant.NumConstant;
 import org.jeecg.modules.adweb.common.dto.CountryAreaApiDto;
 import org.jeecg.modules.adweb.common.service.FeishuService;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/service/impl/EnquiryEmailMessageServiceImpl.java

@@ -12,7 +12,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.FastJsonUtil;
-import org.jeecg.modules.adweb.common.Jedis.ObjectUtil;
+import org.jeecg.modules.adweb.common.jedis.ObjectUtil;
 import org.jeecg.modules.adweb.common.service.FeishuService;
 import org.jeecg.modules.adweb.common.util.AdwebRedisUtil;
 import org.jeecg.modules.adweb.common.util.JedisUtil;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/listener/EnquiryEmailSenderListener.java

@@ -2,7 +2,7 @@ package org.jeecg.modules.adweb.listener;
 
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.adweb.common.Jedis.ObjectUtil;
+import org.jeecg.modules.adweb.common.jedis.ObjectUtil;
 import org.jeecg.modules.adweb.common.util.JedisUtil;
 import org.jeecg.modules.adweb.enquiry.constant.EnquiryConstants;
 import org.jeecg.modules.adweb.enquiry.service.IEnquiryEmailMessageService;

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

@@ -1,14 +1,12 @@
 package org.jeecg.modules.adweb.system.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.adweb.common.Jedis.ObjectUtil;
+import org.jeecg.modules.adweb.common.jedis.ObjectUtil;
 import org.jeecg.modules.adweb.common.util.JedisUtil;
 import org.jeecg.modules.adweb.enquiry.constant.EnquiryConstants;
 import org.jeecg.modules.adweb.enquiry.service.EnquiryRedisService;