优化页面

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/ProjectGroupServiceImpl.java

@@ -71,8 +71,11 @@ public class ProjectGroupServiceImpl extends BaseServiceImpl implements ProjectG
     @Override
     public ProjectGroupVo getProjectGroup(String id) {
         ProjectGroupVo vo = new ProjectGroupVo();
+        List<Connector> connectors = connectorService.getConnectorAll();
+        vo.setConnectorSize(CollectionUtils.isEmpty(connectors) ? 0 : connectors.size());
+
         if (StringUtil.isBlank(id)) {
-            vo.setConnectors(connectorService.getConnectorAll());
+            vo.setConnectors(connectors);
             vo.setMappings(mappingService.getMappingAll());
             return vo;
         }
@@ -87,7 +90,6 @@ public class ProjectGroupServiceImpl extends BaseServiceImpl implements ProjectG
         List<String> connectorIds = projectGroup.getConnectorIds();
         if (!CollectionUtils.isEmpty(connectorIds)) {
             Set<String> connectorIdSet = new HashSet<>(connectorIds);
-            List<Connector> connectors = connectorService.getConnectorAll();
             if (!CollectionUtils.isEmpty(connectors)) {
                 vo.setConnectors(connectors.stream()
                         .filter((connector -> connectorIdSet.contains(connector.getId())))

dbsyncer-biz/src/main/java/org/dbsyncer/biz/vo/ProjectGroupVo.java

@@ -13,10 +13,20 @@ import java.util.List;
  */
 public class ProjectGroupVo extends ProjectGroup {
 
+    private int connectorSize;
+
     private List<Connector> connectors = new ArrayList<>();
 
     private List<MappingVo> mappings = new ArrayList<>();
 
+    public int getConnectorSize() {
+        return connectorSize;
+    }
+
+    public void setConnectorSize(int connectorSize) {
+        this.connectorSize = connectorSize;
+    }
+
     public List<Connector> getConnectors() {
         return connectors;
     }

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/index/IndexController.java

@@ -27,6 +27,7 @@ public class IndexController {
     @GetMapping("")
     public String index(HttpServletRequest request, ModelMap model, String projectGroupId) {
         ProjectGroupVo projectGroup = projectGroupService.getProjectGroup(projectGroupId);
+        model.put("connectorSize", projectGroup.getConnectorSize());
         model.put("connectors", projectGroup.getConnectors());
         model.put("mappings", projectGroup.getMappings());
         model.put("projectGroupId", projectGroupId);
@@ -40,5 +41,4 @@ public class IndexController {
         return RestResult.restSuccess(new VersionVo(appConfig.getName(), appConfig.getCopyright()));
     }
 
-}
-
+}

dbsyncer-web/src/main/resources/public/index/index.html

@@ -7,55 +7,49 @@
     <div class="row">
         <form class="form-horizontal" role="form" method="post">
             <!-- 分组管理 -->
-            <div class="col-md-12">
-                <!-- 分组开始位置 -->
+            <div class="col-md-12" th:if="${projectGroups?.size() gt 0}">
+                <!-- 显示分组开始位置 -->
                 <div class="form-group">
                     <div class="col-md-12">
-                        <button type="button" class="btn btn-primary" id="addProjectGroupBtn">
-                            <span class="fa fa-plus"></span>添加分组([[${projectGroups?.size()} ?: 0]])
-                        </button>
-                    </div>
-                </div>
-                <!-- 显示分组 -->
-                <div class="row" th:if="${projectGroups?.size() gt 0}">
-                    <div class="col-md-12">
-                        <div class="panel panel-default">
-                            <div class="panel-body">
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <select id="projectGroup" name="projectGroup"
-                                                class="form-control select-control">
-                                            <option value="" th:text="全部" selected/>
-                                            <option th:each="g,s:${projectGroups}" th:value="${g?.id}" th:text="${g?.name}" th:selected="${g?.id eq projectGroupId}"/>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-6"></div>
-                                    <div class="col-md-2 text-right">
-                                        <div th:if="${not #strings.isEmpty(projectGroupId) }">
-                                            <button type="button" class="btn btn-primary" id="editProjectGroupBtn">
-                                                <span class="fa fa-pencil"></span>修改
-                                            </button>
-                                            <button type="button" class="btn btn-default" id="removeProjectGroupBtn">
-                                                <span class="fa fa-times"></span>删除
-                                            </button>
-                                        </div>
-                                    </div>
+                        <div class="row">
+                            <div class="col-md-4">
+                                <select id="projectGroup" name="projectGroup" class="form-control select-control">
+                                    <option value="" th:text="全部" selected/>
+                                    <option th:each="g,s:${projectGroups}" th:value="${g?.id}" th:text="${g?.name}" th:selected="${g?.id eq projectGroupId}"/>
+                                </select>
+                            </div>
+                            <div class="col-md-6"></div>
+                            <div class="col-md-2 text-right">
+                                <div th:if="${not #strings.isEmpty(projectGroupId) }">
+                                    <button type="button" class="btn btn-primary" id="editProjectGroupBtn">
+                                        <span class="fa fa-pencil"></span>修改
+                                    </button>
+                                    <button type="button" class="btn btn-default" id="removeProjectGroupBtn">
+                                        <span class="fa fa-times"></span>删除
+                                    </button>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
+                <hr class="simple" color="#6f5499" />
+                <!-- 显示分组结束位置 -->
             </div>
 
             <!-- 连接管理 -->
             <div class="col-md-12">
                 <!-- 连接开始位置 -->
                 <div class="form-group">
-                    <div class="col-md-12">
+                    <div class="col-md-10">
                         <button type="button" class="btn btn-primary" id="indexAddConnectorBtn">
                             <span class="fa fa-plus"></span>添加连接([[${connectors?.size()} ?: 0]])
                         </button>
                     </div>
+                    <div class="col-md-2 text-right">
+                        <button type="button" class="btn btn-default" id="addProjectGroupBtn" th:if="${connectorSize gt 0}">
+                            <span class="fa fa-plus"></span>添加分组([[${projectGroups?.size()} ?: 0]])
+                        </button>
+                    </div>
                 </div>
                 <!-- 显示连接列表 -->
                 <div class="row" th:if="${connectors?.size() gt 0}">
@@ -96,7 +90,7 @@
             <!-- 驱动管理 -->
             <div class="col-md-12">
                 <!-- 驱动开始位置 -->
-                <div class="form-group" th:if="${connectors?.size() gt 0}">
+                <div class="form-group" th:if="${connectorSize gt 0}">
                     <div class="col-md-12">
                         <button type="button" class="btn btn-primary" id="indexAddMappingBtn">
                             <span class="fa fa-plus"></span>添加驱动([[${mappings?.size()} ?: 0]])

dbsyncer-web/src/main/resources/public/monitor/monitor.html

@@ -84,7 +84,7 @@
             </div>
 
             <!-- 数据 -->
-            <div class="col-md-12">
+            <div class="col-md-12" th:if="${meta?.size() gt 0}">
                 <div class="panel-group">
                     <div class="panel panel-default">
                         <div class="panel-heading">

dbsyncer-web/src/main/resources/static/js/index/index.js

@@ -181,7 +181,7 @@ function doPost(url) {
 
 $(function () {
     // 初始化select插件
-    initSelectIndex($(".select-control"), 1);
+    initSelectIndex($(".select-control"));
     bindAddProjectGroup();
     var $projectGroupSelect = $("#projectGroup");
     bindEditProjectGroup($projectGroupSelect);

dbsyncer-web/src/main/resources/static/js/monitor/index.js

@@ -1,13 +1,12 @@
 function formatDate(time) {
-   var date = new Date(time);
-  var YY = date.getFullYear() + '-';
-  var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
-  var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
-  var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
-  var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
-  var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
-
-  return YY + MM + DD +" "+hh + mm + ss;
+    var date = new Date(time);
+    var YY = date.getFullYear() + '-';
+    var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+    var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
+    var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+    var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+    var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+    return YY + MM + DD +" "+hh + mm + ss;
 }
 
 // 查看详细数据