model layer 继承BaseEntity(2)

src/main/java/com/tykj/workflowcore/model_layer/model/ColumnInfo.java

 package com.tykj.workflowcore.model_layer.model;
 
-
 import com.tykj.workflowcore.base.entity.BaseEntity;
 import com.tykj.workflowcore.model_layer.annotatiion.WorkFlowCoreNoScan;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 
@@ -18,21 +19,21 @@ import javax.persistence.*;
  */
 @WorkFlowCoreNoScan
 @Entity
-@Table(name = "column_info")
 @Data
+@SQLDelete(sql = "update column_info set deleted = 1 where id = ?")
+@Where(clause = "deleted = 0")
 public class ColumnInfo extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private long id;
 
-    @ApiModelProperty("是否主键")
     /**
      * 是否primary key， 0是，1否
      */
+    @ApiModelProperty("是否主键")
     @Column(name = "primary_key")
     private Integer primaryKey;
 
-
     @ApiModelProperty("列名")
     private String name;
     @ApiModelProperty("列名中文描述")

src/main/java/com/tykj/workflowcore/model_layer/model/ColumnVO.java

 package com.tykj.workflowcore.model_layer.model;
 
-
-
 import lombok.Data;
 
 /**
@@ -11,7 +9,6 @@ import lombok.Data;
  * @Date 2021/3/1 9:58
  * @Version 1.0
  */
-
 @Data
 public class ColumnVO {
 
@@ -19,6 +16,6 @@ public class ColumnVO {
     private String fieldName;
     private String filedDescription;
     private Integer filedLength;
-    private Integer primarykey=1;
+    private Integer primaryKey=1;
 
 }

src/main/java/com/tykj/workflowcore/model_layer/model/TableInfo.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.UpdateTimestamp;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
@@ -27,13 +28,13 @@ import java.util.Date;
 @WorkFlowCoreNoScan
 @Entity
 @EntityListeners(AuditingEntityListener.class)
-@Table(name = "table_info")
 @Data
+@SQLDelete(sql = "update table_info set deleted = 1 where id = ?")
+@Where(clause = "deleted = 0")
 public class TableInfo extends BaseEntity implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
     private long id;
     @ApiModelProperty("表名，不能为空")
     @Column(nullable = false)
@@ -51,7 +52,7 @@ public class TableInfo extends BaseEntity implements Serializable {
     @ApiModelProperty("建表类型")
     private Integer type;
 
-    @ApiModelProperty("执行人保留字段")
+    @ApiModelProperty("执行人（保留字段）")
     private String reviser;
 
     @Lob