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

xtdsp/trunk/src/main/java/com/xt/dsp/common/BaseAction.java

@@ -0,0 +1,66 @@
+package com.xt.dsp.common;
+
+import java.util.Map;
+
+/**
+ * 系统基础Action
+ *
+ * @author 
+ *
+ * @param <T>
+ */
+public class BaseAction {
+
+    /**
+     * json返回值
+     */
+    protected String jsonResult;
+
+    /**
+     * json返回值
+     */
+    protected Map<String, Object> jsonMap;
+
+    /**
+     * 获取json返回值
+     *
+     * @return jsonMap json返回值
+     */
+    public Map<String, Object> getJsonMap() {
+
+        return this.jsonMap;
+    }
+
+    /**
+     * 获取json返回值
+     *
+     * @return jsonResult json返回值
+     */
+    public String getJsonResult() {
+
+        return this.jsonResult;
+    }
+
+    /**
+     * 设置json返回值
+     *
+     * @param jsonMap
+     *            json返回值
+     */
+    public void setJsonMap(Map<String, Object> jsonMap) {
+
+        this.jsonMap = jsonMap;
+    }
+
+    /**
+     * 设置json返回值
+     *
+     * @param jsonResult
+     *            json返回值
+     */
+    public void setJsonResult(String jsonResult) {
+
+        this.jsonResult = jsonResult;
+    }
+
+}

xtdsp/trunk/src/main/java/com/xt/dsp/common/BaseVo.java

@@ -0,0 +1,20 @@
+package com.xt.dsp.common;
+
+public class BaseVo{
+	/** 当前页码 */
+	private Integer page;
+	/** 每页行数 */
+	private Integer rows;
+	public Integer getPage() {
+		return page;
+	}
+	public void setPage(Integer page) {
+		this.page = page;
+	}
+	public Integer getRows() {
+		return rows;
+	}
+	public void setRows(Integer rows) {
+		this.rows = rows;
+	}
+}

xtdsp/trunk/src/main/java/com/xt/dsp/common/util/CommonUtil.java

@@ -0,0 +1,17 @@
+package com.xt.dsp.common.util;
+
+import java.util.UUID;
+
+public class CommonUtil {
+	
+	/**
+	 * 生成UUID
+	 * @return uuid
+	 */
+	public static String getUUID() {
+		UUID uuid = UUID.randomUUID();
+		return uuid.toString();
+	}
+
+
+}

xtdsp/trunk/src/main/java/com/xt/dsp/common/util/DateUtil.java

@@ -0,0 +1,183 @@
+package com.xt.dsp.common.util;
+
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateUtil {
+
+	public final static  int DAY_MILLISECOND = 86400000;
+	private final static SimpleDateFormat sdf = new SimpleDateFormat();// 定义格式，不显示毫秒
+
+	public final static String DATE_DAY_FMT = "yyyy-MM-dd";
+	public final static String DATE_HOUR_FMT = "yyyy-MM-dd HH:00:00";
+	public final static String DATE_MIN_FMT = "yyyy-MM-dd HH:mm:00";
+	public final static String DATE_SECOND_FMT = "yyyy-MM-dd HH:mm:ss";
+    public final static String DATE_TIME = "yyyyMMddHHmmss";
+    public final static String DATE_TIME_m = "yyyyMMddHHmm";
+    public final static String DATE_TIME_h = "yyyyMMddHH";
+	public final static String WEEK = "EEEE";
+
+	/**
+	 * 将Date类型转换为字符串
+	 *
+	 * @param date
+	 *            日期类型
+	 * @return 日期字符串
+	 */
+	public static String format(Date date) {
+		return format(date, "yyyy-MM-dd HH:mm:ss");
+	}
+
+	/**
+	 * 将Date类型转换为字符串
+	 *
+	 * @param date
+	 *            日期类型
+	 * @param pattern
+	 *            字符串格式
+	 * @return 日期字符串
+	 */
+	public static String format(Date date, String pattern) {
+		if (date == null) {
+			return "null";
+		}
+		if (pattern == null || pattern.equals("") || pattern.equals("null")) {
+			pattern = "yyyy-MM-dd HH:mm:ss";
+		}
+		return new SimpleDateFormat(pattern).format(date);
+	}
+
+	/**
+	 * 将字符串转换为Date类型
+	 *
+	 * @param date
+	 *            字符串类型
+	 * @return 日期类型
+	 */
+	public static Date format(String date) {
+		return format(date, null);
+	}
+
+	/**
+	 * 将字符串转换为Date类型
+	 *
+	 * @param date
+	 *            字符串类型
+	 * @param pattern
+	 *            格式
+	 * @return 日期类型
+	 */
+	public static Date format(String date, String pattern) {
+		if (pattern == null || pattern.equals("") || pattern.equals("null")) {
+			pattern = "yyyy-MM-dd HH:mm:ss";
+		}
+		if (date == null || date.equals("") || date.equals("null")) {
+			return new Date();
+		}
+		Date d = null;
+		try {
+			d = new SimpleDateFormat(pattern).parse(date);
+		} catch (ParseException pe) {
+		}
+		return d;
+	}
+
+
+
+	/**
+	 * 传入的参数格式为： yyyy-MM-dd HH:mm:ss
+	 *
+	 * @category 字母 日期或时间元素 表示 示例 <br/>
+	 *           G Era 标志符 Text AD <br/>
+	 *           y 年 Year 1996; 96 <br/>
+	 *           M 年中的月份 Month July; Jul; 07 <br/>
+	 *           w 年中的周数 Number 27 <br/>
+	 *           W 月份中的周数 Number 2 <br/>
+	 *           D 年中的天数 Number 189 <br/>
+	 *           d 月份中的天数 Number 10 <br/>
+	 *           F 月份中的星期 Number 2 <br/>
+	 *           E 星期中的天数 Text Tuesday; Tue <br/>
+	 *           a Am/pm 标记 Text PM <br/>
+	 *           H 一天中的小时数（0-23） Number 0 <br/>
+	 *           k 一天中的小时数（1-24） Number 24 <br/>
+	 *           K am/pm 中的小时数（0-11） Number 0 <br/>
+	 *           h am/pm 中的小时数（1-12） Number 12 <br/>
+	 *           m 小时中的分钟数 Number 30 <br/>
+	 *           s 分钟中的秒数 Number 55 <br/>
+	 *           S 毫秒数 Number 978 <br/>
+	 *           z 时区 General time zone Pacific Standard Time; PST; GMT-08:00 <br/>
+	 *           Z 时区 RFC 822 time zone -0800 <br/>
+	 *
+	 * @param date
+	 * @return Timestamp
+	 */
+	public static Timestamp str2Timestamp(String date) {
+		Timestamp returnt = Timestamp.valueOf(date);
+		return returnt;
+	}
+
+	/**
+	 * Timestamp转换为String形式输出
+	 *
+	 * @param timestamp
+	 * @param dfm
+	 * @return String
+	 * 转字符串的时候如果传入的参数dformat为null，则默认以yyyy-MM-dd
+	 *           HH:mm:ss格式转换。否则按传入格式转。
+	 *
+	 */
+	public static String timestamp2Str(Timestamp timestamp, String dfm) {
+		String returnstr = "";
+		if (dfm == null) {
+			sdf.applyPattern(DATE_SECOND_FMT);
+		} else {
+			sdf.applyPattern(dfm);
+		}
+		returnstr = sdf.format(timestamp);
+		return returnstr;
+	}
+
+	/**
+	 * Date 转为 String形式输出
+	 *
+	 * @param date
+	 * @param dfm
+	 * @return String
+	 *  转字符串的时候如果传入的参数dformat为null，则默认以yyyy-MM-dd
+	 *           HH:mm:ss格式转换。否则按传入格式转。
+	 */
+	public static String date2Str(Date date, String dfm) {
+		if (dfm == null) {
+			sdf.applyPattern(DATE_SECOND_FMT);
+		} else {
+			sdf.applyPattern(dfm);
+		}
+		String returnstr = sdf.format(date);
+		return returnstr;
+	}
+
+	/**
+	 * 字符串转Date
+	 * @param date
+	 * @param fmt
+	 * @return
+	 */
+	public static Date str2Date(String date, String fmt) {
+
+		if (fmt == null) {
+			sdf.applyPattern(DATE_SECOND_FMT);
+		} else {
+			sdf.applyPattern(fmt);
+		}
+		try {
+			return sdf.parse(date);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+
+}

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

@@ -0,0 +1,19 @@
+package com.xt.dsp.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("datasource")
+public class DatasourceCtl {
+
+	/**
+	 * 主画面
+	 * @return
+	 */
+	@RequestMapping("main")
+	public String main() {
+		//DataSourceBean bean = new DataSourceBean();
+		return "rwgl/datasource/datasource";
+	}
+}

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

@@ -1,24 +1,163 @@
 package com.xt.dsp.controller;
 
+import java.util.Date;
+import java.util.List;
+
+import org.h2.util.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.xt.dsp.common.BaseAction;
+import com.xt.dsp.common.util.CommonUtil;
+import com.xt.dsp.common.util.DateUtil;
 import com.xt.dsp.model.JobBean;
 import com.xt.dsp.service.JobService;
+import com.xt.dsp.vo.JobVo;
+import com.yuanxd.tools.pagehelper.PageHelper;
+import com.yuanxd.tools.pagehelper.PageInfo;
 
 @Controller
 @RequestMapping("job")
-public class JobCtl {
+public class JobCtl extends BaseAction{
 	@Autowired
 	private JobService jobService;
 
 	@RequestMapping("reschedule/{code}")
 	@ResponseBody
 	public int rescheduleJob(@PathVariable String code) {
-		JobBean job = jobService.selectByCode(code);
-		return jobService.rescheduleJob(job);
+//		JobBean job = jobService.selectByCode(code);
+//		return jobService.rescheduleJob(job);
+		return 1;
+	}
+	
+	/**
+	 * 主画面
+	 * @return
+	 */
+	@RequestMapping("main")
+	public String main() {
+		return "rwgl/job/job";
+	}
+	
+	/**
+     * 初始化页面加载数据
+     */
+	@RequestMapping("initJob")
+	@ResponseBody
+    public PageInfo<JobBean> initJob(Model model,JobVo vo) {
+    	// 初始化参数
+		if (vo.getPage() < 1) {
+			vo.setPage(1);
+		}
+		if (vo.getRows() < 1) {
+			vo.setRows(1);
+		}
+		PageHelper.startPage(vo.getPage(), vo.getRows());
+		List<JobBean> list = jobService.queryAllJob();
+		PageInfo<JobBean> pageResult = new PageInfo<>(list);
+    	return pageResult;
+    }
+	
+	/**
+	 * 保存实体
+	 * @param vo
+	 * @return
+	 */
+	@RequestMapping("save")
+	@ResponseBody
+	public JobBean saveJob(Model model,JobVo vo) {
+		JobBean saveBean = new JobBean();
+		// 新增
+		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");
+		} else {
+			// 修改
+			saveBean = jobService.findOne(vo.getId());
+			saveBean.setName(vo.getName());
+			saveBean.setCode(vo.getCode());
+			saveBean.setStartTime(DateUtil.format(vo.getStartTime(), DateUtil.DATE_SECOND_FMT));
+			saveBean.setEndTime(DateUtil.format(vo.getEndTime(), DateUtil.DATE_SECOND_FMT));
+			saveBean.setCircle(vo.getCircle());
+			saveBean.setParam(vo.getParam());
+			saveBean.setInterval(vo.getInterval());
+			saveBean.setResult(vo.getResult());
+			saveBean.setCronExpression(vo.getCronExpression());
+		}
+		jobService.save(saveBean);
+		return saveBean;
 	}
+	
+	/**
+     * 初始化页面加载数据
+     */
+	@RequestMapping("initEditJob")
+	@ResponseBody
+    public JobBean initEditJob(Model model, String id) {
+		JobBean bean = jobService.findOne(id);
+    	return bean;
+    }
+	
+	/**
+     * 删除数据
+     */
+	@RequestMapping("delJob")
+	@ResponseBody
+    public JobBean delJob(Model model, String ids) {
+		JobBean bean = jobService.findOne(ids);
+    	return bean;
+    }
+	
+	/**
+     * 启用数据
+     */
+	@RequestMapping("enableJob")
+	@ResponseBody
+    public JobBean enableJob(Model model, String ids) {
+		JobBean bean = jobService.findOne(ids);
+		jobService.rescheduleJob(bean);
+    	return bean;
+    }
+	
+	/**
+     * 停止数据
+     */
+	@RequestMapping("stopJob")
+	@ResponseBody
+    public JobBean stopJob(Model model, String ids) {
+		JobBean bean = jobService.findOne(ids);
+//		jobService.rescheduleJob(bean);
+    	return bean;
+    }
+	
+	/**
+     * 暂停数据
+     */
+	@RequestMapping("pauseJob")
+	@ResponseBody
+    public JobBean pauseJob(Model model, String ids) {
+		JobBean bean = jobService.findOne(ids);
+		jobService.pauseJob(bean);
+    	return bean;
+    }
+	
+	/**
+     * 恢复数据
+     */
+	@RequestMapping("renewJob")
+	@ResponseBody
+    public JobBean renewJob(Model model, String ids) {
+		JobBean bean = jobService.findOne(ids);
+		jobService.resumeJob(bean);
+    	return bean;
+    }
 }

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

@@ -1,51 +1,84 @@
 package com.xt.dsp.controller;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.xt.dsp.model.TaskBean;
-import com.xt.dsp.service.TaskService;
-import com.xt.dsp.service.TaskSqlService;
 import com.yuanxd.tools.io.http.JsonResult;
 
 @Controller
 @RequestMapping("task")
 public class TaskCtl {
-	@Autowired
-	private TaskService taskService;
-	@Autowired
-	private TaskSqlService taskSqlService;
+//	@Autowired
+//	private TaskService taskService;
+//	@Autowired
+//	private TaskSqlService taskSqlService;
 
 	@RequestMapping("run/{code}")
 	@ResponseBody
 	public JsonResult runTask(@PathVariable String code, String condition) {
-		TaskBean task = taskService.selectByCode(code);
+//		TaskBean task = taskService.selectByCode(code);
 		JsonResult result = new JsonResult();
-		if (task == null) {
-			result.setSuccess(false);
-			result.setMessage("任务不存在：" + code);
-			return result;
-		}
-
-		if (TaskBean.TYPE_SQL.equals(task.getType())) {
-			int res = -1;
-			try {
-				res = taskSqlService.runTask(task, condition);
-			} catch (Exception e) {
-				e.printStackTrace();
-				result.setSuccess(false);
-				result.setMessage(e.getMessage());
-				return result;
-			}
-			if (res == 0) {
-				result.setSuccess(true);
-				return result;
-			}
-		}
+//		if (task == null) {
+//			result.setSuccess(false);
+//			result.setMessage("任务不存在：" + code);
+//			return result;
+//		}
+//
+//		if (TaskBean.TYPE_SQL.equals(task.getType())) {
+//			int res = -1;
+//			try {
+//				res = taskSqlService.runTask(task, condition);
+//			} catch (Exception e) {
+//				e.printStackTrace();
+//				result.setSuccess(false);
+//				result.setMessage(e.getMessage());
+//				return result;
+//			}
+//			if (res == 0) {
+//				result.setSuccess(true);
+//				return result;
+//			}
+//		}
 		result.setSuccess(false);
 		return result;
 	}
+	
+	/**
+	 * 主画面
+	 * @return
+	 */
+	@RequestMapping("main")
+	public String main() {
+		return "rwgl/task/task";
+	}
+	
+
+    /**
+     * 初始化页面加载数据
+     */
+    public String initTask() {
+        /*String wldwCode = getReqStr("wldwCode");
+        String wldwName = getReqStr("wldwName");
+        String dataFlg = getReqStr("dataFlg");
+        if (wldwdyForm == null) {
+            wldwdyForm = new WldwdyForm();
+        }
+        Map<String, String> mapParam = new HashMap<String, String>();
+        mapParam.put("wldwCode", wldwCode.trim());
+        mapParam.put("wldwName", wldwName.trim());
+        if (!StringUtil.isBlank(dataFlg)) {
+            mapParam.put("dataFlg", "Y");
+            mapParam.put("statusFlg", DictionaryConst.Status.ADD);
+            mapParam.put("cFlg", DictionaryConst.CancelFlag.NO);
+        }
+        // 获取带分页信息的数据
+        PageList<WldwdyBean> dataList = wldwdyService.queryByConditions(wldwdyForm, mapParam);
+        // 生成分页数据
+        createPagingJsonResult(dataList);
+
+        return PAGING;*/
+    	return "";
+    }
 }

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

@@ -0,0 +1,18 @@
+package com.xt.dsp.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("tasksql")
+public class TaskSqlCtl {
+
+	/**
+	 * 主画面
+	 * @return
+	 */
+	@RequestMapping("main")
+	public String main() {
+		return "rwgl/tasksql/tasksql";
+	}
+}

xtdsp/trunk/src/main/java/com/xt/dsp/vo/DataSourceVo.java

@@ -0,0 +1,7 @@
+package com.xt.dsp.vo;
+
+import com.xt.dsp.common.BaseVo;
+
+public class DataSourceVo extends BaseVo{
+	
+}

xtdsp/trunk/src/main/java/com/xt/dsp/vo/JobVo.java

@@ -0,0 +1,91 @@
+package com.xt.dsp.vo;
+
+import com.xt.dsp.common.BaseVo;
+
+public class JobVo extends BaseVo{
+	private String id;
+	private String name;
+	private String createTime;
+	private String startTime;
+	private String endTime;
+	private String circle;
+	private String result;
+	private Short interval;
+	private String status;
+	private String param;
+	private String cronExpression;
+	private String code;
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+	public String getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+	public String getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+	public String getCircle() {
+		return circle;
+	}
+	public void setCircle(String circle) {
+		this.circle = circle;
+	}
+	public String getResult() {
+		return result;
+	}
+	public void setResult(String result) {
+		this.result = result;
+	}
+	public Short getInterval() {
+		return interval;
+	}
+	public void setInterval(Short interval) {
+		this.interval = interval;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	public String getParam() {
+		return param;
+	}
+	public void setParam(String param) {
+		this.param = param;
+	}
+	public String getCronExpression() {
+		return cronExpression;
+	}
+	public void setCronExpression(String cronExpression) {
+		this.cronExpression = cronExpression;
+	}
+	public String getCode() {
+		return code;
+	}
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+}

xtdsp/trunk/src/main/java/com/xt/dsp/vo/TaskSqlVo.java

@@ -0,0 +1,7 @@
+package com.xt.dsp.vo;
+
+import com.xt.dsp.common.BaseVo;
+
+public class TaskSqlVo extends BaseVo{
+	
+}

xtdsp/trunk/src/main/java/com/xt/dsp/vo/TaskVo.java

@@ -0,0 +1,7 @@
+package com.xt.dsp.vo;
+
+import com.xt.dsp.common.BaseVo;
+
+public class TaskVo extends BaseVo{
+	
+}