diff --git a/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserAuthorizeEntity.java b/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserAuthorizeEntity.java index fd515f7..02f7671 100644 --- a/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserAuthorizeEntity.java +++ b/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 { - @TableId(type = IdType.ASSIGN_ID) - private String id; + /** * 第三方平台类型 */ diff --git a/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserEntity.java b/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserEntity.java index 3738fa1..c84dbc7 100644 --- a/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserEntity.java +++ b/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 { - @TableId(type = IdType.ASSIGN_ID) - private String id; + /** * 姓名 */ diff --git a/tduck-common/src/main/java/com/tduck/cloud/common/entity/BaseEntity.java b/tduck-common/src/main/java/com/tduck/cloud/common/entity/BaseEntity.java index 11928b0..18a29ca 100644 --- a/tduck-common/src/main/java/com/tduck/cloud/common/entity/BaseEntity.java +++ b/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.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; 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 extends Model { private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_ID) + private String id; /** * 客户ID */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateCategoryEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateCategoryEntity.java index 19c5938..95ebc6f 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateCategoryEntity.java +++ b/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 { - @TableId(type = IdType.ASSIGN_ID) - private String id; + /** * 主题名称 */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateEntity.java index 7931554..3af7139 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateEntity.java +++ b/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 { - @TableId(type = IdType.ASSIGN_ID) - private String id; + /** * 模板唯一标识 */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java index b60b49b..618b415 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java +++ b/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 { - @TableId(type = IdType.ASSIGN_ID) - private String id; + /** * 项目Id */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectThemeEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectThemeEntity.java index 8c00624..896052a 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectThemeEntity.java +++ b/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 { - @TableId(type = IdType.ASSIGN_ID) - private String id; /** * 主题名称 */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java index c44e2ae..6104e05 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java +++ b/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 { - @TableId(type = IdType.ASSIGN_ID) - private String id; + /** * 项目code */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java index cba1476..481d7c2 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java +++ b/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 { - @TableId(type = IdType.ASSIGN_ID) - private String id; + /** * 项目Id */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectLogicEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectLogicEntity.java index 3c9b6df..13acec4 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectLogicEntity.java +++ b/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 { - @TableId(type = IdType.ASSIGN_ID) - private String id; + /** * 项目key */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectResultEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectResultEntity.java index 80db7db..4defde0 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectResultEntity.java +++ b/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 { - /** - * - */ - @TableId(type = IdType.ASSIGN_ID) - private String id; + /** * 项目key */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectSettingEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectSettingEntity.java index 61f7af2..6a16165 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectSettingEntity.java +++ b/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 { - @TableId(type = IdType.ASSIGN_ID) - private String id; + /** * 项目key */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectThemeEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectThemeEntity.java index 25527bd..688862d 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectThemeEntity.java +++ b/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 { - @TableId(type = IdType.ASSIGN_ID) - private String id; + /** * 项目key */