Source/BladeX/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java

@@ -1,10 +1,10 @@
package com.xxl.job.admin.controller;

import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
import com.xxl.job.admin.core.exception.XxlJobException;
import com.xxl.job.admin.core.model.XxlJobGroup;
import com.xxl.job.admin.core.model.XxlJobInfo;
import com.xxl.job.admin.core.model.XxlJobLog;
import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
import com.xxl.job.admin.core.util.I18nUtil;
import com.xxl.job.admin.dao.XxlJobGroupDao;
import com.xxl.job.admin.dao.XxlJobInfoDao;
@@ -80,7 +80,7 @@
      List<XxlJobInfo> list = xxlJobInfoDao.getJobsByGroup(jobGroup);
      return new ReturnT<List<XxlJobInfo>>(list);
   }
	

   @RequestMapping("/pageList")
   @ResponseBody
   public Map<String, Object> pageList(HttpServletRequest request,
@@ -90,7 +90,7 @@

      // valid permission
      JobInfoController.validPermission(request, jobGroup);   // 仅管理员支持查询全部；普通用户仅支持查询有权限的 jobGroup
		

      // parse param
      Date triggerTimeStart = null;
      Date triggerTimeEnd = null;
@@ -101,11 +101,11 @@
            triggerTimeEnd = DateUtil.parseDateTime(temp[1]);
         }
      }
		

      // page query
      List<XxlJobLog> list = xxlJobLogDao.pageList(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
      int list_count = xxlJobLogDao.pageListCount(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
		

      // package result
      Map<String, Object> maps = new HashMap<String, Object>();
       maps.put("recordsTotal", list_count);      // 总记录数