数据库自增

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

@@ -1,19 +1,19 @@
 package org.jeecg.modules.adweb.enquiry.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
+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 org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 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: 询盘信息存储表单
@@ -32,7 +32,7 @@ public class AdwebEnquiry implements Serializable {
     /**
      * 主键ID
      */
-    @TableId(type = IdType.ASSIGN_ID)
+    @TableId(type = IdType.AUTO)
     @Schema(description = "主键ID")
     private Long id;
     /**

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

@@ -18,35 +18,43 @@ import java.util.Date;
 /**
  * @Description: 询盘公共邮箱黑名单
  * @Author: jeecg-boot
- * @Date:   2023-02-15
+ * @Date: 2023-02-15
  * @Version: V1.0
  */
 @Data
 @TableName("adweb_public_black_email")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description="询盘公共邮箱黑名单")
+@Schema(description = "询盘公共邮箱黑名单")
 public class AdwebPublicBlackEmail implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
     @Schema(description = "主键")
     private String id;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="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 createTime;
-	/**邮箱*/
-	@Excel(name = "邮箱", width = 15)
+    /**
+     * 邮箱
+     */
+    @Excel(name = "邮箱", width = 15)
     @Schema(description = "邮箱")
     private String email;
     @Excel(name = "黑名单或白名单", width = 15)
     @Schema(description = "黑名单或白名单")
     private Integer blackOrWhite;
-	/**0为已删除，1为使用中*/
-	@Excel(name = "0为已删除，1为使用中", width = 15)
+    /**
+     * 0为已删除，1为使用中
+     */
+    @Excel(name = "0为已删除，1为使用中", width = 15)
     @Schema(description = "0为已删除，1为使用中")
     private Integer status;
 

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

@@ -18,40 +18,50 @@ import java.util.Date;
 /**
  * @Description: IP黑名单
  * @Author: jeecg-boot
- * @Date:   2023-02-20
+ * @Date: 2023-02-20
  * @Version: V1.0
  */
 @Data
 @TableName("adweb_public_black_ip")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description="IP黑名单")
+@Schema(description = "IP黑名单")
 public class AdwebPublicBlackIp implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
     @Schema(description = "主键")
     private String id;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="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 createTime;
-	/**状态*/
-	@Excel(name = "状态", width = 15)
+    /**
+     * 状态
+     */
+    @Excel(name = "状态", width = 15)
     @Schema(description = "状态")
     private Integer status;
-	/**ip*/
-	@Excel(name = "ip", width = 15)
+    /**
+     * ip
+     */
+    @Excel(name = "ip", width = 15)
     @Schema(description = "ip")
     private String ip;
-	/**黑名单或白名单*/
-	@Excel(name = "黑名单或白名单", width = 15)
+    /**
+     * 黑名单或白名单
+     */
+    @Excel(name = "黑名单或白名单", width = 15)
     @Schema(description = "黑名单或白名单")
     private Integer blackOrWhite;
 
-	@TableField(exist = false)
+    @TableField(exist = false)
     private Integer wasteEnquiryNum;
 
     public AdwebPublicBlackIp() {

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

@@ -18,32 +18,40 @@ import java.util.Date;
 /**
  * @Description: 用于询盘公共规则过滤
  * @Author: jeecg-boot
- * @Date:   2024-10-17
+ * @Date: 2024-10-17
  * @Version: V1.0
  */
 @Data
 @TableName("adweb_public_enquiry_rule")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description="用于询盘规则过滤")
+@Schema(description = "用于询盘规则过滤")
 public class AdwebPublicEnquiryRule implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
     @Schema(description = "主键")
     private String id;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "创建日期")
     private Date createTime;
-	/**状态0为删除1为使用中*/
-	@Excel(name = "状态0为删除1为使用中", width = 15)
+    /**
+     * 状态0为删除1为使用中
+     */
+    @Excel(name = "状态0为删除1为使用中", width = 15)
     @Schema(description = "状态0为删除1为使用中")
     private Integer status;
-	/**关键词*/
-	@Excel(name = "关键词", width = 15)
+    /**
+     * 关键词
+     */
+    @Excel(name = "关键词", width = 15)
     @Schema(description = "关键词")
     private String word;
 
@@ -52,14 +60,18 @@ public class AdwebPublicEnquiryRule implements Serializable {
      */
     @Excel(name = "关键词翻译", width = 15)
     @Schema(description = "关键词翻译")
-	private String translateWord;
+    private String translateWord;
 
-	/**黑名单或白名单0为黑名单，1为白名单*/
-	@Excel(name = "黑名单或白名单0为黑名单，1为白名单", width = 15)
+    /**
+     * 黑名单或白名单0为黑名单，1为白名单
+     */
+    @Excel(name = "黑名单或白名单0为黑名单，1为白名单", width = 15)
     @Schema(description = "黑名单或白名单0为黑名单，1为白名单")
     private Integer blackOrWhiteList;
-	/**是否启用该字段1为启用0为停用*/
-	@Excel(name = "是否启用该字段1为启用0为停用", width = 15)
+    /**
+     * 是否启用该字段1为启用0为停用
+     */
+    @Excel(name = "是否启用该字段1为启用0为停用", width = 15)
     @Schema(description = "是否启用该字段1为启用0为停用")
     private Integer isEnable;
 

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

@@ -18,57 +18,77 @@ import java.util.Date;
 /**
  * @Description: adweb_site_black_email
  * @Author: jeecg-boot
- * @Date:   2024-10-17
+ * @Date: 2024-10-17
  * @Version: V1.0
  */
 @Data
 @TableName("adweb_site_black_email")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description="adweb_site_black_email")
+@Schema(description = "adweb_site_black_email")
 public class AdwebSiteBlackEmail implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
     @Schema(description = "id")
     private String id;
-	/**站点id*/
-	@Excel(name = "站点id", width = 15)
+    /**
+     * 站点id
+     */
+    @Excel(name = "站点id", width = 15)
     @Schema(description = "站点id")
     private Integer siteId;
-    /**站点code*/
+    /**
+     * 站点code
+     */
     @Excel(name = "站点code", width = 15)
     @Schema(description = "站点code")
     private String siteCode;
-	/**邮箱*/
-	@Excel(name = "邮箱", width = 15)
+    /**
+     * 邮箱
+     */
+    @Excel(name = "邮箱", width = 15)
     @Schema(description = "邮箱")
     private String email;
-	/**黑名单类型，0：通配，1：完全匹配*/
-	@Excel(name = "黑名单类型，0：通配，1：完全匹配", width = 15)
+    /**
+     * 黑名单类型，0：通配，1：完全匹配
+     */
+    @Excel(name = "黑名单类型，0：通配，1：完全匹配", width = 15)
     @Schema(description = "黑名单类型，0：通配，1：完全匹配")
     private String type;
-	/**0为已删除，1为使用中*/
-	@Excel(name = "0为已删除，1为使用中", width = 15)
+    /**
+     * 0为已删除，1为使用中
+     */
+    @Excel(name = "0为已删除，1为使用中", width = 15)
     @Schema(description = "0为已删除，1为使用中")
     private Integer status;
-	/**0黑名单，1白名单*/
-	@Excel(name = "0黑名单，1白名单", width = 15)
+    /**
+     * 0黑名单，1白名单
+     */
+    @Excel(name = "0黑名单，1白名单", width = 15)
     @Schema(description = "0黑名单，1白名单")
     private Integer blackOrWhite;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Schema(description = "创建日期")
     private Date createTime;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    /**
+     * 更新时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Schema(description = "更新时间")
     private Date updateTime;
 
-    /**站点名称*/
+    /**
+     * 站点名称
+     */
     @TableField(exist = false)
     private String siteName;
 

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

@@ -18,48 +18,64 @@ import java.util.Date;
 /**
  * @Description: adweb_site_black_ip
  * @Author: jeecg-boot
- * @Date:   2023-08-31
+ * @Date: 2023-08-31
  * @Version: V1.0
  */
 @Data
 @TableName("adweb_site_black_ip")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description="adweb_site_black_ip")
+@Schema(description = "adweb_site_black_ip")
 public class AdwebSiteBlackIp implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
     @Schema(description = "id")
     private String id;
-	/**站点id*/
-	@Excel(name = "站点id", width = 15)
+    /**
+     * 站点id
+     */
+    @Excel(name = "站点id", width = 15)
     @Schema(description = "站点id")
     private Integer siteId;
-	/**站点code*/
-	@Excel(name = "站点code", width = 15)
+    /**
+     * 站点code
+     */
+    @Excel(name = "站点code", width = 15)
     @Schema(description = "站点code")
     private String siteCode;
-	/**状态*/
-	@Excel(name = "状态", width = 15)
+    /**
+     * 状态
+     */
+    @Excel(name = "状态", width = 15)
     @Schema(description = "状态")
     private Integer status;
-	/**ip*/
-	@Excel(name = "ip", width = 15)
+    /**
+     * ip
+     */
+    @Excel(name = "ip", width = 15)
     @Schema(description = "ip")
     private String ip;
-	/**黑名单或白名单*/
-	@Excel(name = "黑名单或白名单", width = 15)
+    /**
+     * 黑名单或白名单
+     */
+    @Excel(name = "黑名单或白名单", width = 15)
     @Schema(description = "黑名单或白名单")
     private Integer blackOrWhite;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="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 createTime;
 
-    /**站点名称*/
+    /**
+     * 站点名称
+     */
     @TableField(exist = false)
     private String siteName;
 

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.ASSIGN_ID)
+    @TableId(type = IdType.AUTO)
     @Schema(description = "id")
     private String id;
     /**

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

@@ -21,114 +21,160 @@ import java.util.Map;
 /**
  * @Description: 关键词
  * @Author: jeecg-boot
- * @Date:   2024-10-15
+ * @Date: 2024-10-15
  * @Version: V1.0
  */
 @Data
 @TableName("seo_keywords")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description="关键词")
+@Schema(description = "关键词")
 public class SeoKeywords implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**关键词表主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * 关键词表主键
+     */
+    @TableId(type = IdType.AUTO)
     @Schema(description = "关键词表主键")
     private Integer id;
-	/**平台标识*/
-	@Excel(name = "平台标识", width = 15)
+    /**
+     * 平台标识
+     */
+    @Excel(name = "平台标识", width = 15)
     @Schema(description = "平台标识")
     private String appKey;
-	/**用户标识*/
-	@Excel(name = "网站code", width = 15)
+    /**
+     * 用户标识
+     */
+    @Excel(name = "网站code", width = 15)
     @Schema(description = "网站code")
     private String siteCode;
-	/**关键词*/
-	@Excel(name = "关键词", width = 15)
+    /**
+     * 关键词
+     */
+    @Excel(name = "关键词", width = 15)
     @Schema(description = "关键词")
     private String keywords;
-	/**关键词所属域名*/
-	@Excel(name = "关键词所属域名", width = 15)
+    /**
+     * 关键词所属域名
+     */
+    @Excel(name = "关键词所属域名", width = 15)
     @Schema(description = "关键词所属域名")
     private String domain;
-	/**语种*/
-	@Excel(name = "语种", width = 15)
+    /**
+     * 语种
+     */
+    @Excel(name = "语种", width = 15)
     @Schema(description = "语种")
     private String lang;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="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 createTime;
-	/**最新搜索时间*/
-	@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 lastSearchTime;
-	/**定时器的最新搜索时间*/
-	@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 timerLastSearchTime;
-	/**0删除，1有效，2过期*/
-	@Excel(name = "0删除，1有效，2过期", width = 15)
+    /**
+     * 0删除，1有效，2过期
+     */
+    @Excel(name = "0删除，1有效，2过期", width = 15)
     @Schema(description = "0删除，1有效，2过期")
     private Integer status;
-	/**数据复制源ID*/
-	@Excel(name = "数据复制源ID", width = 15)
+    /**
+     * 数据复制源ID
+     */
+    @Excel(name = "数据复制源ID", width = 15)
     @Schema(description = "数据复制源ID")
     private Integer sourceId;
-	/**关键词优先级（1：高；2：中；3：低）*/
-	@Excel(name = "关键词优先级（1：高；2：中；3：低）", width = 15)
+    /**
+     * 关键词优先级（1：高；2：中；3：低）
+     */
+    @Excel(name = "关键词优先级（1：高；2：中；3：低）", width = 15)
     @Schema(description = "关键词优先级（1：高；2：中；3：低）")
     private Integer priority;
-	/**SEO关键词优化完成时间*/
-	@Excel(name = "SEO关键词优化完成时间", 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")
+    /**
+     * SEO关键词优化完成时间
+     */
+    @Excel(name = "SEO关键词优化完成时间", 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 = "SEO关键词优化完成时间")
     private Date finishTime;
-	/**优化进度（默认0）*/
-	@Excel(name = "优化进度（默认0）", width = 15)
+    /**
+     * 优化进度（默认0）
+     */
+    @Excel(name = "优化进度（默认0）", width = 15)
     @Schema(description = "优化进度（默认0）")
     private Integer optimizeProcess;
-	/**优化状态（0：未完成；1：已完成）*/
-	@Excel(name = "优化状态（0：未完成；1：已完成）", width = 15)
+    /**
+     * 优化状态（0：未完成；1：已完成）
+     */
+    @Excel(name = "优化状态（0：未完成；1：已完成）", width = 15)
     @Schema(description = "优化状态（0：未完成；1：已完成）")
     private Integer optimizeStatus;
-	/**关键词类型（1：指定；2：长尾）*/
-	@Excel(name = "关键词类型（1：指定；2：长尾）", width = 15)
+    /**
+     * 关键词类型（1：指定；2：长尾）
+     */
+    @Excel(name = "关键词类型（1：指定；2：长尾）", width = 15)
     @Schema(description = "关键词类型（1：指定；2：长尾）")
     @Dict(dicCode = "keyword_type")
     private Integer keywordType;
-	/**最近一次搜索排名*/
-	@Excel(name = "最近一次搜索排名", width = 15)
+    /**
+     * 最近一次搜索排名
+     */
+    @Excel(name = "最近一次搜索排名", width = 15)
     @Schema(description = "最近一次搜索排名")
     private Integer lastRank;
-	/**搜索状态，0为普通状态，1为搜索进行中状态*/
-	@Excel(name = "搜索状态，0为普通状态，1为搜索进行中状态", width = 15)
+    /**
+     * 搜索状态，0为普通状态，1为搜索进行中状态
+     */
+    @Excel(name = "搜索状态，0为普通状态，1为搜索进行中状态", width = 15)
     @Schema(description = "搜索状态，0为普通状态，1为搜索进行中状态")
     private Integer searchStatus;
-	/**关键词所在URL*/
-	@Excel(name = "关键词所在URL", width = 15)
+    /**
+     * 关键词所在URL
+     */
+    @Excel(name = "关键词所在URL", width = 15)
     @Schema(description = "关键词所在URL")
     private String positionUrl;
-	/**相关关键词关联的关键词的id*/
-	@Excel(name = "相关关键词关联的关键词的id", width = 15)
+    /**
+     * 相关关键词关联的关键词的id
+     */
+    @Excel(name = "相关关键词关联的关键词的id", width = 15)
     @Schema(description = "相关关键词关联的关键词的id")
     private Integer relatedKeywordId;
-	/**关键词对应套餐的ID*/
-	@Excel(name = "关键词对应套餐的ID", width = 15)
+    /**
+     * 关键词对应套餐的ID
+     */
+    @Excel(name = "关键词对应套餐的ID", width = 15)
     @Schema(description = "关键词对应套餐的ID")
     private String planId;
-    /**订购表ID*/
+    /**
+     * 订购表ID
+     */
     @Excel(name = "订购表ID", width = 15)
     @Schema(description = "订购表ID")
     private java.lang.String subscriptionId;
-    /**网站表ID*/
+    /**
+     * 网站表ID
+     */
     @Excel(name = "网站表ID", width = 15)
     @Schema(description = "网站表ID")
     private java.lang.String siteId;

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

@@ -1,135 +1,183 @@
 package org.jeecg.modules.adweb.seo.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 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: seo套餐订购
  * @Author: jeecg-boot
- * @Date:   2024-10-15
+ * @Date: 2024-10-15
  * @Version: V1.0
  */
 @Data
 @TableName("seo_plan_subscription")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description="seo套餐订购")
+@Schema(description = "seo套餐订购")
 public class SeoPlanSubscription implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
     @Schema(description = "主键")
     private String id;
-	/**站点*/
-	@Excel(name = "站点", width = 15)
+    /**
+     * 站点
+     */
+    @Excel(name = "站点", width = 15)
     @Schema(description = "站点")
     private String siteId;
-	/**套餐*/
-	@Excel(name = "套餐", width = 15)
+    /**
+     * 套餐
+     */
+    @Excel(name = "套餐", width = 15)
     @Schema(description = "套餐")
     private String planId;
-	/**创建人*/
+    /**
+     * 创建人
+     */
     @Schema(description = "创建人")
     private String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="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 createTime;
-	/**状态*/
-	@Excel(name = "状态", width = 15)
+    /**
+     * 状态
+     */
+    @Excel(name = "状态", width = 15)
     @Schema(description = "状态")
     private Integer status;
-	/**方案使用者ID*/
-	@Excel(name = "方案使用者ID", width = 15)
+    /**
+     * 方案使用者ID
+     */
+    @Excel(name = "方案使用者ID", width = 15)
     @Schema(description = "方案使用者ID")
     private String usedUid;
-	/**方案类型*/
-	@Excel(name = "方案类型", width = 15)
+    /**
+     * 方案类型
+     */
+    @Excel(name = "方案类型", width = 15)
     @Schema(description = "方案类型")
     private String planType;
-	/**方案价格*/
-	@Excel(name = "方案价格", width = 15)
+    /**
+     * 方案价格
+     */
+    @Excel(name = "方案价格", width = 15)
     @Schema(description = "方案价格")
     private Double planPrice;
-	/**方案编码*/
-	@Excel(name = "方案编码", width = 15)
+    /**
+     * 方案编码
+     */
+    @Excel(name = "方案编码", width = 15)
     @Schema(description = "方案编码")
     private String planCode;
-	/**方案名称*/
-	@Excel(name = "方案名称", width = 15)
+    /**
+     * 方案名称
+     */
+    @Excel(name = "方案名称", width = 15)
     @Schema(description = "方案名称")
     private String planName;
-	/**指定关键词最早达标时间*/
-	@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 keywordsAchieveTime;
-	/**是否续费*/
-	@Excel(name = "是否续费", width = 15)
+    /**
+     * 是否续费
+     */
+    @Excel(name = "是否续费", width = 15)
     @Schema(description = "是否续费")
     private Integer isRenew;
-	/**是否自定义套餐开始时间*/
-	@Excel(name = "是否自定义套餐开始时间", width = 15)
+    /**
+     * 是否自定义套餐开始时间
+     */
+    @Excel(name = "是否自定义套餐开始时间", width = 15)
     @Schema(description = "是否自定义套餐开始时间")
     private Integer isCustom;
-	/**套餐开启时间*/
-	@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 planStartTime;
-	/**服务开启时间*/
-	@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 serviceStartTime;
-	/**服务到期时间*/
-	@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 serviceEndTime;
-	/**套餐详情的服务时长的按钮切换*/
-	@Excel(name = "套餐详情的服务时长的按钮切换", width = 15)
+    /**
+     * 套餐详情的服务时长的按钮切换
+     */
+    @Excel(name = "套餐详情的服务时长的按钮切换", width = 15)
     @Schema(description = "套餐详情的服务时长的按钮切换")
     private Integer serviceStatus;
-	/**套餐时长(单位：月份)*/
-	@Excel(name = "套餐时长(单位：月份)", width = 15)
+    /**
+     * 套餐时长(单位：月份)
+     */
+    @Excel(name = "套餐时长(单位：月份)", width = 15)
     @Schema(description = "套餐时长(单位：月份)")
     private Integer serviceMonth;
-	/**0不需要提醒，1需要提醒*/
-	@Excel(name = "0不需要提醒，1需要提醒", width = 15)
+    /**
+     * 0不需要提醒，1需要提醒
+     */
+    @Excel(name = "0不需要提醒，1需要提醒", width = 15)
     @Schema(description = "0不需要提醒，1需要提醒")
     private Integer remind;
-	/**备注*/
-	@Excel(name = "备注", width = 15)
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", width = 15)
     @Schema(description = "备注")
     private String remark;
-	/**优化人uid*/
-	@Excel(name = "优化人uid", width = 15)
+    /**
+     * 优化人uid
+     */
+    @Excel(name = "优化人uid", width = 15)
     @Schema(description = "优化人uid")
     private String optimizerUid;
-	/**赠送天数*/
-	@Excel(name = "赠送天数", width = 15)
+    /**
+     * 赠送天数
+     */
+    @Excel(name = "赠送天数", width = 15)
     @Schema(description = "赠送天数")
     private Integer giveDay;
-	/**补偿天数*/
-	@Excel(name = "补偿天数", width = 15)
+    /**
+     * 补偿天数
+     */
+    @Excel(name = "补偿天数", width = 15)
     @Schema(description = "补偿天数")
     private Integer compensateDay;
 }

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

@@ -34,7 +34,7 @@ public class AdwebSite implements Serializable {
     /**
      * 站点主键ID
      */
-    @TableId(type = IdType.ASSIGN_ID)
+    @TableId(type = IdType.AUTO)
     @Schema(description = "站点主键ID")
     private java.lang.Integer id;
     /**
@@ -108,8 +108,8 @@ public class AdwebSite implements Serializable {
     /**
      * 当前状态：0：已删除；1：正常；2:未发布  3:拉取测试站点中 ；4：发布正式站点中 ;5:拉取异常
      */
-    @Excel(name = "当前状态：0：已删除；1：正常；2:未发布  3:临时站点正在创建 ；4：临时站点创建失败 ;5:正式站点正在创建;6:正式站点创建失败", width = 15)
-    @Schema(description = "当前状态：0：已删除；1：正常；2:未发布  3:临时站点正在创建 ；4：临时站点创建失败 ;5:正式站点正在创建;6:正式站点创建失败")
+    @Excel(name = "当前状态：0：已删除；1：已发布；2:临时站点已创建  3:临时站点正在创建 ；4：临时站点创建失败 ;5:正式站点正在创建;6:正式站点创建失败", width = 15)
+    @Schema(description = "当前状态：0：已删除；1：已发布；2:临时站点已创建  3:临时站点正在创建 ；4：临时站点创建失败 ;5:正式站点正在创建;6:正式站点创建失败")
     @Dict(dicCode = "site_status")
     private java.lang.Integer status;
     /**

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

@@ -18,58 +18,72 @@ import java.util.Date;
 /**
  * @Description: adweb_user_wpsite
  * @Author: jeecg-boot
- * @Date:   2023-08-18
+ * @Date: 2023-08-18
  * @Version: V1.0
  */
 @Data
 @TableName("adweb_user_wpsite")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description="adweb_user_wpsite")
+@Schema(description = "adweb_user_wpsite")
 public class AdwebUserWpsite implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
     @Schema(description = "id")
     private String id;
-	/**站点id*/
-	@Excel(name = "站点id", width = 15)
+    /**
+     * 站点id
+     */
+    @Excel(name = "站点id", width = 15)
     @Schema(description = "站点id")
-    @Dict(dictTable = "adweb_site",dicCode = "id",dicText = "name")
+    @Dict(dictTable = "adweb_site", dicCode = "id", dicText = "name")
     private Integer siteId;
-	/**用户id*/
-	@Excel(name = "用户id", width = 15)
+    /**
+     * 用户id
+     */
+    @Excel(name = "用户id", width = 15)
     @Schema(description = "用户id")
-    @Dict(dictTable = "sys_user",dicCode = "id",dicText = "realname")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     private String uid;
-	/**用户账户名*/
-	@Excel(name = "用户账户名", width = 15)
+    /**
+     * 用户账户名
+     */
+    @Excel(name = "用户账户名", width = 15)
     @Schema(description = "用户账户名")
     private String username;
-	/**加密后用户账户名(md5)*/
-	@Excel(name = "加密后用户账户名(md5)", width = 15)
+    /**
+     * 加密后用户账户名(md5)
+     */
+    @Excel(name = "加密后用户账户名(md5)", width = 15)
     @Schema(description = "加密后用户账户名(md5)")
     private String wpUsername;
-	/**wp密码*/
-	@Excel(name = "wp密码", width = 15)
+    /**
+     * wp密码
+     */
+    @Excel(name = "wp密码", width = 15)
     @Schema(description = "wp密码")
     private String wpUserpwd;
-	/**wp用户角色*/
-	@Excel(name = "wp用户角色", width = 15)
+    /**
+     * wp用户角色
+     */
+    @Excel(name = "wp用户角色", width = 15)
     @Schema(description = "wp用户角色")
     private String wpUserrole;
 
     /**
      * 状态 0：已删除 1：正常
      */
-	private Integer status;
+    private Integer status;
 
     /**
      * 更新时间
      */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="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 updateTime;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/SelfWebSiteService.java

@@ -120,6 +120,10 @@ public class SelfWebSiteService {
                         // 更新站点流程状态
                         siteService.updateSiteFlow(finalAdwebSite.getCode());
 
+                        // 临时站点创建成功
+                        finalAdwebSite.setStatus(4);
+                        siteService.updateById(finalAdwebSite);
+
                         String[] userIds = {user.getId()};
                         // 给该站点所属的用户发送消息
                         log.info("发送创建站点通知");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/SelfWebSiteServiceCommon.java

@@ -96,7 +96,7 @@ public class SelfWebSiteServiceCommon {
         adwebSite.setInCode(adwebTheme.getCode());
         adwebSite.setIsDomain(0);
         adwebSite.setCtime(new Date());
-        adwebSite.setStatus(2);
+        adwebSite.setStatus(3); // 临时站点正在创建
         adwebSite.setEnquiryDistributeType(EnquiryDistributeTypeConstant.MASTER);
         adwebSite.setDevServerIp(newServerIp);
         adwebSite.setEnquirySendEmailType("ALL");

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

@@ -17,97 +17,135 @@ import java.io.Serializable;
 /**
  * @Description: 网站营销方案套餐表
  * @Author: jeecg-boot
- * @Date:   2024-09-27
+ * @Date: 2024-09-27
  * @Version: V1.0
  */
 @Data
 @TableName("subscribe_plan")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description="网站营销方案套餐表")
+@Schema(description = "网站营销方案套餐表")
 public class SubscribePlan implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
     @Schema(description = "主键")
     private java.lang.String id;
-	/**创建人*/
+    /**
+     * 创建人
+     */
     @Schema(description = "创建人")
     private java.lang.String createBy;
-	/**更新人*/
+    /**
+     * 更新人
+     */
     @Schema(description = "更新人")
     private java.lang.String updateBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="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 java.util.Date createTime;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="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 java.util.Date updateTime;
-	/**营销方案编码*/
-	@Excel(name = "营销方案编码", width = 15)
+    /**
+     * 营销方案编码
+     */
+    @Excel(name = "营销方案编码", width = 15)
     @Schema(description = "营销方案编码")
     private java.lang.String planCode;
-	/**套餐类型*/
-	@Excel(name = "套餐类型", width = 15)
+    /**
+     * 套餐类型
+     */
+    @Excel(name = "套餐类型", width = 15)
     @Schema(description = "套餐类型")
     @Dict(dicCode = "dict_market_type")
     private java.lang.String marketType;
-	/**套餐名称*/
-	@Excel(name = "套餐名称", width = 15)
+    /**
+     * 套餐名称
+     */
+    @Excel(name = "套餐名称", width = 15)
     @Schema(description = "套餐名称")
     private java.lang.String planName;
-	/**关键词数量*/
-	@Excel(name = "关键词数量", width = 15)
+    /**
+     * 关键词数量
+     */
+    @Excel(name = "关键词数量", width = 15)
     @Schema(description = "关键词数量")
     private java.lang.Integer keywordCount;
-	/**关键词达标目标*/
-	@Excel(name = "关键词达标目标", width = 15)
+    /**
+     * 关键词达标目标
+     */
+    @Excel(name = "关键词达标目标", width = 15)
     @Schema(description = "关键词达标目标")
     private java.lang.Integer target;
-	/**服务时间*/
-	@Excel(name = "服务时间", width = 15)
+    /**
+     * 服务时间
+     */
+    @Excel(name = "服务时间", width = 15)
     @Schema(description = "服务时间")
     private java.lang.Integer serviceTime;
-	/**状态*/
-	@Excel(name = "状态", width = 15)
+    /**
+     * 状态
+     */
+    @Excel(name = "状态", width = 15)
     @Schema(description = "状态")
     private java.lang.Integer status;
-	/**价格*/
-	@Excel(name = "价格", width = 15)
+    /**
+     * 价格
+     */
+    @Excel(name = "价格", width = 15)
     @Schema(description = "价格")
     private java.lang.Double price;
 
-    /**文章数量*/
+    /**
+     * 文章数量
+     */
     @Excel(name = "文章数量", width = 15)
     @Schema(description = "文章数量")
     private java.lang.Integer article;
 
-    /**博客数量*/
+    /**
+     * 博客数量
+     */
     @Excel(name = "博客数量", width = 15)
     @Schema(description = "博客数量")
     private java.lang.Integer blog;
 
-    /**外链数量*/
+    /**
+     * 外链数量
+     */
     @Excel(name = "外链数量", width = 15)
     @Schema(description = "外链数量")
     private java.lang.Integer externalLinks;
 
-    /**长尾词数量*/
+    /**
+     * 长尾词数量
+     */
     @Excel(name = "长尾词数量", width = 15)
     @Schema(description = "长尾词数量")
     private java.lang.Integer longTailKeyword;
 
-    /**访问数量*/
+    /**
+     * 访问数量
+     */
     @Excel(name = "访问数量", width = 15)
     @Schema(description = "访问数量")
     private java.lang.Integer pageView;
 
-    /**指定词数量*/
+    /**
+     * 指定词数量
+     */
     @Excel(name = "指定词数量", width = 15)
     @Schema(description = "指定词数量")
     private java.lang.Integer specifyKeyword;

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

@@ -18,14 +18,14 @@ import java.util.Date;
 @Data
 @TableName("master_sub_account_relation")
 @EqualsAndHashCode(callSuper = false)
-@Schema(description="MasterSubAccountRelation")
+@Schema(description = "MasterSubAccountRelation")
 public class MasterSubAccountRelation implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
      * 子账户ID
      */
-    @TableId(type = IdType.ASSIGN_ID)
+    @TableId(type = IdType.AUTO)
     @Schema(description = "子账户ID")
     private String subId;
     /**
@@ -51,8 +51,8 @@ public class MasterSubAccountRelation implements Serializable {
     @Schema(description = "状态")
     private Integer status;
 
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Schema(description = "createTime")
     private Date createTime;
 }

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.ASSIGN_ID)
+    @TableId(type = IdType.AUTO)
     @Schema(description = "主键")
     private java.lang.String id;
     /**