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

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

@@ -28,8 +28,6 @@ public class TaskCtl {
 	private TaskService taskService;
 	@Autowired
 	private TaskSqlService taskSqlService;
-	@Autowired
-	private TaskRun runService;
 
 	@RequestMapping("run/{code}")
 	@ResponseBody
@@ -46,9 +44,8 @@ public class TaskCtl {
 			int res = -1;
 			try {
 				if (taskSqlService instanceof TaskRun) {
-					((TaskRun) taskSqlService).runTask(task, condition);
+					res = ((TaskRun) taskSqlService).runTask(task, condition);
 				}
-				res = runService.runTask(task, condition);
 			} catch (Exception e) {
 				e.printStackTrace();
 				result.setSuccess(false);
@@ -63,23 +60,24 @@ public class TaskCtl {
 		result.setSuccess(false);
 		return result;
 	}
-	
+
 	/**
 	 * 主画面
+	 * 
 	 * @return
 	 */
 	@RequestMapping("main")
 	public String main() {
 		return "rwgl/task/task";
 	}
-	
+
 	/**
-     * 初始化页面加载数据
-     */
+	 * 初始化页面加载数据
+	 */
 	@RequestMapping("initTask")
 	@ResponseBody
-    public PageInfo<TaskBean> initTask(Model model,TaskVo vo) {
-    	// 初始化参数
+	public PageInfo<TaskBean> initTask(Model model, TaskVo vo) {
+		// 初始化参数
 		if (vo.getPage() < 1) {
 			vo.setPage(1);
 		}
@@ -89,20 +87,21 @@ public class TaskCtl {
 		PageHelper.startPage(vo.getPage(), vo.getRows());
 		List<TaskBean> list = taskService.selectAll();
 		PageInfo<TaskBean> pageResult = new PageInfo<>(list);
-    	return pageResult;
-    }
-	
+		return pageResult;
+	}
+
 	/**
 	 * 保存实体
+	 * 
 	 * @param vo
 	 * @return
 	 */
 	@RequestMapping("save")
 	@ResponseBody
-	public TaskBean saveTask(Model model,TaskVo vo) {
+	public TaskBean saveTask(Model model, TaskVo vo) {
 		TaskBean saveBean = new TaskBean();
 		// 新增
-		if(StringUtils.isNullOrEmpty(vo.getId())) {
+		if (StringUtils.isNullOrEmpty(vo.getId())) {
 			BeanUtils.copyProperties(vo, saveBean);
 			saveBean.setId(CommonUtil.getUUID());
 			taskService.insert(saveBean);
@@ -119,25 +118,24 @@ public class TaskCtl {
 		}
 		return saveBean;
 	}
-	
+
 	/**
-     * 初始化页面加载数据
-     */
+	 * 初始化页面加载数据
+	 */
 	@RequestMapping("initEditTask")
 	@ResponseBody
-    public TaskBean initEditTask(Model model, String id) {
+	public TaskBean initEditTask(Model model, String id) {
 		TaskBean bean = taskService.selectByPrimaryKey(id);
-    	return bean;
-    }
-	
+		return bean;
+	}
+
 	/**
-     * 删除数据
-     */
+	 * 删除数据
+	 */
 	@RequestMapping("delTask")
 	@ResponseBody
-    public int delTask(Model model, String ids) {
+	public int delTask(Model model, String ids) {
 		int cnt = taskService.deleteByPrimaryKey(ids);
-    	return cnt;
-    }
+		return cnt;
+	}
 }
-