From 517061690f932de022fdb82e49cf9a34e5cfce2d Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sat, 1 Nov 2025 03:31:58 +0800 Subject: [PATCH] update doc --- .../controller/biz/JobGroupController.java | 11 ++--- .../controller/biz/JobLogController.java | 47 ++++++++++--------- .../scheduler/thread/JobCompleteHelper.java | 6 +-- .../resources/static/js/joblog.index.1.js | 28 ++++++----- 4 files changed, 47 insertions(+), 45 deletions(-) diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java index e869d518..18095e03 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java @@ -7,7 +7,6 @@ import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.mapper.XxlJobGroupMapper; import com.xxl.job.admin.mapper.XxlJobInfoMapper; import com.xxl.job.admin.mapper.XxlJobRegistryMapper; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.enums.RegistryConfig; import com.xxl.sso.core.annotation.XxlSso; import com.xxl.tool.core.CollectionTool; @@ -15,7 +14,6 @@ import com.xxl.tool.core.StringTool; import com.xxl.tool.response.PageModel; import com.xxl.tool.response.Response; import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; @@ -48,11 +46,10 @@ public class JobGroupController { @RequestMapping("/pageList") @ResponseBody @XxlSso(role = Consts.ADMIN_ROLE) - public Response> pageList(HttpServletRequest request, - @RequestParam(required = false, defaultValue = "0") int offset, - @RequestParam(required = false, defaultValue = "10") int pagesize, - @RequestParam String appname, - @RequestParam String title) { + public Response> pageList(@RequestParam(required = false, defaultValue = "0") int offset, + @RequestParam(required = false, defaultValue = "10") int pagesize, + @RequestParam String appname, + @RequestParam String title) { // page query List list = xxlJobGroupMapper.pageList(offset, pagesize, appname, title); diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java index 06516a01..431d6184 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java @@ -10,16 +10,17 @@ import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.scheduler.exception.XxlJobException; import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.util.JobGroupPermissionUtil; -import com.xxl.job.core.biz.ExecutorBiz; -import com.xxl.job.core.biz.model.KillRequest; -import com.xxl.job.core.biz.model.LogRequest; -import com.xxl.job.core.biz.model.LogResult; -import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.openapi.ExecutorBiz; +import com.xxl.job.core.openapi.model.KillRequest; +import com.xxl.job.core.openapi.model.LogRequest; +import com.xxl.job.core.openapi.model.LogResult; +import com.xxl.job.core.openapi.model.ReturnT; +import com.xxl.job.core.context.XxlJobContext; import com.xxl.tool.core.CollectionTool; import com.xxl.tool.core.DateTool; import com.xxl.tool.core.StringTool; +import com.xxl.tool.response.PageModel; import com.xxl.tool.response.Response; -import com.xxl.tool.response.ResponseCode; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; @@ -106,13 +107,13 @@ public class JobLogController { @RequestMapping("/pageList") @ResponseBody - public Map pageList(HttpServletRequest request, - @RequestParam(value = "start", required = false, defaultValue = "0") int start, - @RequestParam(value = "length", required = false, defaultValue = "10") int length, - @RequestParam("jobGroup") int jobGroup, - @RequestParam("jobId") int jobId, - @RequestParam("logStatus") int logStatus, - @RequestParam("filterTime") String filterTime) { + public Response> pageList(HttpServletRequest request, + @RequestParam(required = false, defaultValue = "0") int offset, + @RequestParam(required = false, defaultValue = "10") int pagesize, + @RequestParam int jobGroup, + @RequestParam int jobId, + @RequestParam int logStatus, + @RequestParam String filterTime) { // valid jobGroup permission JobGroupPermissionUtil.validJobGroupPermission(request, jobGroup); @@ -129,15 +130,15 @@ public class JobLogController { } // page query - List list = xxlJobLogMapper.pageList(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus); - int list_count = xxlJobLogMapper.pageListCount(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus); - + List list = xxlJobLogMapper.pageList(offset, pagesize, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus); + int list_count = xxlJobLogMapper.pageListCount(offset, pagesize, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus); + // package result - Map maps = new HashMap(); - maps.put("recordsTotal", list_count); // 总记录数 - maps.put("recordsFiltered", list_count); // 过滤后的总记录数 - maps.put("data", list); // 分页列表 - return maps; + PageModel pageModel = new PageModel<>(); + pageModel.setPageData(list); + pageModel.setTotalCount(list_count); + + return Response.ofSuccess(pageModel); } @RequestMapping("/logDetailPage") @@ -251,8 +252,8 @@ public class JobLogController { runResult = Response.ofFail( e.getMessage()); } - if (ReturnT.SUCCESS_CODE == runResult.getCode()) { - log.setHandleCode(ResponseCode.CODE_202.getCode()); + if (XxlJobContext.HANDLE_CODE_SUCCESS == runResult.getCode()) { + log.setHandleCode(XxlJobContext.HANDLE_CODE_FAIL); log.setHandleMsg( I18nUtil.getString("joblog_kill_log_byman")+":" + (runResult.getMsg()!=null?runResult.getMsg():"")); log.setHandleTime(new Date()); XxlJobAdminBootstrap.getInstance().getJobCompleter().complete(log); diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java index b0cd68b1..d977435c 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java @@ -3,10 +3,10 @@ package com.xxl.job.admin.scheduler.thread; import com.xxl.job.admin.model.XxlJobLog; import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.util.I18nUtil; -import com.xxl.job.core.biz.model.HandleCallbackRequest; +import com.xxl.job.core.openapi.model.HandleCallbackRequest; +import com.xxl.job.core.context.XxlJobContext; import com.xxl.tool.core.DateTool; import com.xxl.tool.response.Response; -import com.xxl.tool.response.ResponseCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -84,7 +84,7 @@ public class JobCompleteHelper { jobLog.setId(logId); jobLog.setHandleTime(new Date()); - jobLog.setHandleCode(ResponseCode.CODE_202.getCode()); + jobLog.setHandleCode(XxlJobContext.HANDLE_CODE_FAIL); jobLog.setHandleMsg( I18nUtil.getString("joblog_lost_fail") ); XxlJobAdminBootstrap.getInstance().getJobCompleter().complete(jobLog); diff --git a/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js b/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js index 08a3c454..e2bcf758 100644 --- a/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js @@ -52,14 +52,22 @@ $(function() { type:"post", data : function ( d ) { var obj = {}; - obj.jobGroup = $('#jobGroup').val(); + obj.offset = d.start; + obj.pagesize = d.length; + obj.jobGroup = $('#jobGroup').val(); obj.jobId = $('#jobId').val(); obj.logStatus = $('#logStatus').val(); obj.filterTime = $('#filterTime').val(); - obj.start = d.start; - obj.length = d.length; return obj; - } + }, + dataFilter: function (json ) { + var result = JSON.parse(json); + return JSON.stringify({ + "recordsTotal": result.data.totalCount, + "recordsFiltered": result.data.totalCount, + "data": result.data.pageData + }); + } }, "searching": false, "ordering": false, @@ -99,10 +107,8 @@ $(function() { var html = data; if (data == 200) { html = ''+ I18n.system_success +''; - } else if (data == 500) { + } else if (data > 0) { // 500 html = ''+ I18n.system_fail +''; - } else if (data == 0) { - html = ''; } return html; } @@ -128,12 +134,10 @@ $(function() { var html = data; if (data == 200) { html = ''+ I18n.joblog_handleCode_200 +''; - } else if (data == 500) { - html = ''+ I18n.joblog_handleCode_500 +''; } else if (data == 502) { - html = ''+ I18n.joblog_handleCode_502 +''; - } else if (data == 0) { - html = ''; + html = ''+ I18n.joblog_handleCode_502 +''; + } else if (data > 0) { // 500 + html = ''+ I18n.joblog_handleCode_500 +''; } return html; }