refactor:统一BaseEntity 位主建ID

myxzjie · Sep 22, 2022 · 46a647e · 46a647e
1 parent d75360c
commit 46a647e
Show file tree

Hide file tree

Showing 24 changed files with 82 additions and 80 deletions.
diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/ad/dto/AdDto.java b/cms-boot-web/src/main/java/com/xzjie/cms/ad/dto/AdDto.java
@@ -30,9 +30,9 @@ public class AdDto extends BasePageDto {
     private String image;
     @ApiModelProperty("URL连接")
     private String adLink;
-    @ApiModelProperty("广告CODE")
-    @QueryCondition
-    private String adCode;
+//    @ApiModelProperty("广告CODE")
+//    @QueryCondition
+//    private String adCode;
     @ApiModelProperty("开始时间")
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
     private Date startTime;

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/ad/model/Ad.java b/cms-boot-web/src/main/java/com/xzjie/cms/ad/model/Ad.java
@@ -15,9 +15,6 @@
 @Table(name = "cms_ad")
 @ApiModel("广告数据")
 public class Ad extends BaseEntity<Ad> {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
 
     @ApiModelProperty("广告位ID")
     private Long positionId;

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/AdPosition.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/AdPosition.java
@@ -13,9 +13,9 @@
 @Table(name = "cms_ad_position")
 @ApiModel("广告位")
 public class AdPosition extends BaseEntity<AdPosition> {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
 
     @ApiModelProperty("用户ID")
     private Long userId;

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/Article.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/Article.java
@@ -27,10 +27,10 @@
 @JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 @ApiModel("内容对象")
 public class Article extends BaseEntity<Article> {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty("ID")
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    @ApiModelProperty("ID")
+//    private Long id;
     @ApiModelProperty("类型ID")
     private Long categoryId;
     @ApiModelProperty("标题")

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/ArticleHot.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/ArticleHot.java
@@ -22,9 +22,9 @@
 @Table(name = "cms_article_hot")
 @JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class ArticleHot extends BaseEntity<ArticleHot> {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
 
     private Long articleId;
 

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/ArticleRecommendStat.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/ArticleRecommendStat.java
@@ -20,9 +20,9 @@
 @Table(name = "cms_article_recommend")
 @JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class ArticleRecommendStat extends BaseEntity<ArticleRecommendStat> {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
 
     private Long articleId;
 

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/BaseEntity.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/BaseEntity.java
@@ -19,6 +19,11 @@
 @EntityListeners(AuditingEntityListener.class)
 public abstract class BaseEntity<T extends Object> implements Serializable {
 
+    @Id
+    @ApiModelProperty("ID")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
     @ApiModelProperty("排序")
     @Transient
     private Sorting sorting;

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/Category.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/Category.java
@@ -20,9 +20,9 @@
 @SQLDelete(sql = "update cms_category set state = 0 where id = ?")
 @JsonIgnoreProperties({"hibernateLazyInitializer","handler"})
 public class Category extends BaseEntity<Category> {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
 
     @Column(name = "p_id")
     private Long pid;

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/KeyData.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/KeyData.java
@@ -14,9 +14,9 @@
 @Table(name = "sys_key_data")
 @NoArgsConstructor
 public class KeyData extends BaseEntity<KeyData> {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
 
     @Column(name = "`key`")
     private String key;

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/Label.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/Label.java
@@ -20,9 +20,9 @@
 @Where(clause = "state = 1")
 @SQLDelete(sql = "update cms_label set state = 0 where id = ?")
 public class Label extends BaseEntity<Label> {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
 
     private String name;
 

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/Navigation.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/Navigation.java
@@ -11,9 +11,9 @@
 @Entity
 @Table(name = "cms_navigation")
 public class Navigation extends BaseEntity<Navigation> {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
     @Column(name = "p_id")
     private Long pid;
     private String name;

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/Permission.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/Permission.java
@@ -9,9 +9,9 @@
 @Table(name = "sys_permission")
 public class Permission extends BaseEntity<Permission>{
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
     private Long roleId;
     private Long menuId;
     @Override

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/PicturesGroup.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/PicturesGroup.java
@@ -22,9 +22,9 @@
 @Table(name = "sys_pictures_group")
 @SQLDelete(sql = "update sys_pictures_group set state = 0 where id = ?")
 public class PicturesGroup extends BaseEntity<PicturesGroup> {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
 
     private String name;
 

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/Topic.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/Topic.java
@@ -14,9 +14,9 @@
 @SQLDelete(sql = "update cms_topic set state = 0 where id = ?")
 public class Topic extends BaseEntity<Topic>{
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
 
     private String topic;
 

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/VerifyCode.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/VerifyCode.java
@@ -15,10 +15,10 @@
 @Entity(name = "sys_verify_code")
 @ApiModel("验证信息对象")
 public class VerifyCode extends BaseEntity<VerifyCode> {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty("ID")
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    @ApiModelProperty("ID")
+//    private Long id;
 
     @Column(name = "scenes", columnDefinition = "varchar")
     @ApiModelProperty("业务类型")

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/VisitLog.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/VisitLog.java
@@ -15,9 +15,9 @@
 @Entity
 @Table(name = "sys_visit_log")
 public class VisitLog extends BaseEntity<VisitLog> {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
     private String ip;
     private String type;
     @JsonFormat(shape = JsonFormat.Shape.STRING ,pattern="yyyy-MM-dd HH:mm:ss.SSS", timezone = "GMT+8")

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/WxAccountFans.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/WxAccountFans.java
@@ -15,9 +15,9 @@
 @SQLDelete(sql = "update wx_account_fans set state = 0 where id = ?")
 public class WxAccountFans extends BaseEntity<WxAccountFans> {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
 
     private String openId;
 

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/WxArticle.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/WxArticle.java
@@ -18,9 +18,9 @@ public class WxArticle extends BaseEntity<WxArticle> {
     /**
      * 主键
      */
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
 
     /**
      * 标题

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/WxArticleTemplate.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/WxArticleTemplate.java
@@ -16,9 +16,9 @@ public class WxArticleTemplate extends BaseEntity<WxArticleTemplate> {
     /**
      * 主键 主键ID
      */
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
 
     /**
      * 模板名称

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/model/WxTags.java b/cms-boot-web/src/main/java/com/xzjie/cms/model/WxTags.java
@@ -10,8 +10,8 @@
 @Entity
 @Table(name = "wx_tags")
 public class WxTags extends BaseEntity<WxTags> {
-    @Id
-    private Long id;
+//    @Id
+//    private Long id;
 
     private String name;
 

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/system/account/model/Account.java b/cms-boot-web/src/main/java/com/xzjie/cms/system/account/model/Account.java
@@ -24,11 +24,11 @@
 @ApiModel("管理用户对象")
 public class Account extends BaseEntity<Account> {
 
-    @Id
-    @Column(name = "id")
-    @ApiModelProperty("ID")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @Id
+//    @Column(name = "id")
+//    @ApiModelProperty("ID")
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
 
     @Column
     @ApiModelProperty("用户名")

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/system/auth/model/Social.java b/cms-boot-web/src/main/java/com/xzjie/cms/system/auth/model/Social.java
@@ -21,10 +21,10 @@
 @Table(name = "sys_social")
 public class Social extends BaseEntity<Social> {
 
-    @ApiModelProperty("ID")
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+//    @ApiModelProperty("ID")
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Long id;
     @ApiModelProperty("用户ID")
     private Long userId;
     @ApiModelProperty("第三方唯一id")

diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/system/menu/model/Menu.java b/cms-boot-web/src/main/java/com/xzjie/cms/system/menu/model/Menu.java
@@ -21,10 +21,10 @@
 @ApiModel("菜单对象")
 public class Menu extends BaseEntity<Menu> {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty("ID")
-    private Long id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    @ApiModelProperty("ID")
+//    private Long id;
 
     /**
      * 上级菜单ID
@@ -94,11 +94,11 @@ public boolean equals(Object o) {
             return false;
         }
         Menu menu = (Menu) o;
-        return Objects.equals(id, menu.id);
+        return Objects.equals(this.getId(), menu.getId());
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id);
+        return Objects.hash(this.getId());
     }
 }
diff --git a/cms-boot-web/src/main/java/com/xzjie/cms/system/role/model/Role.java b/cms-boot-web/src/main/java/com/xzjie/cms/system/role/model/Role.java
@@ -20,20 +20,20 @@
 @SQLDelete(sql = "update sys_role set state = 0 where id = ?")
 @NoArgsConstructor
 @ApiModel("角色对象")
-public class Role extends BaseEntity<Role> implements Serializable {
+public class Role extends BaseEntity<Role> {
 
     public Role(Long id, String roleCode, String roleName, Integer roleLevel) {
-        this.id = id;
+        this.setId(id);
         this.roleCode = roleCode;
         this.roleName = roleName;
         this.roleLevel = roleLevel;
     }
 
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty("ID")
-    private Long id;
+//    @Id
+//    @Column(name = "id")
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    @ApiModelProperty("ID")
+//    private Long id;
     @ApiModelProperty("角色code")
     private String roleCode;
     @ApiModelProperty("角色名称")