From 607f7a13eb5796680871b6003d4ab9eb56d35bc1 Mon Sep 17 00:00:00 2001 From: PIG AI Date: Tue, 24 Jun 2025 08:57:25 +0800 Subject: [PATCH] =?UTF-8?q?revert(app):=20=E7=A7=BB=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E6=B3=A8=E8=A7=A3=E5=92=8C=E5=AD=97=E6=AE=B5=E5=B9=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除AppPageEntity中的@FieldNameConstants注解 - 删除PageTypeEnums中的WORKBENCH枚举项 - 调整AppArticleCollectEntity字段缩进格式 - 简化AppRole中的roleDesc字段描述并移除menuId字段 --- .../api/entity/AppArticleCollectEntity.java | 104 +++++++++--------- .../pigx/app/api/entity/AppPageEntity.java | 2 - .../pigx/app/api/entity/AppRole.java | 10 +- .../pigx/app/api/enums/PageTypeEnums.java | 7 +- 4 files changed, 55 insertions(+), 68 deletions(-) diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCollectEntity.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCollectEntity.java index 2e6c27813..dca6e2771 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCollectEntity.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCollectEntity.java @@ -22,66 +22,66 @@ import java.time.LocalDateTime; @Schema(description = "文章收藏表") public class AppArticleCollectEntity extends Model { - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - @Schema(description = "主键") - private Long id; + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "主键") + private Long id; - /** - * 用户ID - */ - @Schema(description = "用户ID") - private Long userId; + /** + * 用户ID + */ + @Schema(description = "用户ID") + private Long userId; - /** - * 文章ID - */ - @Schema(description = "文章ID") - private Long articleId; + /** + * 文章ID + */ + @Schema(description = "文章ID") + private Long articleId; - /** - * 文章标题 - */ - @TableField(exist = false) - private String title; + /** + * 文章标题 + */ + @TableField(exist = false) + private String title; - /** - * 创建人 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description = "创建人") - private String createBy; + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "创建人") + private String createBy; - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description = "创建时间") - private LocalDateTime createTime; + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "创建时间") + private LocalDateTime createTime; - /** - * 更新人 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - @Schema(description = "更新人") - private String updateBy; + /** + * 更新人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description = "更新人") + private String updateBy; - /** - * 更新时间 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - @Schema(description = "更新时间") - private LocalDateTime updateTime; + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description = "更新时间") + private LocalDateTime updateTime; - /** - * 是否删除 - */ - @TableLogic - @TableField(fill = FieldFill.INSERT) - @Schema(description = "是否删除") - private String delFlag; + /** + * 是否删除 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description = "是否删除") + private String delFlag; /** * 图片 diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppPageEntity.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppPageEntity.java index df989d5af..12c7eeffb 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppPageEntity.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppPageEntity.java @@ -6,7 +6,6 @@ import com.pig4cloud.pigx.common.core.util.TenantTable; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.experimental.FieldNameConstants; import java.time.LocalDateTime; @@ -19,7 +18,6 @@ import java.time.LocalDateTime; @Data @TenantTable @TableName("app_page") -@FieldNameConstants @EqualsAndHashCode(callSuper = true) @Schema(description = "页面") public class AppPageEntity extends Model { diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRole.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRole.java index bc77a8eb2..ec63649a6 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRole.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRole.java @@ -63,17 +63,11 @@ public class AppRole extends Model { private String roleCode; /** - * 角色描述 + * roleDesc */ - @Schema(description = "角色描述") + @Schema(description = "roleDesc") private String roleDesc; - /** - * 菜单ID列表 - */ - @Schema(description = "菜单ID列表") - private String menuId; - /** * 创建人 */ diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/enums/PageTypeEnums.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/enums/PageTypeEnums.java index e336022c1..75339dbef 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/enums/PageTypeEnums.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/enums/PageTypeEnums.java @@ -18,12 +18,7 @@ public enum PageTypeEnums { /** * 客服设置 */ - SERVICE(3, "客服设置"), - - /** - * 工作台属性 - */ - WORKBENCH(4, "工作台"); + SERVICE(3, "客服设置"); private final Integer pageType;