diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java index 74273107..0d138f21 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java @@ -1,8 +1,8 @@ package com.xxl.job.admin.controller; import com.xxl.job.admin.service.XxlJobService; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.sso.core.annotation.XxlSso; +import com.xxl.tool.response.Response; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -42,8 +42,8 @@ public class IndexController { @RequestMapping("/chartInfo") @ResponseBody - public ReturnT> chartInfo(@RequestParam("startDate") Date startDate, @RequestParam("endDate") Date endDate) { - ReturnT> chartInfo = xxlJobService.chartInfo(startDate, endDate); + public Response> chartInfo(@RequestParam("startDate") Date startDate, @RequestParam("endDate") Date endDate) { + Response> chartInfo = xxlJobService.chartInfo(startDate, endDate); return chartInfo; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java index ae1fb105..7097d3e4 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java @@ -6,9 +6,9 @@ import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.model.XxlJobLogGlue; import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.util.JobGroupPermissionUtil; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.tool.core.StringTool; +import com.xxl.tool.response.Response; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import org.springframework.stereotype.Controller; @@ -58,24 +58,24 @@ public class JobCodeController { @RequestMapping("/save") @ResponseBody - public ReturnT save(HttpServletRequest request, - @RequestParam("id") int id, - @RequestParam("glueSource") String glueSource, - @RequestParam("glueRemark") String glueRemark) { + public Response save(HttpServletRequest request, + @RequestParam("id") int id, + @RequestParam("glueSource") String glueSource, + @RequestParam("glueRemark") String glueRemark) { // valid if (StringTool.isBlank(glueSource)) { - return ReturnT.ofFail( (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_source")) ); + return Response.ofFail( (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_source")) ); } if (glueRemark==null) { - return ReturnT.ofFail( (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_remark")) ); + return Response.ofFail( (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_remark")) ); } if (glueRemark.length()<4 || glueRemark.length()>100) { - return ReturnT.ofFail(I18nUtil.getString("jobinfo_glue_remark_limit")); + return Response.ofFail(I18nUtil.getString("jobinfo_glue_remark_limit")); } XxlJobInfo existsJobInfo = xxlJobInfoMapper.loadById(id); if (existsJobInfo == null) { - return ReturnT.ofFail( I18nUtil.getString("jobinfo_glue_jobid_unvalid")); + return Response.ofFail( I18nUtil.getString("jobinfo_glue_jobid_unvalid")); } // valid jobGroup permission @@ -103,7 +103,7 @@ public class JobCodeController { // remove code backup more than 30 xxlJobLogGlueMapper.removeOld(existsJobInfo.getId(), 30); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } } 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 426b0075..e869d518 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 @@ -12,6 +12,8 @@ import com.xxl.job.core.enums.RegistryConfig; import com.xxl.sso.core.annotation.XxlSso; import com.xxl.tool.core.CollectionTool; 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; @@ -46,57 +48,57 @@ public class JobGroupController { @RequestMapping("/pageList") @ResponseBody @XxlSso(role = Consts.ADMIN_ROLE) - public Map pageList(HttpServletRequest request, - @RequestParam(value = "start", required = false, defaultValue = "0") int start, - @RequestParam(value = "length", required = false, defaultValue = "10") int length, - @RequestParam("appname") String appname, - @RequestParam("title") String title) { + 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) { // page query - List list = xxlJobGroupMapper.pageList(start, length, appname, title); - int list_count = xxlJobGroupMapper.pageListCount(start, length, appname, title); + List list = xxlJobGroupMapper.pageList(offset, pagesize, appname, title); + int list_count = xxlJobGroupMapper.pageListCount(offset, pagesize, appname, title); // 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("/save") @ResponseBody @XxlSso(role = Consts.ADMIN_ROLE) - public ReturnT save(XxlJobGroup xxlJobGroup){ + public Response save(XxlJobGroup xxlJobGroup){ // valid if (StringTool.isBlank(xxlJobGroup.getAppname())) { - return ReturnT.ofFail((I18nUtil.getString("system_please_input")+"AppName") ); + return Response.ofFail((I18nUtil.getString("system_please_input")+"AppName") ); } if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) { - return ReturnT.ofFail( I18nUtil.getString("jobgroup_field_appname_length") ); + return Response.ofFail( I18nUtil.getString("jobgroup_field_appname_length") ); } if (xxlJobGroup.getAppname().contains(">") || xxlJobGroup.getAppname().contains("<")) { - return ReturnT.ofFail( "AppName"+I18nUtil.getString("system_unvalid") ); + return Response.ofFail( "AppName"+I18nUtil.getString("system_unvalid") ); } if (StringTool.isBlank(xxlJobGroup.getTitle())) { - return ReturnT.ofFail((I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) ); + return Response.ofFail((I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) ); } if (xxlJobGroup.getTitle().contains(">") || xxlJobGroup.getTitle().contains("<")) { - return ReturnT.ofFail(I18nUtil.getString("jobgroup_field_title")+I18nUtil.getString("system_unvalid") ); + return Response.ofFail(I18nUtil.getString("jobgroup_field_title")+I18nUtil.getString("system_unvalid") ); } if (xxlJobGroup.getAddressType()!=0) { if (StringTool.isBlank(xxlJobGroup.getAddressList())) { - return ReturnT.ofFail( I18nUtil.getString("jobgroup_field_addressType_limit") ); + return Response.ofFail( I18nUtil.getString("jobgroup_field_addressType_limit") ); } if (xxlJobGroup.getAddressList().contains(">") || xxlJobGroup.getAddressList().contains("<")) { - return ReturnT.ofFail(I18nUtil.getString("jobgroup_field_registryList")+I18nUtil.getString("system_unvalid") ); + return Response.ofFail(I18nUtil.getString("jobgroup_field_registryList")+I18nUtil.getString("system_unvalid") ); } String[] addresss = xxlJobGroup.getAddressList().split(","); for (String item: addresss) { if (StringTool.isBlank(item)) { - return ReturnT.ofFail( I18nUtil.getString("jobgroup_field_registryList_unvalid") ); + return Response.ofFail( I18nUtil.getString("jobgroup_field_registryList_unvalid") ); } } } @@ -105,22 +107,22 @@ public class JobGroupController { xxlJobGroup.setUpdateTime(new Date()); int ret = xxlJobGroupMapper.save(xxlJobGroup); - return (ret>0)?ReturnT.ofSuccess():ReturnT.ofFail(); + return (ret>0)?Response.ofSuccess():Response.ofFail(); } @RequestMapping("/update") @ResponseBody @XxlSso(role = Consts.ADMIN_ROLE) - public ReturnT update(XxlJobGroup xxlJobGroup){ + public Response update(XxlJobGroup xxlJobGroup){ // valid if (StringTool.isBlank(xxlJobGroup.getAppname())) { - return ReturnT.ofFail((I18nUtil.getString("system_please_input")+"AppName") ); + return Response.ofFail((I18nUtil.getString("system_please_input")+"AppName") ); } if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) { - return ReturnT.ofFail( I18nUtil.getString("jobgroup_field_appname_length") ); + return Response.ofFail( I18nUtil.getString("jobgroup_field_appname_length") ); } if (StringTool.isBlank(xxlJobGroup.getTitle())) { - return ReturnT.ofFail( (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) ); + return Response.ofFail( (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) ); } if (xxlJobGroup.getAddressType() == 0) { // 0=自动注册 @@ -134,12 +136,12 @@ public class JobGroupController { } else { // 1=手动录入 if (StringTool.isBlank(xxlJobGroup.getAddressList())) { - return ReturnT.ofFail( I18nUtil.getString("jobgroup_field_addressType_limit") ); + return Response.ofFail( I18nUtil.getString("jobgroup_field_addressType_limit") ); } String[] addresss = xxlJobGroup.getAddressList().split(","); for (String item: addresss) { if (StringTool.isBlank(item)) { - return ReturnT.ofFail(I18nUtil.getString("jobgroup_field_registryList_unvalid") ); + return Response.ofFail(I18nUtil.getString("jobgroup_field_registryList_unvalid") ); } } } @@ -148,7 +150,7 @@ public class JobGroupController { xxlJobGroup.setUpdateTime(new Date()); int ret = xxlJobGroupMapper.update(xxlJobGroup); - return (ret>0)?ReturnT.ofSuccess():ReturnT.ofFail(); + return (ret>0)?Response.ofSuccess():Response.ofFail(); } private List findRegistryByAppName(String appnameParam){ @@ -174,29 +176,29 @@ public class JobGroupController { @RequestMapping("/remove") @ResponseBody @XxlSso(role = Consts.ADMIN_ROLE) - public ReturnT remove(@RequestParam("id") int id){ + public Response remove(@RequestParam("id") int id){ // valid int count = xxlJobInfoMapper.pageListCount(0, 10, id, -1, null, null, null); if (count > 0) { - return ReturnT.ofFail( I18nUtil.getString("jobgroup_del_limit_0") ); + return Response.ofFail( I18nUtil.getString("jobgroup_del_limit_0") ); } List allList = xxlJobGroupMapper.findAll(); if (allList.size() == 1) { - return ReturnT.ofFail( I18nUtil.getString("jobgroup_del_limit_1") ); + return Response.ofFail( I18nUtil.getString("jobgroup_del_limit_1") ); } int ret = xxlJobGroupMapper.remove(id); - return (ret>0)?ReturnT.ofSuccess():ReturnT.ofFail(); + return (ret>0)?Response.ofSuccess():Response.ofFail(); } @RequestMapping("/loadById") @ResponseBody @XxlSso(role = Consts.ADMIN_ROLE) - public ReturnT loadById(@RequestParam("id") int id){ + public Response loadById(@RequestParam("id") int id){ XxlJobGroup jobGroup = xxlJobGroupMapper.load(id); - return jobGroup!=null?ReturnT.ofSuccess(jobGroup):ReturnT.ofFail(); + return jobGroup!=null?Response.ofSuccess(jobGroup):Response.ofFail(); } } 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 c20f8b04..06516a01 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 @@ -19,6 +19,7 @@ import com.xxl.tool.core.CollectionTool; import com.xxl.tool.core.DateTool; import com.xxl.tool.core.StringTool; 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; @@ -251,7 +252,7 @@ public class JobLogController { } if (ReturnT.SUCCESS_CODE == runResult.getCode()) { - log.setHandleCode(ReturnT.FAIL_CODE); + log.setHandleCode(ResponseCode.CODE_202.getCode()); 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/controller/login/LoginController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/login/LoginController.java index 53eec5c2..e5ba2eb6 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/login/LoginController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/login/LoginController.java @@ -3,7 +3,6 @@ package com.xxl.job.admin.controller.login; import com.xxl.job.admin.mapper.XxlJobUserMapper; import com.xxl.job.admin.model.XxlJobUser; import com.xxl.job.admin.util.I18nUtil; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.sso.core.annotation.XxlSso; import com.xxl.sso.core.helper.XxlSsoHelper; import com.xxl.sso.core.model.LoginInfo; @@ -50,7 +49,7 @@ public class LoginController { @RequestMapping(value="/doLogin", method=RequestMethod.POST) @ResponseBody @XxlSso(login = false) - public ReturnT doLogin(HttpServletRequest request, + public Response doLogin(HttpServletRequest request, HttpServletResponse response, @RequestParam("userName") String userName, @RequestParam("password") String password, @@ -59,36 +58,36 @@ public class LoginController { // param boolean ifRem = StringTool.isNotBlank(ifRemember) && "on".equals(ifRemember); if (StringTool.isBlank(userName) || StringTool.isBlank(password)){ - return ReturnT.ofFail( I18nUtil.getString("login_param_empty") ); + return Response.ofFail( I18nUtil.getString("login_param_empty") ); } // valid user、status XxlJobUser xxlJobUser = xxlJobUserMapper.loadByUserName(userName); if (xxlJobUser == null) { - return ReturnT.ofFail( I18nUtil.getString("login_param_unvalid") ); + return Response.ofFail( I18nUtil.getString("login_param_unvalid") ); } // valid passowrd String passwordHash = SHA256Tool.sha256(password); if (!passwordHash.equals(xxlJobUser.getPassword())) { - return ReturnT.ofFail( I18nUtil.getString("login_param_unvalid") ); + return Response.ofFail( I18nUtil.getString("login_param_unvalid") ); } // xxl-sso, do login LoginInfo loginInfo = new LoginInfo(String.valueOf(xxlJobUser.getId()), UUIDTool.getSimpleUUID()); Response result= XxlSsoHelper.loginWithCookie(loginInfo, response, ifRem); - return ReturnT.of(result.getCode(), result.getMsg()); + return Response.of(result.getCode(), result.getMsg()); } @RequestMapping(value="/logout", method=RequestMethod.POST) @ResponseBody @XxlSso(login = false) - public ReturnT logout(HttpServletRequest request, HttpServletResponse response){ + public Response logout(HttpServletRequest request, HttpServletResponse response){ // xxl-sso, do logout Response result = XxlSsoHelper.logoutWithCookie(request, response); - return ReturnT.of(result.getCode(), result.getMsg()); + return Response.of(result.getCode(), result.getMsg()); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java index 86808ed0..bfcc7faa 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java @@ -6,7 +6,7 @@ import com.xxl.job.admin.model.XxlJobGroup; import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.model.XxlJobLog; import com.xxl.job.admin.util.I18nUtil; -import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.tool.response.ResponseCode; import jakarta.mail.internet.MimeMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,10 +41,10 @@ public class EmailJobAlarm implements JobAlarm { // alarmContent String alarmContent = "Alarm Job LogId=" + jobLog.getId(); - if (jobLog.getTriggerCode() != ReturnT.SUCCESS_CODE) { + if (jobLog.getTriggerCode() != ResponseCode.CODE_200.getCode()) { alarmContent += "
TriggerMsg=
" + jobLog.getTriggerMsg(); } - if (jobLog.getHandleCode()>0 && jobLog.getHandleCode() != ReturnT.SUCCESS_CODE) { + if (jobLog.getHandleCode()>0 && jobLog.getHandleCode() != ResponseCode.CODE_200.getCode()) { alarmContent += "
HandleCode=" + jobLog.getHandleMsg(); } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/complete/JobCompleter.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/complete/JobCompleter.java index b0a02649..e11541a9 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/complete/JobCompleter.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/complete/JobCompleter.java @@ -7,9 +7,9 @@ import com.xxl.job.admin.model.XxlJobLog; import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; import com.xxl.job.admin.util.I18nUtil; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobContext; import com.xxl.tool.core.StringTool; +import com.xxl.tool.response.Response; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,7 +83,7 @@ public class JobCompleter { // trigger child job XxlJobAdminBootstrap.getInstance().getJobTriggerPoolHelper().trigger(childJobId, TriggerTypeEnum.PARENT, -1, null, null, null); - ReturnT triggerChildResult = ReturnT.ofSuccess(); + Response triggerChildResult = Response.ofSuccess(); // add msg triggerChildMsg += MessageFormat.format(I18nUtil.getString("jobconf_callback_child_msg1"), diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java index 36da2a4c..f2e62a60 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java @@ -4,7 +4,6 @@ import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.core.biz.ExecutorBiz; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerRequest; import com.xxl.tool.response.Response; 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 3b512835..b0cd68b1 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 @@ -4,9 +4,9 @@ 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.biz.model.ReturnT; 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(ReturnT.FAIL_CODE); + jobLog.setHandleCode(ResponseCode.CODE_202.getCode()); jobLog.setHandleMsg( I18nUtil.getString("joblog_lost_fail") ); XxlJobAdminBootstrap.getInstance().getJobCompleter().complete(jobLog); diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java index 356ee83f..a210090f 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java @@ -5,6 +5,7 @@ import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.model.XxlJobUser; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.sso.core.model.LoginInfo; +import com.xxl.tool.response.Response; import java.util.Date; import java.util.Map; @@ -94,6 +95,6 @@ public interface XxlJobService { * @param endDate * @return */ - public ReturnT> chartInfo(Date startDate, Date endDate); + public Response> chartInfo(Date startDate, Date endDate); } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java index d4056f2a..33009f33 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java @@ -19,6 +19,7 @@ import com.xxl.job.core.enums.ExecutorBlockStrategyEnum; import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.sso.core.model.LoginInfo; import com.xxl.tool.core.DateTool; +import com.xxl.tool.response.Response; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -457,7 +458,7 @@ public class XxlJobServiceImpl implements XxlJobService { } @Override - public ReturnT> chartInfo(Date startDate, Date endDate) { + public Response> chartInfo(Date startDate, Date endDate) { // process List triggerDayList = new ArrayList(); @@ -470,7 +471,7 @@ public class XxlJobServiceImpl implements XxlJobService { List logReportList = xxlJobLogReportMapper.queryLogReport(startDate, endDate); - if (logReportList!=null && logReportList.size()>0) { + if (logReportList!=null && !logReportList.isEmpty()) { for (XxlJobLogReport item: logReportList) { String day = DateTool.formatDate(item.getTriggerDay()); int triggerDayCountRunning = item.getRunningCount(); @@ -505,7 +506,7 @@ public class XxlJobServiceImpl implements XxlJobService { result.put("triggerCountSucTotal", triggerCountSucTotal); result.put("triggerCountFailTotal", triggerCountFailTotal); - return ReturnT.ofSuccess(result); + return Response.ofSuccess(result); } } diff --git a/xxl-job-admin/src/main/resources/static/js/index.js b/xxl-job-admin/src/main/resources/static/js/index.js index 09111c58..d68faed5 100644 --- a/xxl-job-admin/src/main/resources/static/js/index.js +++ b/xxl-job-admin/src/main/resources/static/js/index.js @@ -57,8 +57,8 @@ $(function () { dataType : "json", success : function(data){ if (data.code == 200) { - lineChartInit(data) - pieChartInit(data); + lineChartInit(data.data) + pieChartInit(data.data); } else { layer.open({ title: I18n.system_tips , @@ -106,7 +106,7 @@ $(function () { { type : 'category', boundaryGap : false, - data : data.content.triggerDayList + data : data.triggerDayList } ], yAxis : [ @@ -120,7 +120,7 @@ $(function () { type:'line', stack: 'Total', areaStyle: {normal: {}}, - data: data.content.triggerDayCountSucList + data: data.triggerDayCountSucList }, { name:I18n.joblog_status_fail, @@ -133,14 +133,14 @@ $(function () { } }, areaStyle: {normal: {}}, - data: data.content.triggerDayCountFailList + data: data.triggerDayCountFailList }, { name:I18n.joblog_status_running, type:'line', stack: 'Total', areaStyle: {normal: {}}, - data: data.content.triggerDayCountRunningList + data: data.triggerDayCountRunningList } ], color:['#00A65A', '#c23632', '#F39C12'] @@ -178,15 +178,15 @@ $(function () { data:[ { name:I18n.joblog_status_suc, - value:data.content.triggerCountSucTotal + value:data.triggerCountSucTotal }, { name:I18n.joblog_status_fail, - value:data.content.triggerCountFailTotal + value:data.triggerCountFailTotal }, { name:I18n.joblog_status_running, - value:data.content.triggerCountRunningTotal + value:data.triggerCountRunningTotal } ], itemStyle: { diff --git a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js index e9b16e41..35d90370 100644 --- a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js @@ -10,11 +10,19 @@ $(function() { type:"post", data : function ( d ) { var obj = {}; + obj.offset = d.start; + obj.pagesize = d.length; obj.appname = $('#appname').val(); obj.title = $('#title').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, diff --git a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js index 4683cb42..4e37d27d 100644 --- a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js @@ -312,9 +312,9 @@ $(function() { success : function(data){ var html = '
'; - if (data.code == 200 && data.content.registryList) { - for (var index in data.content.registryList) { - html += (parseInt(index)+1) + '. ' + data.content.registryList[index] + '
'; + if (data.code == 200 && data.data.registryList) { + for (var index in data.data.registryList) { + html += (parseInt(index)+1) + '. ' + data.data.registryList[index] + '
'; } } html += '
';