git-svn-id: https://192.168.57.71/svn/jsgkj@469 931142cf-59ea-a443-aa0e-51397b428577

xtdsp/trunk/src/main/java/com/xt/dsp/controller/JobCtl.java

@@ -23,7 +23,7 @@ import com.yuanxd.tools.pagehelper.PageInfo;
 
 @Controller
 @RequestMapping("job")
-public class JobCtl extends BaseAction{
+public class JobCtl extends BaseAction {
 	@Autowired
 	private JobService jobService;
 
@@ -33,23 +33,24 @@ public class JobCtl extends BaseAction{
 		JobBean job = jobService.selectByCode(code);
 		return jobService.rescheduleJob(job);
 	}
-	
+
 	/**
 	 * 主画面
+	 * 
 	 * @return
 	 */
 	@RequestMapping("main")
 	public String main() {
 		return "rwgl/job/job";
 	}
-	
+
 	/**
-     * 初始化页面加载数据
-     */
+	 * 初始化页面加载数据
+	 */
 	@RequestMapping("initJob")
 	@ResponseBody
-    public PageInfo<JobBean> initJob(Model model,JobVo vo) {
-    	// 初始化参数
+	public PageInfo<JobBean> initJob(Model model, JobVo vo) {
+		// 初始化参数
 		if (vo.getPage() < 1) {
 			vo.setPage(1);
 		}
@@ -59,26 +60,27 @@ public class JobCtl extends BaseAction{
 		PageHelper.startPage(vo.getPage(), vo.getRows());
 		List<JobBean> list = jobService.queryAllJob();
 		PageInfo<JobBean> pageResult = new PageInfo<>(list);
-    	return pageResult;
-    }
-	
+		return pageResult;
+	}
+
 	/**
 	 * 保存实体
+	 * 
 	 * @param vo
 	 * @return
 	 */
 	@RequestMapping("save")
 	@ResponseBody
-	public JobBean saveJob(Model model,JobVo vo) {
+	public JobBean saveJob(Model model, JobVo vo) {
 		JobBean saveBean = new JobBean();
 		// 新增
-		if(StringUtils.isNullOrEmpty(vo.getId())) {
+		if (StringUtils.isNullOrEmpty(vo.getId())) {
 			BeanUtils.copyProperties(vo, saveBean);
 			saveBean.setId(CommonUtil.getUUID());
 			saveBean.setCreateTime(new Date());
 			saveBean.setStartTime(DateUtil.format(vo.getStartTime(), DateUtil.DATE_SECOND_FMT));
 			saveBean.setEndTime(DateUtil.format(vo.getEndTime(), DateUtil.DATE_SECOND_FMT));
-			//saveBean.setStatus("0");
+			// saveBean.setStatus("0");
 		} else {
 			// 修改
 			saveBean = jobService.findOne(vo.getId());
@@ -95,78 +97,78 @@ public class JobCtl extends BaseAction{
 		jobService.save(saveBean);
 		return saveBean;
 	}
-	
+
 	/**
-     * 初始化页面加载数据
-     */
+	 * 初始化页面加载数据
+	 */
 	@RequestMapping("initEditJob")
 	@ResponseBody
-    public JobBean initEditJob(Model model, String id) {
+	public JobBean initEditJob(Model model, String id) {
 		JobBean bean = jobService.findOne(id);
-    	return bean;
-    }
-	
+		return bean;
+	}
+
 	/**
-     * 删除数据
-     */
+	 * 删除数据
+	 */
 	@RequestMapping("delJob")
 	@ResponseBody
-    public JobBean delJob(Model model, String ids) {
+	public JobBean delJob(Model model, String ids) {
 		JobBean bean = jobService.findOne(ids);
-    	return bean;
-    }
-	
+		return bean;
+	}
+
 	/**
-     * 启用数据
-     */
+	 * 启用数据
+	 */
 	@RequestMapping("enableJob")
 	@ResponseBody
-    public JobBean enableJob(Model model, String ids) {
+	public JobBean enableJob(Model model, String ids) {
 		JobBean bean = jobService.findOne(ids);
-		jobService.rescheduleJob(bean);
-    	return bean;
-    }
-	
+		jobService.addJob(bean);
+		return bean;
+	}
+
 	/**
-     * 停止数据
-     */
+	 * 停止数据
+	 */
 	@RequestMapping("stopJob")
 	@ResponseBody
-    public JobBean stopJob(Model model, String ids) {
+	public JobBean stopJob(Model model, String ids) {
 		JobBean bean = jobService.findOne(ids);
-//		jobService.rescheduleJob(bean);
-    	return bean;
-    }
-	
+		jobService.deleteJob(bean);
+		return bean;
+	}
+
 	/**
-     * 暂停数据
-     */
+	 * 暂停数据
+	 */
 	@RequestMapping("pauseJob")
 	@ResponseBody
-    public JobBean pauseJob(Model model, String ids) {
+	public JobBean pauseJob(Model model, String ids) {
 		JobBean bean = jobService.findOne(ids);
 		jobService.pauseJob(bean);
-    	return bean;
-    }
-	
+		return bean;
+	}
+
 	/**
-     * 恢复数据
-     */
+	 * 恢复数据
+	 */
 	@RequestMapping("renewJob")
 	@ResponseBody
-    public JobBean renewJob(Model model, String ids) {
+	public JobBean renewJob(Model model, String ids) {
 		JobBean bean = jobService.findOne(ids);
 		jobService.resumeJob(bean);
-    	return bean;
-    }
-	
+		return bean;
+	}
+
 	/**
-     * 获取工作下拉数据
-     */
+	 * 获取工作下拉数据
+	 */
 	@RequestMapping("getJobForDdl")
 	@ResponseBody
-    public List<JobBean> getJobForDdl(Model model) {
+	public List<JobBean> getJobForDdl(Model model) {
 		List<JobBean> list = jobService.queryAllJob();
-    	return list;
-    }
+		return list;
+	}
 }