[数据模型] 修改表名避免和主系统冲突

src/main/java/com/tykj/workflowcore/model_layer/dao/AggregationDao.java

@@ -15,7 +15,13 @@ import java.util.List;
  */
 public interface AggregationDao extends JpaRepository<Aggregation, Integer>, JpaSpecificationExecutor<Aggregation> {
 
-    List<Aggregation> findAllByTableInfoExIdAndParentId(Integer tableExId,Integer parrentId);
+    /**
+     * id
+     * @param tableExId
+     * @param parentId
+     * @return
+     */
+    List<Aggregation> findAllByTableInfoExIdAndParentId(Integer tableExId,Integer parentId);
 
 
 }

src/main/java/com/tykj/workflowcore/model_layer/dao/TableInfoDao.java

@@ -34,5 +34,10 @@ public interface TableInfoDao extends JpaRepository<TableInfo, Integer>, JpaSpec
     @Modifying
    List<TableInfo> deleteAllByModelType(Integer type);
 
+    /**
+     * 根据模型类型查找
+     * @param modeType
+     * @return
+     */
     List<TableInfo> findAllByModelType(Integer modeType);
 }

src/main/java/com/tykj/workflowcore/model_layer/entity/Aggregation.java

@@ -20,6 +20,7 @@ import java.util.List;
  */
 @WorkFlowCoreNoScan
 @Data
+@Table(name = "workflow_aggregation")
 @NoArgsConstructor
 @Entity
 @SQLDelete(sql = "update column_info set deleted = 1 where id = ?")

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

@@ -25,6 +25,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Entity
+@Table(name = "workflow_column_info")
 public class ColumnInfo extends BaseEntity  {
 
     /**

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

@@ -10,6 +10,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
 import javax.persistence.Entity;
+import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
@@ -21,6 +22,7 @@ import java.io.Serializable;
  */
 @WorkFlowCoreNoScan
 @Entity
+@Table(name = "workflow_table_info")
 @EntityListeners(AuditingEntityListener.class)
 @Data
 @SQLDelete(sql = "update table_info set deleted = 1 where id = ?")

src/main/test/java/com/tykj/workflowcore/WorkflowCoreApplicationTests.java

@@ -506,8 +506,9 @@ class WorkflowCoreApplicationTests {
     @Test
     public void testType(){
 //        System.out.println(getTypeName(Integer.class.toString()));
-        String exJsonExample = modelHelper.getExJsonExample(5);
-        System.out.println(exJsonExample);
+//        String exJsonExample = modelHelper.getExJsonExample(5);
+//        System.out.println(exJsonExample);
+
     }
 
 }