Browse Source

除个别Id外 统一改为varchar64

dev
jianjun 4 years ago
parent
commit
78eae132cd
  1. 5
      tduck-account/src/main/java/com/tduck/cloud/account/entity/UserAuthorizeEntity.java
  2. 5
      tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateEntity.java
  3. 7
      tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java
  4. 5
      tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectThemeEntity.java
  5. 7
      tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java
  6. 9
      tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectLogicEntity.java
  7. 5
      tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectResultEntity.java
  8. 7
      tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectSettingEntity.java
  9. 7
      tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectThemeEntity.java
  10. 2
      tduck-project/src/main/java/com/tduck/cloud/project/vo/OperateProjectItemVO.java

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

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

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

@ -1,6 +1,8 @@
package com.tduck.cloud.project.entity; package com.tduck.cloud.project.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.tduck.cloud.common.entity.BaseEntity; import com.tduck.cloud.common.entity.BaseEntity;
import com.tduck.cloud.common.validator.group.AddGroup; import com.tduck.cloud.common.validator.group.AddGroup;
@ -21,7 +23,8 @@ import javax.validation.constraints.NotNull;
@Data @Data
@TableName(value = "pr_project_template", autoResultMap = true) @TableName(value = "pr_project_template", autoResultMap = true)
public class ProjectTemplateEntity extends BaseEntity<ProjectTemplateEntity> { public class ProjectTemplateEntity extends BaseEntity<ProjectTemplateEntity> {
private Long id; @TableId(type = IdType.ASSIGN_ID)
private String id;
/** /**
* 模板唯一标识 * 模板唯一标识
*/ */

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

@ -1,6 +1,8 @@
package com.tduck.cloud.project.entity; package com.tduck.cloud.project.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.tduck.cloud.common.entity.BaseEntity; import com.tduck.cloud.common.entity.BaseEntity;
import com.tduck.cloud.common.mybatis.handler.JacksonTypeHandler; import com.tduck.cloud.common.mybatis.handler.JacksonTypeHandler;
@ -23,7 +25,8 @@ import java.util.Map;
@Data @Data
@TableName(value = "pr_project_template_item", autoResultMap = true) @TableName(value = "pr_project_template_item", autoResultMap = true)
public class ProjectTemplateItemEntity extends BaseEntity<ProjectTemplateItemEntity> { public class ProjectTemplateItemEntity extends BaseEntity<ProjectTemplateItemEntity> {
private Long id; @TableId(type = IdType.ASSIGN_ID)
private String id;
/** /**
* 项目Id * 项目Id
*/ */
@ -32,7 +35,7 @@ public class ProjectTemplateItemEntity extends BaseEntity<ProjectTemplateItemEnt
/** /**
* 表单项Id * 表单项Id
*/ */
private Long formItemId; private String formItemId;
/** /**
* 表单项类型 * 表单项类型
*/ */

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

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

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

@ -1,6 +1,8 @@
package com.tduck.cloud.project.entity; package com.tduck.cloud.project.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.tduck.cloud.common.entity.BaseEntity; import com.tduck.cloud.common.entity.BaseEntity;
import com.tduck.cloud.common.mybatis.handler.JacksonTypeHandler; import com.tduck.cloud.common.mybatis.handler.JacksonTypeHandler;
@ -26,7 +28,8 @@ import java.util.Map;
@TableName(value = "pr_user_project_item", autoResultMap = true) @TableName(value = "pr_user_project_item", autoResultMap = true)
@FieldNameConstants @FieldNameConstants
public class UserProjectItemEntity extends BaseEntity<UserProjectItemEntity> { public class UserProjectItemEntity extends BaseEntity<UserProjectItemEntity> {
private Long id; @TableId(type = IdType.ASSIGN_ID)
private String id;
/** /**
* 项目Id * 项目Id
*/ */
@ -35,7 +38,7 @@ public class UserProjectItemEntity extends BaseEntity<UserProjectItemEntity> {
/** /**
* 表单项Id * 表单项Id
*/ */
private Long formItemId; private String formItemId;
/** /**
* 表单项类型 * 表单项类型
*/ */

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

@ -1,6 +1,8 @@
package com.tduck.cloud.project.entity; package com.tduck.cloud.project.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.tduck.cloud.common.entity.BaseEntity; import com.tduck.cloud.common.entity.BaseEntity;
import com.tduck.cloud.common.mybatis.handler.JacksonTypeHandler; import com.tduck.cloud.common.mybatis.handler.JacksonTypeHandler;
@ -21,7 +23,8 @@ import java.util.Set;
@Accessors(chain = true) @Accessors(chain = true)
@TableName(value = "pr_user_project_logic", autoResultMap = true) @TableName(value = "pr_user_project_logic", autoResultMap = true)
public class UserProjectLogicEntity extends BaseEntity<UserProjectLogicEntity> { public class UserProjectLogicEntity extends BaseEntity<UserProjectLogicEntity> {
private Long id; @TableId(type = IdType.ASSIGN_ID)
private String id;
/** /**
* 项目key * 项目key
*/ */
@ -30,7 +33,7 @@ public class UserProjectLogicEntity extends BaseEntity<UserProjectLogicEntity> {
/** /**
* 表单项Id * 表单项Id
*/ */
private Long formItemId; private String formItemId;
/** /**
* 条件成立的表达式 * 条件成立的表达式
*/ */
@ -52,7 +55,7 @@ public class UserProjectLogicEntity extends BaseEntity<UserProjectLogicEntity> {
/** /**
* 表单项Id * 表单项Id
*/ */
private Long formItemId; private String formItemId;
/** /**
* 表达式 * 表达式
*/ */

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

@ -1,5 +1,6 @@
package com.tduck.cloud.project.entity; package com.tduck.cloud.project.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
@ -29,8 +30,8 @@ public class UserProjectResultEntity extends BaseEntity<UserProjectResultEntity>
/** /**
* *
*/ */
@TableId @TableId(type = IdType.ASSIGN_ID)
private Long id; private String id;
/** /**
* 项目key * 项目key
*/ */

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

@ -1,9 +1,7 @@
package com.tduck.cloud.project.entity; package com.tduck.cloud.project.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.tduck.cloud.common.entity.BaseEntity; import com.tduck.cloud.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
@ -21,7 +19,8 @@ import java.time.LocalDateTime;
@Data @Data
@TableName(value = "pr_user_project_setting", autoResultMap = true) @TableName(value = "pr_user_project_setting", autoResultMap = true)
public class UserProjectSettingEntity extends BaseEntity<UserProjectSettingEntity> { public class UserProjectSettingEntity extends BaseEntity<UserProjectSettingEntity> {
private Long id; @TableId(type = IdType.ASSIGN_ID)
private String id;
/** /**
* 项目key * 项目key
*/ */

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

@ -1,5 +1,7 @@
package com.tduck.cloud.project.entity; package com.tduck.cloud.project.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.tduck.cloud.common.entity.BaseEntity; import com.tduck.cloud.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
@ -15,7 +17,8 @@ import javax.validation.constraints.NotBlank;
@Data @Data
@TableName(value = "pr_user_project_theme", autoResultMap = true) @TableName(value = "pr_user_project_theme", autoResultMap = true)
public class UserProjectThemeEntity extends BaseEntity<UserProjectThemeEntity> { public class UserProjectThemeEntity extends BaseEntity<UserProjectThemeEntity> {
private Long id; @TableId(type = IdType.ASSIGN_ID)
private String id;
/** /**
* 项目key * 项目key
*/ */
@ -24,7 +27,7 @@ public class UserProjectThemeEntity extends BaseEntity<UserProjectThemeEntity> {
/** /**
* 主题Id * 主题Id
*/ */
private Long themeId; private String themeId;
/** /**
* logo图片 * logo图片
*/ */

2
tduck-project/src/main/java/com/tduck/cloud/project/vo/OperateProjectItemVO.java

@ -21,7 +21,7 @@ public class OperateProjectItemVO {
/** /**
* 数据Id * 数据Id
*/ */
private Long itemDataId; private String itemDataId;
/** /**
* 操作是否成功 * 操作是否成功

Loading…
Cancel
Save