微调

starbos-system/src/main/java/com/nzwz/controller/SynchronizationController.java

@@ -47,17 +47,17 @@ public class SynchronizationController {
         return synchronizationService.initConnectParmCreate(inVo);
     }
 
-    @ApiOperation("手动开启自动同步")
+    @ApiOperation("手动启动同步方法")
     @GetMapping("/manual/synchronization")
     public RestResponse manualSynchronization() {
-        synchronizationService.synchronization();
+        synchronizationService.manualSynchronization();
         return RestResponse.success();
     }
 
-    @ApiOperation("手动重新同步错误同步")
+    @ApiOperation("手动启动失败同步方法")
     @GetMapping("/abnormal/synchronization")
     public RestResponse abnormalSynchronization() {
-        synchronizationService.abnormalAgainSynchronization();
+        synchronizationService.abnormalSynchronization();
         return RestResponse.success();
     }
 

starbos-system/src/main/java/com/nzwz/serivce/ISynchronizationService.java

@@ -43,10 +43,21 @@ public interface ISynchronizationService {
      */
     void synchronization();
 
+
+    /**
+     * 手动启动同步方法
+     */
+    void manualSynchronization();
+
     /**
      * 异常重新同步方法
      */
     void abnormalAgainSynchronization();
 
+    /**
+     * 手动启动失败同步方法
+     */
+    void abnormalSynchronization();
+
 
 }

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

@@ -130,6 +130,16 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
     }
 
     @Override
+    public void manualSynchronization() {
+        this.synchronization();
+    }
+
+    @Override
+    public void abnormalSynchronization() {
+        this.abnormalAgainSynchronization();
+    }
+
+    @Override
     public void synchronization() {
         List<TableRelation> tableRelationList = tableRelationMapper.selectList(new QueryWrapper<>());
 
@@ -168,7 +178,11 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
     }
 
     private void getTableRelationTree(List<TableRelation> result, String tableHeader, List<TableRelation> tableRelationList) {
-        List<TableRelation> tempList = tableRelationList.stream().filter(m -> tableHeader.equals(m.getSubTableHeader())).collect(Collectors.toList());
+        List<TableRelation> tempList = tableRelationList.stream()
+                .filter(m -> tableHeader.equals(m.getSubTableHeader()))
+                .sorted(Comparator.comparing(TableRelation::getSortOrder))
+                .collect(Collectors.toList());
+
         for (TableRelation tableRelation : tempList) {
             result.add(tableRelation);
             this.getTableRelationTree(result, tableRelation.getTableHeader(), tableRelationList);

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

@@ -30,7 +30,7 @@ public class TableRelationServiceImpl implements ITableRelationService {
         List<TableRelationListOutVoRecords> result = tempList.stream()
                 .sorted(Comparator.comparing(TableRelationListOutVoRecords::getCreateTime).reversed())
                 .collect(Collectors.toList())
-                .subList(inVo.getPageNo() * inVo.getPageSize() - 10, Math.min(inVo.getPageNo() * inVo.getPageSize(), tempList.size()));
+                .subList(inVo.getPageNo() * inVo.getPageSize() - inVo.getPageSize(), Math.min(inVo.getPageNo() * inVo.getPageSize(), tempList.size()));
 
         TableRelationListOutVo outVo = new TableRelationListOutVo();
         outVo.setTotal(tempList.size());