up label

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

@@ -79,7 +79,7 @@ public class MonitorServiceImpl implements MonitorService {
         }
 
         int pageNum = NumberUtils.toInt(params.get("pageNum"), 1);
-        int pageSize = NumberUtils.toInt(params.get("pageSize"), 20);
+        int pageSize = NumberUtils.toInt(params.get("pageSize"), 10);
         Query query = new Query(pageNum, pageSize);
         // 查询异常信息
         String error = params.get(ConfigConstant.DATA_ERROR);
@@ -103,7 +103,7 @@ public class MonitorServiceImpl implements MonitorService {
     @Override
     public List<LogVo> queryLog(Map<String, String> params) {
         int pageNum = NumberUtils.toInt(params.get("pageNum"), 1);
-        int pageSize = NumberUtils.toInt(params.get("pageSize"), 20);
+        int pageSize = NumberUtils.toInt(params.get("pageSize"), 10);
         Query query = new Query(pageNum, pageSize);
         // 查询日志内容
         String json = params.get(ConfigConstant.CONFIG_MODEL_JSON);

dbsyncer-monitor/src/main/java/org/dbsyncer/monitor/MonitorFactory.java

@@ -41,16 +41,15 @@ public class MonitorFactory implements Monitor {
     @Override
     public Map getThreadInfo() {
         Map map = new HashMap();
-        if(taskExecutor instanceof ThreadPoolTaskExecutor){
+        if (taskExecutor instanceof ThreadPoolTaskExecutor) {
             ThreadPoolTaskExecutor threadTask = (ThreadPoolTaskExecutor) taskExecutor;
             ThreadPoolExecutor threadPoolExecutor = threadTask.getThreadPoolExecutor();
 
-            map.put("提交任务数", threadPoolExecutor.getTaskCount());
-            map.put("完成任务数", threadPoolExecutor.getCompletedTaskCount());
-            map.put("当前有多少线程正在处理任务", threadPoolExecutor.getActiveCount());
-            map.put("还剩多少个任务未执行", threadPoolExecutor.getQueue().size());
-            map.put("当前可用队列长度", threadPoolExecutor.getQueue().remainingCapacity());
-            map.put("当前时间", DateFormatUtil.getCurrentDateTime());
+            map.put("已提交", threadPoolExecutor.getTaskCount());
+            map.put("已完成", threadPoolExecutor.getCompletedTaskCount());
+            map.put("处理中", threadPoolExecutor.getActiveCount());
+            map.put("排队中", threadPoolExecutor.getQueue().size());
+            map.put("队列长度", threadPoolExecutor.getQueue().remainingCapacity());
         }
         return map;
     }

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

@@ -81,7 +81,7 @@ function bindQueryDataEvent() {
     $("#queryDataBtn").click(function () {
         var keyword = $("#searchDataKeyword").val();
         var id = $("select[name='metaData']").select2("val");
-        doGetter('/monitor/queryData', {"error": keyword, "id" : id}, function (data) {
+        doGetter('/monitor/queryData', {"error": keyword, "id" : id, "pageNum" : 1, "pageSize" : 10}, function (data) {
             if (data.success == true) {
                 showDataList(data.resultValue);
             } else {
@@ -111,7 +111,7 @@ function showDataList(arr){
 function bindQueryLogEvent() {
     $("#queryLogBtn").click(function () {
         var keyword = $("#searchLogKeyword").val();
-        doGetter('/monitor/queryLog', {"json": keyword}, function (data) {
+        doGetter('/monitor/queryLog', {"json": keyword, "pageNum" : 1, "pageSize" : 10}, function (data) {
             if (data.success == true) {
                 showLogList(data.resultValue);
             } else {