Browse Source

服务总线→执行计划里面的 执行周期的cron表达式的回显,在表rs_job_config增加job_cron字段

chendi 8 years ago
parent
commit
b02b24b547

+ 7 - 4
src/main/java/com/yihu/hos/datacollect/controller/DataCollectController.java

@ -155,17 +155,18 @@ public class DataCollectController extends BaseController {
    @ResponseBody
    public Result addJob(HttpServletRequest request) {
        try {
            String cron = request.getParameter("cronExpression");
            String jobDataset = request.getParameter("jobDataset");
            RsJobConfig obj = new RsJobConfig();
            BeanUtils.populate(obj, request.getParameterMap());
            obj.setValid("1");
            obj.setJobCron(cron);
            String time=request.getParameter("jobNextTime");
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            if(df.parse(time).before(new Date())) {
                return Result.error("任务开始时间不能小于当前时间");
            }
            String cron = request.getParameter("cronExpression");
            String jobDataset = request.getParameter("jobDataset");
            return datacollect.addJob(obj, cron, jobDataset);
        } catch (Exception ex) {
            ex.printStackTrace();
@ -181,7 +182,10 @@ public class DataCollectController extends BaseController {
    public Result updateJob(HttpServletRequest request) {
        try {
            String cron = request.getParameter("cronExpression");
            String jobDataset = request.getParameter("jobDataset");
            RsJobConfig obj = new RsJobConfig();
            obj.setJobCron(cron);
//            ConvertUtils.register(new DateLocaleConverter(), Date.class);
            BeanUtils.populate(obj, request.getParameterMap());
            String time=request.getParameter("jobNextTime");
@ -189,8 +193,7 @@ public class DataCollectController extends BaseController {
            if(df.parse(time).before(new Date())) {
                return Result.error("任务开始时间不能小于当前时间");
            }
            String cron = request.getParameter("cronExpression");
            String jobDataset = request.getParameter("jobDataset");
            return datacollect.updateJob(obj, cron, jobDataset);
        } catch (Exception ex) {
            ex.printStackTrace();

+ 177 - 162
src/main/java/com/yihu/hos/datacollect/model/RsJobConfig.java

@ -8,166 +8,181 @@ import java.util.Date;
public class RsJobConfig implements java.io.Serializable {
	// Fields
	private String id;
	private String jobName;
	private String jobInfo;
	private String jobType;
	private String schemeId;
	private String schemeVersion;
	private Date jobNextTime;
	private String valid;
	private String jobContent;
	private String jobContentType;
	private Date repeatStartTime;
	private Date repeatEndTime;
	private Integer delayTime;
	private Integer flowId;
	private Integer flowTempId;
	// Constructors
	/** default constructor */
	public RsJobConfig() {
	}
	public Integer getFlowTempId() {
		return flowTempId;
	}
	public void setFlowTempId(Integer flowTempId) {
		this.flowTempId = flowTempId;
	}
	public Integer getFlowId() {
		return flowId;
	}
	public void setFlowId(Integer flowId) {
		this.flowId = flowId;
	}
	public String getJobContent() {
		return jobContent;
	}
	public void setJobContent(String jobContent) {
		this.jobContent = jobContent;
	}
	public String getJobContentType() {
		return jobContentType;
	}
	public void setJobContentType(String jobContentType) {
		this.jobContentType = jobContentType;
	}
	/** minimal constructor */
	public RsJobConfig(String jobName, String valid) {
		this.jobName = jobName;
		this.valid = valid;
	}
	/** full constructor */
	public RsJobConfig(String jobName, String jobInfo, String jobType, String schemeId,String schemeVersion, String jobTimeInterval, Date jobNextTime, String valid) {
		this.jobName = jobName;
		this.jobInfo = jobInfo;
		this.jobType = jobType;
		this.schemeId = schemeId;
		this.schemeVersion = schemeVersion;
		this.jobNextTime = jobNextTime;
		this.valid = valid;
	}
	// Property accessors
	public String getId() {
		return this.id;
	}
	public void setId(String id) {
		this.id = id;
	}
	public String getJobName() {
		return this.jobName;
	}
	public void setJobName(String jobName) {
		this.jobName = jobName;
	}
	public String getJobInfo() {
		return this.jobInfo;
	}
	public void setJobInfo(String jobInfo) {
		this.jobInfo = jobInfo;
	}
	public String getJobType() {
		return this.jobType;
	}
	public void setJobType(String jobType) {
		this.jobType = jobType;
	}
	public String getSchemeId() {
		return schemeId;
	}
	public void setSchemeId(String schemeId) {
		this.schemeId = schemeId;
	}
	public String getSchemeVersion() {
		return schemeVersion;
	}
	public void setSchemeVersion(String schemeVersion) {
		this.schemeVersion = schemeVersion;
	}
	public Date getJobNextTime() {
		return this.jobNextTime;
	}
	public void setJobNextTime(Date jobNextTime) {
		this.jobNextTime = jobNextTime;
	}
	public String getValid() {
		return this.valid;
	}
	public void setValid(String valid) {
		this.valid = valid;
	}
	public Date getRepeatStartTime() {
		return repeatStartTime;
	}
	public void setRepeatStartTime(Date repeatStartTime) {
		this.repeatStartTime = repeatStartTime;
	}
	public Date getRepeatEndTime() {
		return repeatEndTime;
	}
	public void setRepeatEndTime(Date repeatEndTime) {
		this.repeatEndTime = repeatEndTime;
	}
	public Integer getDelayTime() {
		return delayTime;
	}
	public void setDelayTime(Integer delayTime) {
		this.delayTime = delayTime;
	}
    // Fields
    private String id;
    private String jobName;
    private String jobInfo;
    private String jobType;
    private String schemeId;
    private String schemeVersion;
    private Date jobNextTime;
    private String valid;
    private String jobContent;
    private String jobContentType;
    private Date repeatStartTime;
    private Date repeatEndTime;
    private Integer delayTime;
    private Integer flowId;
    private Integer flowTempId;
    private String jobCron;
    // Constructors
    /**
     * default constructor
     */
    public RsJobConfig() {
    }
    /**
     * minimal constructor
     */
    public RsJobConfig(String jobName, String valid) {
        this.jobName = jobName;
        this.valid = valid;
    }
    /**
     * full constructor
     */
    public RsJobConfig(String jobName, String jobInfo, String jobType, String schemeId, String schemeVersion, String jobTimeInterval, Date jobNextTime, String valid) {
        this.jobName = jobName;
        this.jobInfo = jobInfo;
        this.jobType = jobType;
        this.schemeId = schemeId;
        this.schemeVersion = schemeVersion;
        this.jobNextTime = jobNextTime;
        this.valid = valid;
    }
    public Integer getFlowTempId() {
        return flowTempId;
    }
    public void setFlowTempId(Integer flowTempId) {
        this.flowTempId = flowTempId;
    }
    public Integer getFlowId() {
        return flowId;
    }
    public void setFlowId(Integer flowId) {
        this.flowId = flowId;
    }
    public String getJobContent() {
        return jobContent;
    }
    public void setJobContent(String jobContent) {
        this.jobContent = jobContent;
    }
    public String getJobContentType() {
        return jobContentType;
    }
    public void setJobContentType(String jobContentType) {
        this.jobContentType = jobContentType;
    }
    // Property accessors
    public String getId() {
        return this.id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getJobName() {
        return this.jobName;
    }
    public void setJobName(String jobName) {
        this.jobName = jobName;
    }
    public String getJobInfo() {
        return this.jobInfo;
    }
    public void setJobInfo(String jobInfo) {
        this.jobInfo = jobInfo;
    }
    public String getJobType() {
        return this.jobType;
    }
    public void setJobType(String jobType) {
        this.jobType = jobType;
    }
    public String getSchemeId() {
        return schemeId;
    }
    public void setSchemeId(String schemeId) {
        this.schemeId = schemeId;
    }
    public String getSchemeVersion() {
        return schemeVersion;
    }
    public void setSchemeVersion(String schemeVersion) {
        this.schemeVersion = schemeVersion;
    }
    public Date getJobNextTime() {
        return this.jobNextTime;
    }
    public void setJobNextTime(Date jobNextTime) {
        this.jobNextTime = jobNextTime;
    }
    public String getValid() {
        return this.valid;
    }
    public void setValid(String valid) {
        this.valid = valid;
    }
    public Date getRepeatStartTime() {
        return repeatStartTime;
    }
    public void setRepeatStartTime(Date repeatStartTime) {
        this.repeatStartTime = repeatStartTime;
    }
    public Date getRepeatEndTime() {
        return repeatEndTime;
    }
    public void setRepeatEndTime(Date repeatEndTime) {
        this.repeatEndTime = repeatEndTime;
    }
    public Integer getDelayTime() {
        return delayTime;
    }
    public void setDelayTime(Integer delayTime) {
        this.delayTime = delayTime;
    }
    public String getJobCron() {
        return jobCron;
    }
    public void setJobCron(String jobCron) {
        this.jobCron = jobCron;
    }
}

+ 5 - 0
src/main/resources/resource/RsJobConfig.hbm.xml

@ -81,5 +81,10 @@
                <comment>流程模板ID</comment>
            </column>
        </property>
        <property name="jobCron" type="java.lang.String">
            <column name="job_cron" length="50">
                <comment>执行周期cron表达式</comment>
            </column>
        </property>
    </class>
</hibernate-mapping>

+ 4 - 4
src/main/webapp/WEB-INF/ehr/jsp/datacollect/editorJobJs.jsp

@ -355,7 +355,8 @@
                    jobNextTime: '${model.jobNextTime}',
                    repeatStartTime:'${model.repeatStartTime}',
                    repeatEndTime:'${model.repeatEndTime}',
                    delayTime:'${model.delayTime}'
                    delayTime:'${model.delayTime}',
                    jobCron:'${model.jobCron}'
                };
                $('#txtId').val(model.id);
@ -396,8 +397,7 @@
                }
                $('#txtSchemeId').val(model.schemeId);
                $('#txtSchemeVersion').val(model.schemeVersion);
                $('#txtCronExpression').val(model.cronExpression);
                $('#txtCronExpression').val(model.jobCron);
                $('#txtValid').val(model.valid);
                $("#dateNextTime").ligerDateEditor('setValue',model.jobNextTime);
@ -435,6 +435,7 @@
                repeatStartTime: $("#repeatStartTime").ligerDateEditor('getValue'),
                repeatEndTime: $("#repeatEndTime").ligerDateEditor('getValue'),
                delayTime: $('#txtDelayTime').val(),
                jobCron:$('#txtCronExpression').val()
            };
            return model;
@ -831,7 +832,6 @@
            var data = me.getData();
            //按钮失效
            $("a[href='#finish']").unbind("click");
            $.ajax({ //ajax处理
                type: "POST",
                url : me.actionUrl,