更新RM
This commit is contained in:
parent
7926be5bc8
commit
33f124e8c3
|
@ -3,7 +3,7 @@ package com.xxl.job.admin.controller;
|
|||
import com.xxl.job.admin.controller.annotation.PermessionLimit;
|
||||
import com.xxl.job.admin.controller.interceptor.PermissionInterceptor;
|
||||
import com.xxl.job.admin.core.util.PropertiesUtil;
|
||||
import com.xxl.job.admin.service.IXxlJobService;
|
||||
import com.xxl.job.admin.service.XxlJobService;
|
||||
import com.xxl.job.core.biz.model.ReturnT;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.stereotype.Controller;
|
||||
|
@ -25,7 +25,7 @@ import java.util.Map;
|
|||
public class IndexController {
|
||||
|
||||
@Resource
|
||||
private IXxlJobService xxlJobService;
|
||||
private XxlJobService xxlJobService;
|
||||
|
||||
@RequestMapping("/")
|
||||
public String index(Model model) {
|
||||
|
|
|
@ -5,7 +5,7 @@ import com.xxl.job.admin.core.model.XxlJobGroup;
|
|||
import com.xxl.job.admin.core.model.XxlJobInfo;
|
||||
import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
|
||||
import com.xxl.job.admin.dao.XxlJobGroupDao;
|
||||
import com.xxl.job.admin.service.IXxlJobService;
|
||||
import com.xxl.job.admin.service.XxlJobService;
|
||||
import com.xxl.job.core.biz.model.ReturnT;
|
||||
import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
|
||||
import com.xxl.job.core.glue.GlueTypeEnum;
|
||||
|
@ -30,7 +30,7 @@ public class JobInfoController {
|
|||
@Resource
|
||||
private XxlJobGroupDao xxlJobGroupDao;
|
||||
@Resource
|
||||
private IXxlJobService xxlJobService;
|
||||
private XxlJobService xxlJobService;
|
||||
|
||||
@RequestMapping
|
||||
public String index(Model model) {
|
||||
|
|
|
@ -1,34 +1,34 @@
|
|||
package com.xxl.job.admin.service;
|
||||
|
||||
|
||||
import com.xxl.job.admin.core.model.XxlJobInfo;
|
||||
import com.xxl.job.core.biz.model.ReturnT;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* core job action for xxl-job
|
||||
*
|
||||
* @author xuxueli 2016-5-28 15:30:33
|
||||
*/
|
||||
public interface IXxlJobService {
|
||||
|
||||
public Map<String, Object> pageList(int start, int length, int jobGroup, String executorHandler, String filterTime);
|
||||
|
||||
public ReturnT<String> add(XxlJobInfo jobInfo);
|
||||
|
||||
public ReturnT<String> reschedule(XxlJobInfo jobInfo);
|
||||
|
||||
public ReturnT<String> remove(int id);
|
||||
|
||||
public ReturnT<String> pause(int id);
|
||||
|
||||
public ReturnT<String> resume(int id);
|
||||
|
||||
public ReturnT<String> triggerJob(int id);
|
||||
|
||||
public Map<String,Object> dashboardInfo();
|
||||
|
||||
public ReturnT<Map<String,Object>> triggerChartDate();
|
||||
|
||||
}
|
||||
package com.xxl.job.admin.service;
|
||||
|
||||
|
||||
import com.xxl.job.admin.core.model.XxlJobInfo;
|
||||
import com.xxl.job.core.biz.model.ReturnT;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* core job action for xxl-job
|
||||
*
|
||||
* @author xuxueli 2016-5-28 15:30:33
|
||||
*/
|
||||
public interface XxlJobService {
|
||||
|
||||
public Map<String, Object> pageList(int start, int length, int jobGroup, String executorHandler, String filterTime);
|
||||
|
||||
public ReturnT<String> add(XxlJobInfo jobInfo);
|
||||
|
||||
public ReturnT<String> reschedule(XxlJobInfo jobInfo);
|
||||
|
||||
public ReturnT<String> remove(int id);
|
||||
|
||||
public ReturnT<String> pause(int id);
|
||||
|
||||
public ReturnT<String> resume(int id);
|
||||
|
||||
public ReturnT<String> triggerJob(int id);
|
||||
|
||||
public Map<String,Object> dashboardInfo();
|
||||
|
||||
public ReturnT<Map<String,Object>> triggerChartDate();
|
||||
|
||||
}
|
|
@ -9,7 +9,7 @@ import com.xxl.job.admin.dao.XxlJobGroupDao;
|
|||
import com.xxl.job.admin.dao.XxlJobInfoDao;
|
||||
import com.xxl.job.admin.dao.XxlJobLogDao;
|
||||
import com.xxl.job.admin.dao.XxlJobLogGlueDao;
|
||||
import com.xxl.job.admin.service.IXxlJobService;
|
||||
import com.xxl.job.admin.service.XxlJobService;
|
||||
import com.xxl.job.core.biz.model.ReturnT;
|
||||
import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
|
||||
import com.xxl.job.core.glue.GlueTypeEnum;
|
||||
|
@ -32,7 +32,7 @@ import java.util.*;
|
|||
* @author xuxueli 2016-5-28 15:30:33
|
||||
*/
|
||||
@Service
|
||||
public class XxlJobServiceImpl implements IXxlJobService {
|
||||
public class XxlJobServiceImpl implements XxlJobService {
|
||||
private static Logger logger = LoggerFactory.getLogger(XxlJobServiceImpl.class);
|
||||
|
||||
@Resource
|
||||
|
|
Loading…
Reference in New Issue