|
|
|
@ -5,10 +5,7 @@ import com.xxl.job.admin.core.model.XxlJobLogReport;
|
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
|
|
|
|
|
import java.util.Calendar;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -68,11 +65,16 @@ public class JobLogReportHelper {
|
|
|
|
|
xxlJobLogReport.setSucCount(0);
|
|
|
|
|
xxlJobLogReport.setFailCount(0);
|
|
|
|
|
|
|
|
|
|
// triggerCountMap
|
|
|
|
|
Map<String, Object> triggerCountMap = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().findLogReport(todayFrom, todayTo);
|
|
|
|
|
if (triggerCountMap!=null && triggerCountMap.size()>0) {
|
|
|
|
|
int triggerDayCount = triggerCountMap.containsKey("triggerDayCount")?Integer.valueOf(String.valueOf(triggerCountMap.get("triggerDayCount"))):0;
|
|
|
|
|
int triggerDayCountRunning = triggerCountMap.containsKey("triggerDayCountRunning")?Integer.valueOf(String.valueOf(triggerCountMap.get("triggerDayCountRunning"))):0;
|
|
|
|
|
int triggerDayCountSuc = triggerCountMap.containsKey("triggerDayCountSuc")?Integer.valueOf(String.valueOf(triggerCountMap.get("triggerDayCountSuc"))):0;
|
|
|
|
|
// Ignore the case of 'key'
|
|
|
|
|
TreeMap<String, Object> ignoreKeyCaseMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
|
|
|
|
|
ignoreKeyCaseMap.putAll(triggerCountMap);
|
|
|
|
|
|
|
|
|
|
if (ignoreKeyCaseMap.size() > 0) {
|
|
|
|
|
int triggerDayCount = ignoreKeyCaseMap.containsKey("triggerDayCount") ? Integer.parseInt(String.valueOf(ignoreKeyCaseMap.get("triggerDayCount"))) : 0;
|
|
|
|
|
int triggerDayCountRunning = ignoreKeyCaseMap.containsKey("triggerDayCountRunning") ? Integer.parseInt(String.valueOf(ignoreKeyCaseMap.get("triggerDayCountRunning"))) : 0;
|
|
|
|
|
int triggerDayCountSuc = ignoreKeyCaseMap.containsKey("triggerDayCountSuc") ? Integer.parseInt(String.valueOf(ignoreKeyCaseMap.get("triggerDayCountSuc"))) : 0;
|
|
|
|
|
int triggerDayCountFail = triggerDayCount - triggerDayCountRunning - triggerDayCountSuc;
|
|
|
|
|
|
|
|
|
|
xxlJobLogReport.setRunningCount(triggerDayCountRunning);
|
|
|
|
|