From 37e9a00139782dd0e8a98bd781da94af0b21060f Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Tue, 30 Jan 2018 11:51:15 +0800 Subject: [PATCH] =?UTF-8?q?Job=E6=9C=8D=E5=8A=A1=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E4=B8=BA=E6=8F=90=E4=BE=9BAPI?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=81=9A=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/admin/controller/IndexController.java | 8 +- .../admin/controller/JobInfoController.java | 6 +- .../xxl/job/admin/service/XxlJobService.java | 77 ++++++++++++++++--- .../admin/service/impl/XxlJobServiceImpl.java | 10 +-- .../src/main/webapp/static/js/index.js | 2 +- .../main/webapp/static/js/jobinfo.index.1.js | 2 +- 6 files changed, 82 insertions(+), 23 deletions(-) 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 c633073a..8dc6b754 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 @@ -41,11 +41,11 @@ public class IndexController { return "index"; } - @RequestMapping("/triggerChartDate") + @RequestMapping("/chartInfo") @ResponseBody - public ReturnT> triggerChartDate(Date startDate, Date endDate) { - ReturnT> triggerChartDate = xxlJobService.triggerChartDate(startDate, endDate); - return triggerChartDate; + public ReturnT> chartInfo(Date startDate, Date endDate) { + ReturnT> chartInfo = xxlJobService.chartInfo(startDate, endDate); + return chartInfo; } @RequestMapping("/toLogin") diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java index e1dfabbc..09eedb60 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java @@ -64,10 +64,10 @@ public class JobInfoController { return xxlJobService.add(jobInfo); } - @RequestMapping("/reschedule") + @RequestMapping("/update") @ResponseBody - public ReturnT reschedule(XxlJobInfo jobInfo) { - return xxlJobService.reschedule(jobInfo); + public ReturnT update(XxlJobInfo jobInfo) { + return xxlJobService.update(jobInfo); } @RequestMapping("/remove") 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 cdea2859..b51e9288 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 @@ -13,23 +13,82 @@ import java.util.Map; * @author xuxueli 2016-5-28 15:30:33 */ public interface XxlJobService { - + + /** + * page list + * + * @param start + * @param length + * @param jobGroup + * @param jobDesc + * @param executorHandler + * @param filterTime + * @return + */ public Map pageList(int start, int length, int jobGroup, String jobDesc, String executorHandler, String filterTime); - + + /** + * add job + * + * @param jobInfo + * @return + */ public ReturnT add(XxlJobInfo jobInfo); - - public ReturnT reschedule(XxlJobInfo jobInfo); - + + /** + * update job + * + * @param jobInfo + * @return + */ + public ReturnT update(XxlJobInfo jobInfo); + + /** + * remove job + * + * @param id + * @return + */ public ReturnT remove(int id); - + + /** + * pause job + * + * @param id + * @return + */ public ReturnT pause(int id); - + + /** + * resume job + * + * @param id + * @return + */ public ReturnT resume(int id); - + + /** + * trigger job + * + * @param id + * @return + */ public ReturnT triggerJob(int id); + /** + * dashboard info + * + * @return + */ public Map dashboardInfo(); - public ReturnT> triggerChartDate(Date startDate, Date endDate); + /** + * chart info + * + * @param startDate + * @param endDate + * @return + */ + public ReturnT> 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 0ad2e2df..406c74b0 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 @@ -149,7 +149,7 @@ public class XxlJobServiceImpl implements XxlJobService { } @Override - public ReturnT reschedule(XxlJobInfo jobInfo) { + public ReturnT update(XxlJobInfo jobInfo) { // valid if (!CronExpression.isValidExpression(jobInfo.getJobCron())) { @@ -323,12 +323,12 @@ public class XxlJobServiceImpl implements XxlJobService { private static final String TRIGGER_CHART_DATA_CACHE = "trigger_chart_data_cache"; @Override - public ReturnT> triggerChartDate(Date startDate, Date endDate) { + public ReturnT> chartInfo(Date startDate, Date endDate) { // get cache String cacheKey = TRIGGER_CHART_DATA_CACHE + "_" + startDate.getTime() + "_" + endDate.getTime(); - Map triggerChartDateCache = (Map) LocalCacheUtil.get(cacheKey); - if (triggerChartDateCache != null) { - return new ReturnT>(triggerChartDateCache); + Map chartInfo = (Map) LocalCacheUtil.get(cacheKey); + if (chartInfo != null) { + return new ReturnT>(chartInfo); } // process diff --git a/xxl-job-admin/src/main/webapp/static/js/index.js b/xxl-job-admin/src/main/webapp/static/js/index.js index 12c1d150..cad1c135 100644 --- a/xxl-job-admin/src/main/webapp/static/js/index.js +++ b/xxl-job-admin/src/main/webapp/static/js/index.js @@ -49,7 +49,7 @@ $(function () { function freshChartDate(startDate, endDate) { $.ajax({ type : 'POST', - url : base_url + '/triggerChartDate', + url : base_url + '/chartInfo', data : { 'startDate':startDate.format('YYYY-MM-DD HH:mm:ss'), 'endDate':endDate.format('YYYY-MM-DD HH:mm:ss') diff --git a/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js index 300627d6..dbaf734e 100644 --- a/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js +++ b/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js @@ -415,7 +415,7 @@ $(function() { }, submitHandler : function(form) { // post - $.post(base_url + "/jobinfo/reschedule", $("#updateModal .form").serialize(), function(data, status) { + $.post(base_url + "/jobinfo/update", $("#updateModal .form").serialize(), function(data, status) { if (data.code == "200") { $('#updateModal').modal('hide'); layer.open({