id统一字符串

tduck-account/src/main/java/com/tduck/cloud/account/entity/UserAuthorizeEntity.java

@@ -1,8 +1,6 @@
 package com.tduck.cloud.account.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.tduck.cloud.account.entity.enums.UserAuthorizeTypeEnum;
 import com.tduck.cloud.common.entity.BaseEntity;
@@ -21,8 +19,7 @@ import java.util.Map;
 @Data
 @TableName(value = "ac_user_authorize", autoResultMap = true)
 public class UserAuthorizeEntity extends BaseEntity<UserAuthorizeEntity> {
-    @TableId(type = IdType.ASSIGN_ID)
+
-    private String id;
     /**
      * 第三方平台类型
      */

tduck-account/src/main/java/com/tduck/cloud/account/entity/UserEntity.java

@@ -1,7 +1,5 @@
 package com.tduck.cloud.account.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.tduck.cloud.account.entity.enums.AccountChannelEnum;
 import com.tduck.cloud.common.entity.BaseEntity;
@@ -18,8 +16,7 @@ import java.time.LocalDateTime;
 @Data
 @TableName("ac_user")
 public class UserEntity extends BaseEntity<UserEntity> {
-    @TableId(type = IdType.ASSIGN_ID)
+
-    private String id;
     /**
      * 姓名
      */

tduck-common/src/main/java/com/tduck/cloud/common/entity/BaseEntity.java

@@ -1,9 +1,7 @@
 package com.tduck.cloud.common.entity;
 
 import cn.hutool.core.date.DatePattern;
-import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -23,6 +21,9 @@ import java.time.LocalDateTime;
 public class BaseEntity<T> extends Model {
 
     private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
     /**
      * 客户ID
      */

tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateCategoryEntity.java

@@ -17,8 +17,7 @@ import lombok.Data;
 @Data
 @TableName(value = "pr_project_template_category", autoResultMap = true)
 public class ProjectTemplateCategoryEntity extends BaseEntity<ProjectTemplateCategoryEntity> {
-    @TableId(type = IdType.ASSIGN_ID)
+
-    private String id;
     /**
      * 主题名称
      */

tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateEntity.java

@@ -23,8 +23,7 @@ import javax.validation.constraints.NotNull;
 @Data
 @TableName(value = "pr_project_template", autoResultMap = true)
 public class ProjectTemplateEntity extends BaseEntity<ProjectTemplateEntity> {
-    @TableId(type = IdType.ASSIGN_ID)
+
-    private String id;
     /**
      * 模板唯一标识
      */

tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java

@@ -1,8 +1,6 @@
 package com.tduck.cloud.project.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.tduck.cloud.common.entity.BaseEntity;
 import com.tduck.cloud.common.mybatis.handler.JacksonTypeHandler;
@@ -25,8 +23,7 @@ import java.util.Map;
 @Data
 @TableName(value = "pr_project_template_item", autoResultMap = true)
 public class ProjectTemplateItemEntity extends BaseEntity<ProjectTemplateItemEntity> {
-    @TableId(type = IdType.ASSIGN_ID)
+
-    private String id;
     /**
      * 项目Id
      */

tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectThemeEntity.java

@@ -1,8 +1,6 @@
 package com.tduck.cloud.project.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.tduck.cloud.common.entity.BaseEntity;
 import com.tduck.cloud.common.mybatis.handler.JacksonTypeHandler;
@@ -23,8 +21,6 @@ import java.util.List;
 @FieldNameConstants
 public class ProjectThemeEntity extends BaseEntity<ProjectThemeEntity> {
 
-    @TableId(type = IdType.ASSIGN_ID)
-    private String id;
     /**
      * 主题名称
      */

tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java

@@ -1,8 +1,6 @@
 package com.tduck.cloud.project.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.tduck.cloud.common.entity.BaseEntity;
 import com.tduck.cloud.common.validator.group.AddGroup;
@@ -24,8 +22,7 @@ import javax.validation.constraints.NotBlank;
 @TableName("pr_user_project")
 @FieldNameConstants
 public class UserProjectEntity extends BaseEntity<UserProjectEntity> {
-    @TableId(type = IdType.ASSIGN_ID)
+
-    private String id;
     /**
      * 项目code
      */

tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java

@@ -1,8 +1,6 @@
 package com.tduck.cloud.project.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.tduck.cloud.common.entity.BaseEntity;
 import com.tduck.cloud.common.mybatis.handler.JacksonTypeHandler;
@@ -28,8 +26,7 @@ import java.util.Map;
 @TableName(value = "pr_user_project_item", autoResultMap = true)
 @FieldNameConstants
 public class UserProjectItemEntity extends BaseEntity<UserProjectItemEntity> {
-    @TableId(type = IdType.ASSIGN_ID)
+
-    private String id;
     /**
      * 项目Id
      */

tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectLogicEntity.java

@@ -1,8 +1,6 @@
 package com.tduck.cloud.project.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.tduck.cloud.common.entity.BaseEntity;
 import com.tduck.cloud.common.mybatis.handler.JacksonTypeHandler;
@@ -23,8 +21,7 @@ import java.util.Set;
 @Accessors(chain = true)
 @TableName(value = "pr_user_project_logic", autoResultMap = true)
 public class UserProjectLogicEntity extends BaseEntity<UserProjectLogicEntity> {
-    @TableId(type = IdType.ASSIGN_ID)
+
-    private String id;
     /**
      * 项目key
      */

tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectResultEntity.java

@@ -1,8 +1,6 @@
 package com.tduck.cloud.project.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.JsonIgnoreProperties;
 import com.tduck.cloud.common.entity.BaseEntity;
@@ -27,11 +25,7 @@ import java.util.Map;
 //不允许被序列化 允许被反序列化
 @JsonIgnoreProperties(value = {UserProjectResultEntity.Fields.originalData}, allowSetters = true)
 public class UserProjectResultEntity extends BaseEntity<UserProjectResultEntity> {
-    /**
+
-     *
-     */
-    @TableId(type = IdType.ASSIGN_ID)
-    private String id;
     /**
      * 项目key
      */

tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectSettingEntity.java

@@ -19,8 +19,7 @@ import java.time.LocalDateTime;
 @Data
 @TableName(value = "pr_user_project_setting", autoResultMap = true)
 public class UserProjectSettingEntity extends BaseEntity<UserProjectSettingEntity> {
-    @TableId(type = IdType.ASSIGN_ID)
+
-    private String id;
     /**
      * 项目key
      */

tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectThemeEntity.java

@@ -17,8 +17,7 @@ import javax.validation.constraints.NotBlank;
 @Data
 @TableName(value = "pr_user_project_theme", autoResultMap = true)
 public class UserProjectThemeEntity extends BaseEntity<UserProjectThemeEntity> {
-    @TableId(type = IdType.ASSIGN_ID)
+
-    private String id;
     /**
      * 项目key
      */