Commit fb867587 by guo_minglei@163.com

修改错误

parent 8fcd3190
...@@ -219,7 +219,7 @@ public class ApiNodeServiceImpl implements ApiNodeService { ...@@ -219,7 +219,7 @@ public class ApiNodeServiceImpl implements ApiNodeService {
schedule.setJobType(NodeTypeEnum.JAVA.getCode()); schedule.setJobType(NodeTypeEnum.JAVA.getCode());
schedule.setTriggerTime(triggerTime); schedule.setTriggerTime(triggerTime);
schedule.setScheduleType(ScheduleTypeEnum.JAVA_SYNC.getCode()); schedule.setScheduleType(ScheduleTypeEnum.JAVA_SYNC.getCode());
schedule.setPriority("1");
schedule.setRunParam(PlaceholderUtils.formatParam(javaTask.getParam())); schedule.setRunParam(PlaceholderUtils.formatParam(javaTask.getParam()));
JobTaskRunLogWithBLOBs jobTaskRunLog = new JobTaskRunLogWithBLOBs(); JobTaskRunLogWithBLOBs jobTaskRunLog = new JobTaskRunLogWithBLOBs();
......
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
alarm_email = #{alarmEmail,jdbcType=VARCHAR}, alarm_email = #{alarmEmail,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where job_name = #{jobName,jdbcType=VARCHAR}, where job_name = #{jobName,jdbcType=VARCHAR}
</update> </update>
<select id="findByJobName" resultMap="BaseResultMap"> <select id="findByJobName" resultMap="BaseResultMap">
......
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
<select id="findJavaTaskByJobName" resultMap="BaseResultMap"> <select id="findJavaTaskByJobName" resultMap="BaseResultMap">
select <include refid="Base_Column_List" /> select <include refid="Base_Column_List" />
from job_task_run_log from job_task_run_log
where nodeId = #{nodeId} where node_id = #{nodeId}
and start_time &gt;= #{startTime} and start_time &gt;= #{startTime}
and end_time &lt;= #{endTime} and end_time &lt;= #{endTime}
and schedule_type = '5' and schedule_type = '5'
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<select id="findJavaTaskByTaskName" resultMap="BaseResultMap"> <select id="findJavaTaskByTaskName" resultMap="BaseResultMap">
select <include refid="Base_Column_List" /> select <include refid="Base_Column_List" />
from job_task_run_log from job_task_run_log
where nodeId in ( where node_id in (
<foreach collection="nodeIdList" item="nodeId" separator=","> <foreach collection="nodeIdList" item="nodeId" separator=",">
#{nodeId} #{nodeId}
</foreach> </foreach>
......
...@@ -112,32 +112,32 @@ public class JobUtils { ...@@ -112,32 +112,32 @@ public class JobUtils {
/** /**
* 添加任务 * 添加任务
*/ */
private static final String REQUEST_ADD_JAVATASK = "api/node/addJavaTask"; private static final String REQUEST_ADD_JAVATASK = "/api/node/addJavaTask";
/** /**
* 修改任务 * 修改任务
*/ */
private static final String REQUEST_UPDATE_JAVATASK = "api/node/updateJavaTask"; private static final String REQUEST_UPDATE_JAVATASK = "/api/node/updateJavaTask";
/** /**
* 删除任务 * 删除任务
*/ */
private static final String REQUEST_DELETE_JAVATASK = "api/node/deleteJavaTask"; private static final String REQUEST_DELETE_JAVATASK = "/api/node/deleteJavaTask";
/** /**
* 判断是否存在任务, 存在 true 不存在 false * 判断是否存在任务, 存在 true 不存在 false
*/ */
private static final String REQUEST_EXIST_JAVATASK = "api/node/existJavaTask"; private static final String REQUEST_EXIST_JAVATASK = "/api/node/existJavaTask";
/** /**
* 根据jobName获取日志 * 根据jobName获取日志
*/ */
private static final String REQUEST_LOADLOG_JOBNAME = "api/node/loadLogByJobName"; private static final String REQUEST_LOADLOG_JOBNAME = "/api/node/loadLogByJobName";
/** /**
* 根据taskName获取日志 * 根据taskName获取日志
*/ */
private static final String REQUEST_LOADLOG_TASKNAME = "api/node/loadLogByTaskName"; private static final String REQUEST_LOADLOG_TASKNAME = "/api/node/loadLogByTaskName";
/** /**
* 立即运行quartz任务 * 立即运行quartz任务
*/ */
private static final String REQUEST_RUN_JAVATASK = "api/node/runJavaTask"; private static final String REQUEST_RUN_JAVATASK = "/api/node/runJavaTask";
/** /**
* 当前项目运行环境 jar file * 当前项目运行环境 jar file
*/ */
...@@ -521,7 +521,7 @@ public class JobUtils { ...@@ -521,7 +521,7 @@ public class JobUtils {
*/ */
public static ResponseResult deleteJavaTask(String jobName){ public static ResponseResult deleteJavaTask(String jobName){
log.info("-------------删除任务----------------------"); log.info("-------------删除任务----------------------");
String response = createHttpRequest(REQUEST_DELETE_JAVATASK, "param=" + jobName); String response = createHttpRequest(REQUEST_DELETE_JAVATASK, "jobName=" + jobName);
log.info("--------------------删除任务,结果为:{}------------------------",response); log.info("--------------------删除任务,结果为:{}------------------------",response);
return JSON.parseObject(response, ResponseResult.class); return JSON.parseObject(response, ResponseResult.class);
} }
...@@ -535,7 +535,7 @@ public class JobUtils { ...@@ -535,7 +535,7 @@ public class JobUtils {
*/ */
public static ResponseResult existJavaTask(String jobName){ public static ResponseResult existJavaTask(String jobName){
log.info("-------------判断是否存在任务----------------------"); log.info("-------------判断是否存在任务----------------------");
String response = createHttpRequest(REQUEST_EXIST_JAVATASK, "param=" + jobName); String response = createHttpRequest(REQUEST_EXIST_JAVATASK, "jobName=" + jobName);
log.info("--------------------判断是否存在任务,结果为:{}------------------------",response); log.info("--------------------判断是否存在任务,结果为:{}------------------------",response);
return JSON.parseObject(response, ResponseResult.class); return JSON.parseObject(response, ResponseResult.class);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment