From 9e0ec2b03cfeeb56b8bc14513412ba24a0632c52 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 15 十月 2021 16:21:00 +0800
Subject: [PATCH] update 修改测试代码 测试通用实体通过 删除树实体不通用属性
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java | 6 ---
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java | 44 ++++------------------
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java | 36 ++---------------
3 files changed, 13 insertions(+), 73 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
index f192263..c0e62c7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
@@ -36,12 +36,6 @@
private Long parentId;
/**
- * 鏄剧ず椤哄簭
- */
- @ApiModelProperty(value = "鏄剧ず椤哄簭")
- private String orderNum;
-
- /**
* 瀛愰儴闂�
*/
@TableField(exist = false)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
index 21149d8..74b57d9 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
@@ -1,12 +1,10 @@
package com.ruoyi.demo.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
/**
* 娴嬭瘯鍗曡〃瀵硅薄 test_demo
@@ -15,10 +13,10 @@
* @date 2021-07-26
*/
@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("test_demo")
-public class TestDemo implements Serializable {
+public class TestDemo extends BaseEntity {
private static final long serialVersionUID=1L;
@@ -42,7 +40,7 @@
/**
* 鎺掑簭鍙�
*/
- @OrderBy(isDesc = false, sort = 1)
+ @OrderBy(asc = false, sort = 1)
private Long orderNum;
/**
@@ -60,30 +58,6 @@
*/
@Version
private Long version;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- private Date createTime;
-
- /**
- * 鍒涘缓浜�
- */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Date updateTime;
-
- /**
- * 鏇存柊浜�
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
/**
* 鍒犻櫎鏍囧織
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
index 799a6d4..92e005b 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
@@ -1,12 +1,13 @@
package com.ruoyi.demo.domain;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.ruoyi.common.core.domain.TreeEntity;
import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
/**
* 娴嬭瘯鏍戣〃瀵硅薄 test_tree
@@ -15,10 +16,10 @@
* @date 2021-07-26
*/
@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("test_tree")
-public class TestTree implements Serializable {
+public class TestTree extends TreeEntity {
private static final long serialVersionUID=1L;
@@ -28,11 +29,6 @@
*/
@TableId(value = "id")
private Long id;
-
- /**
- * 鐖秈d
- */
- private Long parentId;
/**
* 閮ㄩ棬id
@@ -54,30 +50,6 @@
*/
@Version
private Long version;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- private Date createTime;
-
- /**
- * 鍒涘缓浜�
- */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Date updateTime;
-
- /**
- * 鏇存柊浜�
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
/**
* 鍒犻櫎鏍囧織
--
Gitblit v1.9.3