From bf12237f0cedf8c2a9f0fe298f457772790c7d86 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 28 三月 2023 18:38:54 +0800 Subject: [PATCH] 提交code服务代码 --- Source/BladeX/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/BladeX/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/Source/BladeX/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java index 7e3d4ba..309769c 100644 --- a/Source/BladeX/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/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); // 鎬昏褰曟暟 -- Gitblit v1.9.3