调度报表

master
xueli.xue 8 years ago
parent 92a124f4d6
commit 783f4d5b98
  1. 7
      xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
  2. 6
      xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
  3. 2
      xxl-job-admin/src/main/webapp/static/js/index.js

@ -12,6 +12,7 @@ import com.xxl.job.core.registry.RegistHelper;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils; import org.apache.commons.lang.time.DateUtils;
import org.apache.commons.lang.time.FastDateFormat;
import org.quartz.CronExpression; import org.quartz.CronExpression;
import org.quartz.SchedulerException; import org.quartz.SchedulerException;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -329,7 +330,11 @@ public class XxlJobServiceImpl implements IXxlJobService {
triggerCountFailTotal += dayFailCount; triggerCountFailTotal += dayFailCount;
} }
} else { } else {
return new ReturnT<Map<String, Object>>(ReturnT.FAIL_CODE, null); for (int i = 4; i > -1; i--) {
triggerDayList.add(FastDateFormat.getInstance("yyyy-MM-dd").format(DateUtils.addDays(new Date(), -i)));
triggerDayCountSucList.add(0);
triggerDayCountFailList.add(0);
}
} }
Map<String, Object> result = new HashMap<String, Object>(); Map<String, Object> result = new HashMap<String, Object>();

@ -58,10 +58,12 @@
<span class="info-box-number">${jobLogCount}</span> <span class="info-box-number">${jobLogCount}</span>
<div class="progress"> <div class="progress">
<div class="progress-bar" style="width: ${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}%"></div> <div class="progress-bar" <#if jobLogCount gt 0> style="width: ${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}%" </#if> ></div>
</div> </div>
<span class="progress-description"> <span class="progress-description">
调度成功率${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}<small>%</small> <#if jobLogCount gt 0>
调度成功率${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}<small>%</small>
</#if>
</span> </span>
</div> </div>
</div> </div>

@ -47,7 +47,7 @@ $(function () {
}, },
toolbox: { toolbox: {
feature: { feature: {
saveAsImage: {} /*saveAsImage: {}*/
} }
}, },
grid: { grid: {

Loading…
Cancel
Save