新增执行策略

2018-07-20 17:21:43 +08:00
parent 509f17018a
commit 9a64a3ba4c
10 changed files with 137 additions and 22 deletions
--- a/src/main/resources/mybatis/monitor/JobMapper.xml
+++ b/src/main/resources/mybatis/monitor/JobMapper.xml
@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="methodName"     column="method_name"     />
 		<result property="methodParams"   column="method_params"   />
 		<result property="cronExpression" column="cron_expression" />
+		<result property="misfirePolicy"  column="misfire_policy"  />
 		<result property="status"         column="status"          />
 		<result property="createBy"       column="create_by"       />
 		<result property="createTime"     column="create_time"     />
@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectJobVo">
-        select job_id, job_name, job_group, method_name, method_params, cron_expression, status, create_by, create_time, remark from sys_job
+        select job_id, job_name, job_group, method_name, method_params, cron_expression, misfire_policy, status, create_by, create_time, remark from sys_job
    </sql>
 	
 	<select id="selectJobList" parameterType="Job" resultMap="JobResult">
@ -66,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="methodName != null and methodName != ''">method_name = #{methodName},</if>
 			<if test="methodParams != null and methodParams != ''">method_params = #{methodParams},</if>
 			<if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if>
+ 			<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy = #{misfirePolicy},</if>
 			<if test="status !=null">status = #{status},</if>
 			<if test="remark != null and remark != ''">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
@ -83,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="methodName != null and methodName != ''">method_name,</if>
 			<if test="methodParams != null and methodParams != ''">method_params,</if>
 			<if test="cronExpression != null and cronExpression != ''">cron_expression,</if>
+ 			<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy,</if>
 			<if test="status != null and status != ''">status,</if>
 			<if test="remark != null and remark != ''">remark,</if>
 			<if test="createBy != null and createBy != ''">create_by,</if>
@ -94,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="methodName != null and methodName != ''">#{methodName},</if>
 			<if test="methodParams != null and methodParams != ''">#{method_params},</if>
 			<if test="cronExpression != null and cronExpression != ''">#{cronExpression},</if>
+ 			<if test="misfirePolicy != null and misfirePolicy != ''">#{misfirePolicy},</if>
 			<if test="status != null and status != ''">#{status},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
--- a/src/main/resources/templates/monitor/job/add.html
+++ b/src/main/resources/templates/monitor/job/add.html
@ -2,6 +2,7 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
+<link href="/ajax/libs/iCheck/custom.css" th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>
 <body class="white-bg">
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 		<form class="form-horizontal m" id="form-job-add">
@ -26,7 +27,7 @@
 			<div class="form-group">
 				<label class="col-sm-3 control-label ">方法参数：</label>
 				<div class="col-sm-8">
-					<input class="form-control" type="text" name="params" id="params"/>
+					<input class="form-control" type="text" name="methodParams" id="methodParams"/>
 				</div>
 			</div>
 			<div class="form-group">
@ -35,6 +36,14 @@
 					<input class="form-control" type="text" name="cronExpression" id="cronExpression"/>
 				</div>
 			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">执行策略：</label>
+				<div class="col-sm-8">
+					<label class="checkbox-inline i-checks"> <input type="radio" name="misfirePolicy" value="1" /> 继续执行 </label> 
+					<label class="checkbox-inline i-checks"> <input type="radio" name="misfirePolicy" value="2" /> 一次执行 </label> 
+					<label class="checkbox-inline i-checks"> <input type="radio" name="misfirePolicy" value="3" /> 放弃执行 </label>
+				</div>
+			</div>
 			<div class="form-group">
 				<label class="col-sm-3 control-label">状态：</label>
 				<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_job_status')}">
@ -59,6 +68,7 @@
 		</form>
 	</div>
 	<div th:include="include::footer"></div>
+	<script th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
 	<script type="text/javascript">
 		var prefix = ctx + "monitor/job"
 	
--- a/src/main/resources/templates/monitor/job/edit.html
+++ b/src/main/resources/templates/monitor/job/edit.html
@ -2,6 +2,7 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
+<link href="/ajax/libs/iCheck/custom.css" th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>
 <body class="white-bg">
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 		<form class="form-horizontal m" id="form-job-edit" th:object="${job}">
@ -27,7 +28,7 @@
 			<div class="form-group">
 				<label class="col-sm-3 control-label ">方法参数：</label>
 				<div class="col-sm-8">
-					<input class="form-control" type="text" name="params" id="params" th:field="*{params}"/>
+					<input class="form-control" type="text" name="methodParams" id="methodParams" th:field="*{methodParams}"/>
 				</div>
 			</div>
 			<div class="form-group">
@ -36,6 +37,14 @@
 					<input class="form-control" type="text" name="cronExpression" id="cronExpression" th:field="*{cronExpression}"/>
 				</div>
 			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">执行策略：</label>
+				<div class="col-sm-8">
+					<label class="checkbox-inline i-checks"> <input type="radio" th:field="*{misfirePolicy}" name="misfirePolicy" value="1" /> 继续执行 </label> 
+					<label class="checkbox-inline i-checks"> <input type="radio" th:field="*{misfirePolicy}" name="misfirePolicy" value="2" /> 一次执行 </label> 
+					<label class="checkbox-inline i-checks"> <input type="radio" th:field="*{misfirePolicy}" name="misfirePolicy" value="3" /> 放弃执行 </label>
+				</div>
+			</div>
 			<div class="form-group">
 				<label class="col-sm-3 control-label">状态：</label>
 				<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_job_status')}">
@ -60,6 +69,7 @@
 		</form>
 	</div>
 	<div th:include="include::footer"></div>
+	<script th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
 	<script type="text/javascript">
 		var prefix = ctx + "monitor/job"
 	
--- a/src/main/resources/templates/system/user/user.html
+++ b/src/main/resources/templates/system/user/user.html
@ -126,7 +126,8 @@
 		        },
 		        {
 		            field: 'email',
-		            title: '邮箱'
+		            title: '邮箱',
+		            visible: false
 		        },
 		        {
 		            field: 'phonenumber',
--- a/src/main/resources/templates/tool/gen/gen.html
+++ b/src/main/resources/templates/tool/gen/gen.html
@ -17,7 +17,7 @@
 								表描述：<input type="text" name="tableComment"/>
 							</li>
 							<li class="time">
-								<label>创建时间： </label>
+								<label>表时间： </label>
 								<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
 								<span>-</span>
 								<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>