Merge branch 'cpq-dev' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/entity/AdwebPublicBlackEmail.java

@@ -32,7 +32,7 @@ public class AdwebPublicBlackEmail implements Serializable {
     /**
      * 主键
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
     private String id;
     /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/entity/AdwebPublicBlackIp.java

@@ -32,7 +32,7 @@ public class AdwebPublicBlackIp implements Serializable {
     /**
      * 主键
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
     private String id;
     /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/entity/AdwebPublicEnquiryRule.java

@@ -32,7 +32,7 @@ public class AdwebPublicEnquiryRule implements Serializable {
     /**
      * 主键
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
     private String id;
     /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/entity/AdwebSiteBlackEmail.java

@@ -32,7 +32,7 @@ public class AdwebSiteBlackEmail implements Serializable {
     /**
      * id
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "id")
     private String id;
     /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/entity/AdwebSiteBlackIp.java

@@ -32,7 +32,7 @@ public class AdwebSiteBlackIp implements Serializable {
     /**
      * id
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "id")
     private String id;
     /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/entity/AdwebSiteEnquiryRule.java

@@ -32,7 +32,7 @@ public class AdwebSiteEnquiryRule implements Serializable {
     /**
      * id
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "id")
     private String id;
     /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/entity/SubUserEmail.java

@@ -0,0 +1,46 @@
+package org.jeecg.modules.adweb.enquiry.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+/**
+ * @Time 2024/7/2 11:40
+ * @Description
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sub_user_email")
+public class SubUserEmail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 站点主键ID
+     */
+    @Excel(name = "站点ID", width = 15)
+    private Integer sid;
+    /**
+     * 登录账号
+     */
+    @Excel(name = "登录账号", width = 15)
+    private String username;
+
+    /**
+     * 真实姓名
+     */
+    @Excel(name = "真实姓名", width = 15)
+    private String realname;
+}

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

@@ -0,0 +1,12 @@
+package org.jeecg.modules.adweb.enquiry.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.adweb.enquiry.entity.SubUserEmail;
+
+/**
+ * @Time 2024/7/2 11:45
+ * @Description
+ */
+public interface SubUserEmailMapper extends BaseMapper<SubUserEmail> {
+    boolean removeAll();
+}

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

@@ -0,0 +1,10 @@
+<?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.enquiry.mapper.SubUserEmailMapper">
+
+
+    <delete id="removeAll">
+        DELETE
+        FROM sub_user_email
+    </delete>
+</mapper>

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

@@ -0,0 +1,13 @@
+package org.jeecg.modules.adweb.enquiry.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.adweb.enquiry.entity.SubUserEmail;
+
+/**
+ * @Time 2024/7/2 11:43
+ * @Description
+ */
+public interface ISubUserEmailService extends IService<SubUserEmail> {
+
+    boolean removeAll();
+}

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

@@ -19,6 +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.constant.NumConstant;
 import org.jeecg.modules.adweb.common.dto.CountryAreaApiDto;
 import org.jeecg.modules.adweb.common.service.FeishuService;
@@ -139,6 +140,9 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
     @Resource
     private EnquiryRedisService enquiryRedisService;
 
+    @Resource
+    private ISubUserEmailService subUserEmailService;
+
     private static final byte[] redisKey = EnquiryConstants.ENQUIRY_EMAIL.getBytes();
 
     private static final byte[] siteRedisKey = EnquiryConstants.ENQUIRY_SITE.getBytes();
@@ -476,37 +480,39 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                         emailSet.add(e);
                     }
                 }
-            }
 
-            log.info("=======发送询盘邮件======");
-            enquiryEmailMessageList.forEach(e -> System.out.println(e.getEmail()));
-            log.info("需要添加的询盘邮件：{}", FastJsonUtil.toJSONString(enquiryEmailMessageList));
-            if (CollectionUtils.isNotEmpty(enquiryEmailMessageList)) {
-                QueryWrapper<EnquiryEmailMessage> enquiryEmailMessageQueryWrapper = new QueryWrapper<>();
-                enquiryEmailMessageQueryWrapper.eq("site_code", adwebSite.getCode());
-                List<EnquiryEmailMessage> enquiryEmailMessages = enquiryEmailMessageService.list(enquiryEmailMessageQueryWrapper);
-                List<EnquiryEmailMessage> sameEnquiryEmailMessageList = new ArrayList<>();
-                if (CollectionUtils.isNotEmpty(enquiryEmailMessages)) {
-                    for (EnquiryEmailMessage enquiryEmailMessage : enquiryEmailMessages) {
-                        for (EnquiryEmailMessage enquiryEmailMessage1 : enquiryEmailMessageList) {
-                            if (enquiryEmailMessage.getEnquiryId().equals(enquiryEmailMessage1.getEnquiryId()) && enquiryEmailMessage.getEmail().equals(enquiryEmailMessage1.getEmail())) {
-                                sameEnquiryEmailMessageList.add(enquiryEmailMessage1);
+                log.info("=======发送询盘邮件======");
+                enquiryEmailMessageList.forEach(e -> System.out.println(e.getEmail()));
+                log.info("需要添加的询盘邮件：{}", FastJsonUtil.toJSONString(enquiryEmailMessageList));
+                if (CollectionUtils.isNotEmpty(enquiryEmailMessageList)) {
+                    QueryWrapper<EnquiryEmailMessage> enquiryEmailMessageQueryWrapper = new QueryWrapper<>();
+                    enquiryEmailMessageQueryWrapper.eq("site_code", adwebSite.getCode());
+                    List<EnquiryEmailMessage> enquiryEmailMessages = enquiryEmailMessageService.list(enquiryEmailMessageQueryWrapper);
+                    List<EnquiryEmailMessage> sameEnquiryEmailMessageList = new ArrayList<>();
+                    if (CollectionUtils.isNotEmpty(enquiryEmailMessages)) {
+                        for (EnquiryEmailMessage enquiryEmailMessage : enquiryEmailMessages) {
+                            for (EnquiryEmailMessage enquiryEmailMessage1 : enquiryEmailMessageList) {
+                                if (enquiryEmailMessage.getEnquiryId().equals(enquiryEmailMessage1.getEnquiryId()) && enquiryEmailMessage.getEmail().equals(enquiryEmailMessage1.getEmail())) {
+                                    sameEnquiryEmailMessageList.add(enquiryEmailMessage1);
+                                }
                             }
                         }
+                        enquiryEmailMessageList.removeAll(sameEnquiryEmailMessageList);
                     }
-                    enquiryEmailMessageList.removeAll(sameEnquiryEmailMessageList);
-                }
-                log.info("最终添加的询盘邮件：{}", FastJsonUtil.toJSONString(enquiryEmailMessageList));
-                enquiryEmailMessageService.saveBatch(enquiryEmailMessageList);
-                try {
-                    for (EnquiryEmailMessage message : enquiryEmailMessageList) {
-                        ObjectMapper objectMapper = new ObjectMapper();
-                        JedisUtil.lpush(redisKey, objectMapper.writeValueAsBytes(message.getEnquiryId()));
-                        JedisUtil.publishMsg(EnquiryConstants.ENQUIRY_EMAIL_CHANNEL, EnquiryConstants.ENQUIRY_EMAIL);
+                    log.info("最终添加的询盘邮件：{}", FastJsonUtil.toJSONString(enquiryEmailMessageList));
+                    enquiryEmailMessageService.saveBatch(enquiryEmailMessageList);
+                    try {
+                        for (EnquiryEmailMessage message : enquiryEmailMessageList) {
+                            ObjectMapper objectMapper = new ObjectMapper();
+                            JedisUtil.lpush(redisKey, objectMapper.writeValueAsBytes(message.getEnquiryId()));
+                            JedisUtil.publishMsg(EnquiryConstants.ENQUIRY_EMAIL_CHANNEL, EnquiryConstants.ENQUIRY_EMAIL);
+                        }
+                    } catch (Exception e) {
+                        log.info("推送发送询盘邮件的消息失败", e);
                     }
-                } catch (Exception e) {
-                    log.info("推送发送询盘邮件的消息失败", e);
                 }
+            } else {
+                log.info("=======该垃圾询盘不发送询盘邮件======{}", adwebEnquiry.getId());
             }
         }
     }
@@ -544,10 +550,46 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                 if (mainUser != null && StringUtils.isNotBlank(mainUser.getEmail())) {
                     enquiryEmailMessageList.add(newEmail(adwebEnquiry, mainUser.getEmail()));
                 }
+            } else {
+                //轮流发送邮件逻辑处理
+                List<SubUserEmail> list = subUserEmailService.list();
+                if (CollectionUtils.isEmpty(list)) {
+                    sysUser = sysUsers.get(0);
+                } else {
+                    SubUserEmail subUserEmail = list.get(0);
+                    subUserEmailService.removeAll();
+
+                    SysUser user = sysUserService.getById(subUserEmail.getId());
+                    int index = sysUsers.indexOf(user);
+                    if (index == -1 || index == sysUsers.size() - 1) {
+                        sysUser = sysUsers.get(0);
+                    } else {
+                        sysUser = sysUsers.get(index + 1);
+                    }
+                }
+                SubUserEmail subUserEmail = new SubUserEmail();
+                subUserEmail.setId(sysUser.getId());
+                subUserEmail.setSid(adwebSite.getId());
+                subUserEmail.setUsername(sysUser.getUsername());
+                subUserEmail.setRealname(sysUser.getRealname());
+                subUserEmailService.save(subUserEmail);
+                //子账号邮件信息添加
+                enquiryEmailMessageList.add(newEmail(adwebEnquiry, sysUser.getEmail()));
+
+                //修改询盘信息的跟进人信息
+                adwebEnquiry.setPrincipalUid(sysUser.getId());
+                adwebEnquiryMapper.updateById(adwebEnquiry);
+
+                //获取主账号
+                SysUser mainUser = sysUserService.getById(adwebSite.getUid());
+                //主账号邮件信息添加
+                if (mainUser != null && StringUtils.isNotBlank(mainUser.getEmail())) {
+                    enquiryEmailMessageList.add(newEmail(adwebEnquiry, mainUser.getEmail()));
+                }
             }
+            log.info("=======发送询盘邮件======");
 
             enquiryEmailMessageList.forEach(e -> System.out.println(e.getEmail()));
-
             log.info("需要添加的询盘邮件：{}", FastJsonUtil.toJSONString(enquiryEmailMessageList));
             if (CollectionUtils.isNotEmpty(enquiryEmailMessageList)) {
                 QueryWrapper<EnquiryEmailMessage> enquiryEmailMessageQueryWrapper = new QueryWrapper<>();
@@ -568,8 +610,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                 enquiryEmailMessageService.saveBatch(enquiryEmailMessageList);
                 try {
                     for (EnquiryEmailMessage message : enquiryEmailMessageList) {
-                        ObjectMapper objectMapper = new ObjectMapper();
-                        JedisUtil.lpush(redisKey, objectMapper.writeValueAsBytes(message.getEnquiryId()));
+                        JedisUtil.lpush(redisKey, ObjectUtil.object2Bytes(message.getEnquiryId()));
                         JedisUtil.publishMsg(EnquiryConstants.ENQUIRY_EMAIL_CHANNEL, EnquiryConstants.ENQUIRY_EMAIL);
                     }
                     SysUser user = sysUserService.getById(adwebEnquiry.getPrincipalUid());
@@ -577,10 +618,12 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                         returnSalesperson(adwebSite.getCode(), adwebEnquiry.getRecordId(), user.getUsername());
                     }
                 } catch (Exception e) {
-                    log.info("推送发送询盘邮件的消息失败", e);
+                    log.error("推送发送询盘邮件的消息失败", e);
                 }
             }
 
+        } else {
+            log.info("=======该垃圾询盘在特殊站点中不发送询盘邮件======{}", adwebEnquiry.getId());
         }
     }
 
@@ -889,8 +932,10 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
             HashSet<String> blackEmailHashSet = new HashSet<String>(allBlackEmailList);
             blackEmailList = new ArrayList<>(blackEmailHashSet);
         }
-        log.info("公共邮箱黑名单：" + publicBlackEmailList.size());
-        log.info("站点邮箱黑名单：" + siteBlackEmailList.size());
+
+
+        log.info("公共邮箱黑名单：{}", publicBlackEmailList.size());
+        log.info("站点邮箱黑名单：{}", siteBlackEmailList.size());
 
         //邮箱 白名单
         //先获取对应站点的邮箱白名单

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
-import org.jeecg.common.util.RedisUtil;
+import org.jeecg.modules.adweb.common.util.AdwebRedisUtil;
 import org.jeecg.modules.adweb.enquiry.dto.param.EffectiveEnquiryParamDto;
 import org.jeecg.modules.adweb.enquiry.entity.AdwebSiteBlackEmail;
 import org.jeecg.modules.adweb.enquiry.mapper.AdwebSiteBlackEmailMapper;
@@ -25,7 +25,7 @@ import java.util.*;
 public class AdwebSiteBlackEmailServiceImpl extends ServiceImpl<AdwebSiteBlackEmailMapper, AdwebSiteBlackEmail> implements IAdwebSiteBlackEmailService {
 
     @Resource
-    private RedisUtil redisUtil;
+    private AdwebRedisUtil adwebRedisUtil;
     @Resource
     private AdwebSiteBlackEmailMapper enquirySiteBlackEmailMapper;
 
@@ -62,15 +62,15 @@ public class AdwebSiteBlackEmailServiceImpl extends ServiceImpl<AdwebSiteBlackEm
         //处理对应站点的黑名单
         if (blackOrWhite == 0) {
             if (CollectionUtils.isNotEmpty(emailList)) {
-                redisUtil.set(SiteBlackEmailKey + "::" + siteId, emailList, 60 * 60 * 24);
+                adwebRedisUtil.set(SiteBlackEmailKey + "::" + siteId, emailList, 60 * 60 * 24);
             } else {
-                redisUtil.del(SiteBlackEmailKey + "::" + siteId);
+                adwebRedisUtil.del(SiteBlackEmailKey + "::" + siteId);
             }
         } else {
             if (CollectionUtils.isNotEmpty(emailList)) {
-                redisUtil.set(SiteWhiteEmailListKey + "::" + siteId, emailList, 60 * 60 * 24);
+                adwebRedisUtil.set(SiteWhiteEmailListKey + "::" + siteId, emailList, 60 * 60 * 24);
             } else {
-                redisUtil.del(SiteWhiteEmailListKey + "::" + siteId);
+                adwebRedisUtil.del(SiteWhiteEmailListKey + "::" + siteId);
             }
         }
 
@@ -182,16 +182,16 @@ public class AdwebSiteBlackEmailServiceImpl extends ServiceImpl<AdwebSiteBlackEm
 
         //处理对应站点的黑名单
         if (CollectionUtils.isNotEmpty(emailList)) {
-            redisUtil.set(SiteBlackEmailKey + "::" + effectiveEnquiryParamDto.getSiteId(), emailList, 60 * 60 * 24);
+            adwebRedisUtil.set(SiteBlackEmailKey + "::" + effectiveEnquiryParamDto.getSiteId(), emailList, 60 * 60 * 24);
         } else {
-            redisUtil.del(SiteBlackEmailKey + "::" + effectiveEnquiryParamDto.getSiteId());
+            adwebRedisUtil.del(SiteBlackEmailKey + "::" + effectiveEnquiryParamDto.getSiteId());
         }
 
         //处理对应站点的白名单
         if (CollectionUtils.isNotEmpty(whiteEmailList)) {
-            redisUtil.set(SiteWhiteEmailListKey + "::" + effectiveEnquiryParamDto.getSiteId(), whiteEmailList, 60 * 60 * 24);
+            adwebRedisUtil.set(SiteWhiteEmailListKey + "::" + effectiveEnquiryParamDto.getSiteId(), whiteEmailList, 60 * 60 * 24);
         } else {
-            redisUtil.del(SiteWhiteEmailListKey + "::" + effectiveEnquiryParamDto.getSiteId());
+            adwebRedisUtil.del(SiteWhiteEmailListKey + "::" + effectiveEnquiryParamDto.getSiteId());
         }
     }
 }

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

@@ -0,0 +1,23 @@
+package org.jeecg.modules.adweb.enquiry.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jakarta.annotation.Resource;
+import org.jeecg.modules.adweb.enquiry.entity.SubUserEmail;
+import org.jeecg.modules.adweb.enquiry.mapper.SubUserEmailMapper;
+import org.jeecg.modules.adweb.enquiry.service.ISubUserEmailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Time 2024/7/2 11:44
+ * @Description
+ */
+@Service
+public class SubUserEmailServiceImpl extends ServiceImpl<SubUserEmailMapper, SubUserEmail> implements ISubUserEmailService {
+    @Resource
+    private SubUserEmailMapper subUserEmailMapper;
+
+    @Override
+    public boolean removeAll() {
+        return subUserEmailMapper.removeAll();
+    }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/entity/SeoKeywordsSerp.java

@@ -1,15 +1,14 @@
 package org.jeecg.modules.adweb.seo.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+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;
 
@@ -19,61 +18,84 @@ import java.util.Date;
 /**
  * @Description: SEO关键词搜索排名
  * @Author: jeecg-boot
- * @Date:   2024-10-15
+ * @Date: 2024-10-15
  * @Version: V1.0
  */
 @Data
 @TableName("seo_keywords_serp")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description="SEO关键词搜索排名")
+@Schema(description = "SEO关键词搜索排名")
 public class SeoKeywordsSerp implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**关键词搜索排名主键ID*/
-	@Excel(name = "关键词搜索排名主键ID", width = 15)
+    /**
+     * 关键词搜索排名主键ID
+     */
+    @Excel(name = "关键词搜索排名主键ID", width = 15)
     @Schema(description = "关键词搜索排名主键ID")
+    @TableId(type = IdType.AUTO)
     private Integer serpId;
-	/**关键词ID*/
-	@Excel(name = "关键词ID", width = 15)
+    /**
+     * 关键词ID
+     */
+    @Excel(name = "关键词ID", width = 15)
     @Schema(description = "关键词ID")
     private Integer keywordsId;
-	/**搜索地址*/
-	@Excel(name = "搜索地址", width = 15)
+    /**
+     * 搜索地址
+     */
+    @Excel(name = "搜索地址", width = 15)
     @Schema(description = "搜索地址")
     private String searchUrl;
-	/**搜索引擎域名*/
-	@Excel(name = "搜索引擎域名", width = 15)
+    /**
+     * 搜索引擎域名
+     */
+    @Excel(name = "搜索引擎域名", width = 15)
     @Schema(description = "搜索引擎域名")
     private String seDomain;
-	/**搜索语言*/
-	@Excel(name = "搜索语言", width = 15)
+    /**
+     * 搜索语言
+     */
+    @Excel(name = "搜索语言", width = 15)
     @Schema(description = "搜索语言")
     private String languageCode;
-	/**结果类型，如：organic、image、video等*/
-	@Excel(name = "结果类型，如：organic、image、video等", width = 15)
+    /**
+     * 结果类型，如：organic、image、video等
+     */
+    @Excel(name = "结果类型，如：organic、image、video等", width = 15)
     @Schema(description = "结果类型，如：organic、image、video等")
     private String type;
-	/**所在页数*/
-	@Excel(name = "所在页数", width = 15)
+    /**
+     * 所在页数
+     */
+    @Excel(name = "所在页数", width = 15)
     @Schema(description = "所在页数")
     private Integer pageNumber;
-	/**结果类型分组排名*/
-	@Excel(name = "结果类型分组排名", width = 15)
+    /**
+     * 结果类型分组排名
+     */
+    @Excel(name = "结果类型分组排名", width = 15)
     @Schema(description = "结果类型分组排名")
     private Integer rankGroup;
-	/**自然全局排名*/
-	@Excel(name = "自然全局排名", width = 15)
+    /**
+     * 自然全局排名
+     */
+    @Excel(name = "自然全局排名", width = 15)
     @Schema(description = "自然全局排名")
     private Integer rankAbsolute;
-	/**搜索日期*/
-	@Excel(name = "搜索日期", width = 15)
+    /**
+     * 搜索日期
+     */
+    @Excel(name = "搜索日期", width = 15)
     @Schema(description = "搜索日期")
     private String seDate;
-	/**搜索时间*/
-	@Excel(name = "搜索时间", 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")
+    /**
+     * 搜索时间
+     */
+    @Excel(name = "搜索时间", 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 = "搜索时间")
     private Date seDatetime;
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/entity/SeoPlanSubscription.java

@@ -31,7 +31,7 @@ public class SeoPlanSubscription implements Serializable {
     /**
      * 主键
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
     private String id;
     /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/entity/AdwebUserWpsite.java

@@ -32,7 +32,7 @@ public class AdwebUserWpsite implements Serializable {
     /**
      * id
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "id")
     private String id;
     /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscribePlan/entity/SubscribePlan.java

@@ -31,7 +31,7 @@ public class SubscribePlan implements Serializable {
     /**
      * 主键
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
     private java.lang.String id;
     /**

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

@@ -25,7 +25,7 @@ public class MasterSubAccountRelation implements Serializable {
     /**
      * 子账户ID
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "子账户ID")
     private String subId;
     /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/theme/entity/AdwebTheme.java

@@ -30,7 +30,7 @@ public class AdwebTheme implements Serializable {
     /**
      * 主键
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
     private java.lang.String id;
     /**