Kaynağa Gözat

调度报表

xueli.xue 8 yıl önce
ebeveyn
işleme
783f4d5b98

+ 6 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java Dosyayı Görüntüle

12
 import org.apache.commons.collections.CollectionUtils;
12
 import org.apache.commons.collections.CollectionUtils;
13
 import org.apache.commons.lang.StringUtils;
13
 import org.apache.commons.lang.StringUtils;
14
 import org.apache.commons.lang.time.DateUtils;
14
 import org.apache.commons.lang.time.DateUtils;
15
+import org.apache.commons.lang.time.FastDateFormat;
15
 import org.quartz.CronExpression;
16
 import org.quartz.CronExpression;
16
 import org.quartz.SchedulerException;
17
 import org.quartz.SchedulerException;
17
 import org.slf4j.Logger;
18
 import org.slf4j.Logger;
329
 				triggerCountFailTotal += dayFailCount;
330
 				triggerCountFailTotal += dayFailCount;
330
 			}
331
 			}
331
 		} else {
332
 		} else {
332
-			return new ReturnT<Map<String, Object>>(ReturnT.FAIL_CODE, null);
333
+            for (int i = 4; i > -1; i--) {
334
+                triggerDayList.add(FastDateFormat.getInstance("yyyy-MM-dd").format(DateUtils.addDays(new Date(), -i)));
335
+                triggerDayCountSucList.add(0);
336
+                triggerDayCountFailList.add(0);
337
+            }
333
 		}
338
 		}
334
 
339
 
335
 		Map<String, Object> result = new HashMap<String, Object>();
340
 		Map<String, Object> result = new HashMap<String, Object>();

+ 4 - 2
xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl Dosyayı Görüntüle

58
                             <span class="info-box-number">${jobLogCount}</span>
58
                             <span class="info-box-number">${jobLogCount}</span>
59
 
59
 
60
                             <div class="progress">
60
                             <div class="progress">
61
-                                <div class="progress-bar" style="width: ${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}%"></div>
61
+                                <div class="progress-bar" <#if jobLogCount gt 0> style="width: ${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}%" </#if> ></div>
62
                             </div>
62
                             </div>
63
                             <span class="progress-description">
63
                             <span class="progress-description">
64
-                                调度成功率:${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}<small>%</small>
64
+                                <#if jobLogCount gt 0>
65
+                                    调度成功率:${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}<small>%</small>
66
+                                </#if>
65
                             </span>
67
                             </span>
66
                         </div>
68
                         </div>
67
                     </div>
69
                     </div>

+ 1 - 1
xxl-job-admin/src/main/webapp/static/js/index.js Dosyayı Görüntüle

47
                },
47
                },
48
                toolbox: {
48
                toolbox: {
49
                    feature: {
49
                    feature: {
50
-                       saveAsImage: {}
50
+                       /*saveAsImage: {}*/
51
                    }
51
                    }
52
                },
52
                },
53
                grid: {
53
                grid: {