微调

starbos-system/src/main/java/com/nzwz/dao/mapper/TableRelationMapper.xml

@@ -6,7 +6,10 @@
 
     <select id="tableRelationList" parameterType="com.nzwz.transfer.tablerelation.TableRelationListInVo" resultType="com.nzwz.transfer.tablerelation.TableRelationListOutVoRecords">
 
-        SELECT id, `table_name`, table_header, table_date, sub_table_header, primary_key, foreign_key, create_time FROM tb_table_relation
+        SELECT
+            id, `table_name`, table_header, table_date, sub_table_header,
+            primary_key, foreign_key, sort_order, create_time
+        FROM tb_table_relation
 
     </select>
 
@@ -14,8 +17,8 @@
 
     <insert id="tableRelationCreate" parameterType="com.nzwz.transfer.tablerelation.TableRelationCreateInVoRecords">
 
-        INSERT INTO tb_table_relation (`table_name`, table_header, table_date, sub_table_header, primary_key, foreign_key)
-        VALUES (#{tableName}, #{tableHeader}, #{tableDate}, #{subTableHeader}, #{primaryKey}, #{foreignKey})
+        INSERT INTO tb_table_relation (`table_name`, table_header, table_date, sub_table_header, primary_key, foreign_key, sort_order)
+        VALUES (#{tableName}, #{tableHeader}, #{tableDate}, #{subTableHeader}, #{primaryKey}, #{foreignKey}, #{sortOrder})
 
     </insert>
 
@@ -24,8 +27,8 @@
     <update id="tableRelationUpdate" parameterType="com.nzwz.transfer.tablerelation.TableRelationUpdateInVoRecords">
 
         UPDATE tb_table_relation SET
-            `table_name` = #{tableName}, table_header= #{tableHeader}, table_date = #{tableDate},
-            sub_table_header = #{subTableHeader}, primary_key = #{primaryKey}, foreign_key = #{foreignKey}
+            `table_name` = #{tableName}, table_header= #{tableHeader}, table_date = #{tableDate}, sub_table_header = #{subTableHeader},
+            primary_key = #{primaryKey}, foreign_key = #{foreignKey}, sort_order = #{sortOrder}
         WHERE id = #{id}
 
     </update>

starbos-system/src/main/java/com/nzwz/model/TableRelation.java

@@ -44,7 +44,7 @@ public class TableRelation {
 
 
     /**
-     * 外键
+     * 主键
      */
     private String primaryKey;
 
@@ -56,6 +56,12 @@ public class TableRelation {
 
 
     /**
+     * 排序
+     */
+    private Integer sortOrder;
+
+
+    /**
      * 创建时间
      */
     private String createTime;
@@ -126,6 +132,14 @@ public class TableRelation {
         this.foreignKey = foreignKey;
     }
 
+    public Integer getSortOrder() {
+        return sortOrder;
+    }
+
+    public void setSortOrder(Integer sortOrder) {
+        this.sortOrder = sortOrder;
+    }
+
     public String getCreateTime() {
         return createTime;
     }

starbos-system/src/main/java/com/nzwz/serivce/impl/TableRelationServiceImpl.java

@@ -39,7 +39,10 @@ public class TableRelationServiceImpl implements ITableRelationService {
     }
 
     private List<TableRelationListOutVoRecords> getTableRelationTree(String tableHeader, List<TableRelationListOutVoRecords> recordsList) {
-        List<TableRelationListOutVoRecords> tempList = recordsList.stream().filter(m -> tableHeader.equals(m.getSubTableHeader())).collect(Collectors.toList());
+        List<TableRelationListOutVoRecords> tempList = recordsList.stream()
+                .filter(m -> tableHeader.equals(m.getSubTableHeader()))
+                .sorted(Comparator.comparing(TableRelationListOutVoRecords::getSortOrder))
+                .collect(Collectors.toList());
 
         for (TableRelationListOutVoRecords records : tempList) {
             records.setChildren(this.getTableRelationTree(records.getTableHeader(), recordsList));

starbos-system/src/main/java/com/nzwz/transfer/tablerelation/TableRelationCreateInVoRecords.java

@@ -44,4 +44,10 @@ public class TableRelationCreateInVoRecords {
     private String foreignKey;
 
 
+    /**
+     * 排序
+     */
+    private Integer sortOrder;
+
+
 }

starbos-system/src/main/java/com/nzwz/transfer/tablerelation/TableRelationListOutVoRecords.java

@@ -59,6 +59,12 @@ public class TableRelationListOutVoRecords {
 
 
     /**
+     * 排序
+     */
+    private Integer sortOrder;
+
+
+    /**
      * 子资源
      */
     private List<TableRelationListOutVoRecords> children;

starbos-system/src/main/java/com/nzwz/transfer/tablerelation/TableRelationUpdateInVoRecords.java

@@ -50,4 +50,10 @@ public class TableRelationUpdateInVoRecords {
     private String foreignKey;
 
 
+    /**
+     * 排序
+     */
+    private Integer sortOrder;
+
+
 }