Skip to content

B
byit-myth-job
Commit bb81bf83 by huangfusuper
Options

【基础代码重构】基础代码重构

parent 2b2e93de
Showing with 199 additions and 248 deletions
byit-myth-admin/src/main/java/com/byit/controller/JobController.java
......@@ -3,6 +3,7 @@ package com.byit.controller;
import com.byit.conf.MythJobAutoConfigure;
import com.byit.job.dto.JobRunResultDto;
import com.byit.job.dto.PluginBeanJobInfo;
import com.byit.model.JobTask;
import com.byit.service.JobTaskService;
import com.byit.thread.LogCallbackThread;
import com.byit.util.SourceObj2TargetObjUtil;
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/JobTaskMapper.java
......@@ -50,5 +50,5 @@ public interface JobTaskMapper {
* 根据id删除多个
* @param jobTasks
*/
void deleteInId(List<JobTask> jobTasks);
void deleteInId(@Param("jobTasks") List<JobTask> jobTasks);
}
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/JobTaskRunLogMapper.java
package com.byit.mapper;
import com.byit.model.JobTaskRunLog;
import com.byit.model.JobTaskRunLogWithBLOBs;
import org.springframework.stereotype.Repository;
/**
* 对日志表的操作
* @author huangfu
*/
@Repository
public interface JobTaskRunLogMapper {
/**
* 根据id删除一个数据
* @param logId
* @return
*/
int deleteById(Integer logId);
int insert(JobTaskRunLogWithBLOBs record);
/**
* 保存一条日志
* @param record
* @return
*/
int saveJobTaskRunLog(JobTaskRunLogWithBLOBs record);
/**
* 根据ID查询一条日志
* @param logId
* @return
*/
JobTaskRunLogWithBLOBs findJobTaskRunLogByLogId(Integer logId);
/**
* 修改一条日志
* @param record
* @return
*/
int updateJobTaskRunLog(JobTaskRunLogWithBLOBs record);
int insertSelective(JobTaskRunLogWithBLOBs record);
JobTaskRunLogWithBLOBs getById(Integer logId);
int updateByIdSelective(JobTaskRunLogWithBLOBs record);
int updateByIdWithBLOBs(JobTaskRunLogWithBLOBs record);
int updateById(JobTaskRunLog record);
}
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/JobTaskScheduleMapper.java
package com.byit.mapper;
import com.byit.model.JobTaskSchedule;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 排期表操作
* @author huangfu
*/
@Repository
public interface JobTaskScheduleMapper {
/**
* 查询五秒内要执行的任务
* @param triggerTime
* @return
*/
List<JobTaskSchedule> findJobTaskScheduleByTriggerTimeLessThanEqual(@Param("triggerTime") Long triggerTime);
/**
* 根据id删除
* @param id
* @return
*/
int deleteById(Integer id);
int insert(JobTaskSchedule record);
int insertSelective(JobTaskSchedule record);
JobTaskSchedule getById(Integer id);
int updateByIdSelective(JobTaskSchedule record);
int updateByIdWithBLOBs(JobTaskSchedule record);
/**
* 保存一个排期表数据
* @param jobTaskSchedule
* @return
*/
int saveJobTaskSchedule(JobTaskSchedule jobTaskSchedule);
/**
* 批量保存排期表数据
* @param jobTaskSchedules
* @return
*/
int saveJobTaskScheduleArray(@Param("jobTaskSchedules") List<JobTaskSchedule> jobTaskSchedules);
/**
* 根据id查询一个数据
* @param id
* @return
*/
JobTaskSchedule findJobTaskScheduleById(Integer id);
/**
* 修改一个数据
* @param record
* @return
*/
int updateJobTaskSchedule(JobTaskSchedule record);
int updateById(JobTaskSchedule record);
}
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTaskRunLog.java
......@@ -131,7 +131,11 @@ public class JobTaskRunLog implements Serializable {
*/
@ApiModelProperty("节点id")
private Integer nodeId;
/**
* 任务类型
*/
@ApiModelProperty("任务类型")
private String jobType;
/**
*/
private static final long serialVersionUID = 1L;
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/service/JobTaskRunLogService.java
package com.byit.service;
import com.byit.model.JobTaskRunLog;
import com.byit.model.JobTaskRunLogWithBLOBs;
/**
* @program: byit-myth-job->JobTaskRunLogService
* @description: 日志业务表
......@@ -12,19 +15,19 @@ public interface JobTaskRunLogService {
* @param id
* @return
*/
JobTaskRunLog findJobTaskRunLogById(Integer id);
JobTaskRunLogWithBLOBs findJobTaskRunLogById(Integer id);
/**
* 既是保存接口又是修改接口
* @param jobTaskRunLog
* 保存接口
* @param jobTaskRunLogWithBLOBs
* @return
*/
int saveJobTaskRunLog(JobTaskRunLog jobTaskRunLog);
int saveJobTaskRunLog(JobTaskRunLogWithBLOBs jobTaskRunLogWithBLOBs);
/**
* 修改数据
* @param jobTaskRunLog
* @param jobTaskRunLogWithBLOBs
* @return
*/
int updateJobTaskRunLog(JobTaskRunLog jobTaskRunLog);
int updateJobTaskRunLog(JobTaskRunLogWithBLOBs jobTaskRunLogWithBLOBs);
}
byit-myth-core/myth-admin-core/src/main/java/com/byit/service/impl/JobTaskRunLogServiceImpl.java
package com.byit.service.impl;
import com.byit.mapper.JobTaskRunLogMapper;
import com.byit.model.JobTaskRunLogWithBLOBs;
import com.byit.service.JobTaskRunLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -25,17 +27,17 @@ public class JobTaskRunLogServiceImpl implements JobTaskRunLogService {
@Override
@Transactional(rollbackFor = Exception.class,propagation = Propagation.SUPPORTS)
public JobTaskRunLog findJobTaskRunLogById(Integer id) {
return jobTaskRunLogMapper.getById(id);
public JobTaskRunLogWithBLOBs findJobTaskRunLogById(Integer id) {
return jobTaskRunLogMapper.findJobTaskRunLogByLogId(id);
}
@Override
public int saveJobTaskRunLog(JobTaskRunLog jobTaskRunLog) {
return jobTaskRunLogMapper.insertSelective(jobTaskRunLog);
public int saveJobTaskRunLog(JobTaskRunLogWithBLOBs jobTaskRunLog) {
return jobTaskRunLogMapper.saveJobTaskRunLog(jobTaskRunLog);
}
@Override
public int updateJobTaskRunLog(JobTaskRunLog jobTaskRunLog) {
return jobTaskRunLogMapper.updateByIdSelective(jobTaskRunLog);
public int updateJobTaskRunLog(JobTaskRunLogWithBLOBs jobTaskRunLogWithBLOBs) {
return jobTaskRunLogMapper.updateJobTaskRunLog(jobTaskRunLogWithBLOBs);
}
}
byit-myth-core/myth-admin-core/src/main/java/com/byit/service/impl/JobTaskScheduleServiceImpl.java
package com.byit.service.impl;
import com.byit.mapper.JobTaskScheduleMapper;
import com.byit.model.JobTaskSchedule;
import com.byit.service.JobTaskScheduleService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -34,7 +35,7 @@ public class JobTaskScheduleServiceImpl implements JobTaskScheduleService {
@Transactional(rollbackFor = Exception.class,propagation = Propagation.SUPPORTS)
@Override
public List<JobTaskSchedule> findJobTaskScheduleByTriggerNextTimeLessThanEqual(long maxNextTime) {
return jobTaskScheduleMapper.findJobTaskScheduleByTriggerNextTimeLessThanEqual(maxNextTime);
return jobTaskScheduleMapper.findJobTaskScheduleByTriggerTimeLessThanEqual(maxNextTime);
}
/**
......@@ -44,7 +45,8 @@ public class JobTaskScheduleServiceImpl implements JobTaskScheduleService {
*/
@Override
public int saveAllData(List<JobTaskSchedule> jobTaskSchedules) {
return jobTaskScheduleMapper.insertDataList(jobTaskSchedules);
return jobTaskScheduleMapper.saveJobTaskScheduleArray(jobTaskSchedules);
}
@Override
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/task/JavaBeanJobTask.java
......@@ -6,6 +6,8 @@ import com.byit.job.dto.AdminSenPluginDto;
import com.byit.job.dto.DispatchResponseDto;
import com.byit.job.exceptions.plugin.PluginException;
import com.byit.job.utils.IpUtil;
import com.byit.model.JobTaskRunLogWithBLOBs;
import com.byit.model.JobTaskSchedule;
import com.byit.rpc.remoting.invoker.route.LoadBalance;
import com.byit.rpc.remoting.invoker.route.RpcLoadBalance;
import com.byit.service.impl.JobTaskRunLogServiceImpl;
......@@ -35,7 +37,7 @@ public class JavaBeanJobTask implements TimerTask {
RpcLoadBalance rpcInvokerRouter = LoadBalance.match(mythJobTaskSchedule.getRoutingStrategy( ), LoadBalance.ROUND).rpcInvokerRouter;
try{
String url = IpUtil.electiveUrl(mythJobTaskSchedule.getPluginUrls( ), rpcInvokerRouter);
String jobHandelName = mythJobTaskSchedule.getLocalNodeHandlerName();
String jobHandelName = mythJobTaskSchedule.getHandlerName();
String param = mythJobTaskSchedule.getRunParam( );
String runId = mythJobTaskSchedule.getRunId();
AdminSenPluginDto adminSenPluginDto = new AdminSenPluginDto();
......@@ -66,13 +68,12 @@ public class JavaBeanJobTask implements TimerTask {
DispatchResponseDto dispatchResponseDto = JSON.parseObject(result, DispatchResponseDto.class);
JobTaskRunLogServiceImpl jobTaskRunLogService = SpringUtil.getBean(JobTaskRunLogServiceImpl.class);
JobTaskRunLog jobTaskRunLog = new JobTaskRunLog();
JobTaskRunLogWithBLOBs jobTaskRunLog = new JobTaskRunLogWithBLOBs();
jobTaskRunLog.setLogId(mythJobTaskSchedule.getLogId());
jobTaskRunLog.setFlowVersionId(mythJobTaskSchedule.getVersionId());
jobTaskRunLog.setJobFlowName(mythJobTaskSchedule.getVersionName());
jobTaskRunLog.setVersionName(mythJobTaskSchedule.getVersionName());
jobTaskRunLog.setRunType("2");
jobTaskRunLog.setJobType("BEAN");
jobTaskRunLog.setLocalNodeHandlerName(mythJobTaskSchedule.getLocalNodeHandlerName());
jobTaskRunLog.setJobType(mythJobTaskSchedule.getJobType());
jobTaskRunLog.setHandlerName(mythJobTaskSchedule.getHandlerName());
jobTaskRunLog.setTriggerTime(new Date());
jobTaskRunLog.setTriggerCode(dispatchResponseDto.getCode());
jobTaskRunLog.setTriggerMsg(dispatchResponseDto.getMsg());
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/JobScheduleHelper.java
......@@ -2,13 +2,15 @@ package com.byit.thread;
import cn.hutool.core.collection.CollectionUtil;
import com.byit.job.WorkRoulette;
import com.byit.model.JobTask;
import com.byit.model.JobTaskRunLogWithBLOBs;
import com.byit.model.JobTaskSchedule;
import com.byit.service.JobTaskScheduleService;
import com.byit.service.JobTaskService;
import com.byit.service.impl.JobTaskRunLogServiceImpl;
import com.byit.task.JavaBeanJobTask;
import com.byit.util.SpringUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -111,7 +113,7 @@ public class JobScheduleHelper{
* 大概思路，根据任务流id，从任务流执行回溯表查询该任务流的所有节点，查看上级节点是否已经执行成功
* //TODO 需要修改 判断父节点是否执行完毕 注意 父节点是一个集合
*/
if(StringUtils.isNotBlank(jobTask.getDependencyNodes())){
if(true){
log.debug("任务：{}", jobTask);
JobTaskSchedule jobTaskSchedule = new JobTaskSchedule();
BeanUtils.copyProperties(jobTask,jobTaskSchedule);
......@@ -239,12 +241,12 @@ public class JobScheduleHelper{
if(CollectionUtil.isNotEmpty(jobTaskSchedules)){
//循环遍历添加任务
jobTaskSchedules.forEach(mythJobTaskSchedule ->{
if ("BEAN".equals(mythJobTaskSchedule.getJobType())) {
if ("JAVA".equals(mythJobTaskSchedule.getJobType())) {
Integer logId = saveLog(mythJobTaskSchedule);
mythJobTaskSchedule.setLogId(logId);
JavaBeanJobTask javaBeanJobTask = new JavaBeanJobTask(mythJobTaskSchedule);
jobTaskScheduleService.delete(mythJobTaskSchedule.getId());
WorkRoulette.addJob(javaBeanJobTask,mythJobTaskSchedule.getTriggerNextTime());
WorkRoulette.addJob(javaBeanJobTask,mythJobTaskSchedule.getTriggerTime());
}
});
}else{
......@@ -321,17 +323,14 @@ public class JobScheduleHelper{
}
private Integer saveLog(JobTaskSchedule mythJobTaskSchedule){
JobTaskRunLog jobTaskRunLog = new JobTaskRunLog();
JobTaskRunLogWithBLOBs jobTaskRunLog = new JobTaskRunLogWithBLOBs();
jobTaskRunLog.setJobFlowId(mythJobTaskSchedule.getFlowId());
jobTaskRunLog.setFlowName(mythJobTaskSchedule.getVersionName());
//版本id需要查验
//还需要携带版本的名字
jobTaskRunLog.setNodeName(mythJobTaskSchedule.getNodeName());
jobTaskRunLog.setNodeType(mythJobTaskSchedule.getNodeType());
jobTaskRunLog.setRunParams(mythJobTaskSchedule.getRunParam());
jobTaskRunLog.setFailedRemainingCount(mythJobTaskSchedule.getFailedRetryCount());
jobTaskRunLog.setAlarmEmail(mythJobTaskSchedule.getAlarmEmail());
jobTaskRunLog.setMailAction(mythJobTaskSchedule.getMailAction());
jobTaskRunLog.setJobType(mythJobTaskSchedule.getJobType());
JobTaskRunLogServiceImpl mythJobTaskRunLogService = SpringUtil.getBean(JobTaskRunLogServiceImpl.class);
mythJobTaskRunLogService.saveJobTaskRunLog(jobTaskRunLog);
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/LogCallbackThread.java
package com.byit.thread;
import com.byit.job.dto.JobRunResultDto;
import com.byit.model.JobTaskRunLog;
import com.byit.model.JobTaskRunLogWithBLOBs;
import com.byit.service.impl.JobTaskRunLogServiceImpl;
import com.byit.util.SpringUtil;
import lombok.extern.slf4j.Slf4j;
......@@ -24,9 +26,9 @@ public class LogCallbackThread implements Runnable {
public void run() {
log.debug("--------------------任务执行完成---------------------");
JobTaskRunLogServiceImpl mythJobTaskRunLogService = SpringUtil.getBean(JobTaskRunLogServiceImpl.class);
JobTaskRunLog jobTaskRunLog = new JobTaskRunLog();
JobTaskRunLogWithBLOBs jobTaskRunLog = new JobTaskRunLogWithBLOBs();
jobTaskRunLog.setLogId(jobRunResultDto.getLogId());
jobTaskRunLog.setRunTime(jobRunResultDto.getEndTime());
jobTaskRunLog.setStartTime(jobRunResultDto.getEndTime());
jobTaskRunLog.setRunCode(jobRunResultDto.getReturnResult().getCode());
jobTaskRunLog.setRunMsg(jobRunResultDto.getReturnResult().getMsg());
mythJobTaskRunLogService.updateJobTaskRunLog(jobTaskRunLog);
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/util/SourceObj2TargetObjUtil.java
package com.byit.util;
import com.byit.job.dto.PluginBeanJobInfo;
import com.byit.model.JobTask;
/**
* @program: byit-myth-job->SourceObj2TargetObjUtil
......@@ -18,21 +19,17 @@ public class SourceObj2TargetObjUtil {
public static JobTask pluginBeanJobInfo2JobTask(PluginBeanJobInfo pluginBeanJobInfo){
JobTask jobTask = new JobTask();
jobTask.setNodeId(1);
jobTask.setLocalNodeHandlerName(pluginBeanJobInfo.getJobHandelName());
jobTask.setHandlerName(pluginBeanJobInfo.getJobHandelName());
jobTask.setPluginUrls(pluginBeanJobInfo.getUrl());
jobTask.setNodeCron(pluginBeanJobInfo.getMythCron());
jobTask.setRoutingStrategy(pluginBeanJobInfo.getRoutingStrategy());
jobTask.setBlockStrategy(pluginBeanJobInfo.getBlockingStrategy());
jobTask.setCallbackToken(pluginBeanJobInfo.getCallbackToken());
jobTask.setPluginToken(pluginBeanJobInfo.getCallbackToken());
jobTask.setGatewayToken(pluginBeanJobInfo.getGatewayToken());
jobTask.setRunParam(pluginBeanJobInfo.getParam());
jobTask.setAlarmEmail(pluginBeanJobInfo.getAlarmEmail());
jobTask.setSourcePrincipal(pluginBeanJobInfo.getAuthor());
jobTask.setNodeName(pluginBeanJobInfo.getJobHandelName());
jobTask.setTriggerNextTime(System.currentTimeMillis()+20000);
jobTask.setDependencyNodes("0");
jobTask.setJobType("BEAN");
jobTask.setVersionId(1);
jobTask.setTriggerTime(System.currentTimeMillis()+20000);
jobTask.setJobType("JAVA");
jobTask.setVersionName("V1");
return jobTask;
}
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskMapper.xml
......@@ -335,8 +335,8 @@
<delete id="deleteInId" parameterType="com.byit.model.JobTask">
delete from job_task
where id in
<foreach collection="mythJobTasks" item="mythJobTask" open="(" separator="," close=")">
#{mythJobTask.id}
<foreach collection="jobTasks" item="jobTask" open="(" separator="," close=")">
#{jobTask.id}
</foreach>
</delete>
<!--根据id删除-->
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskRunLogMapper.xml
......@@ -2,7 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.byit.mapper.JobTaskRunLogMapper">
<resultMap id="BaseResultMap" type="com.byit.model.JobTaskRunLog">
<!-- generated @mbg.generated date: 2019-12-25 -->
<id column="log_id" jdbcType="INTEGER" property="logId" />
<result column="failed_remaining_count" jdbcType="INTEGER" property="failedRemainingCount" />
<result column="version_name" jdbcType="VARCHAR" property="versionName" />
......@@ -25,22 +24,19 @@
<result column="node_id" jdbcType="INTEGER" property="nodeId" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTaskRunLogWithBLOBs">
<!-- generated @mbg.generated date: 2019-12-25 -->
<result column="run_msg" jdbcType="LONGVARCHAR" property="runMsg" />
<result column="trigger_msg" jdbcType="LONGVARCHAR" property="triggerMsg" />
</resultMap>
<sql id="Base_Column_List">
<!-- generated @mbg.generated date: 2019-12-25 -->
log_id, failed_remaining_count, version_name, flow_id, flow_name, job_group_id, handler_name,
node_name, is_virtual, run_code, run_params, start_time, run_type, trigger_code,
trigger_time, job_group_ip, map_flow_id, run_command, end_time, node_id
trigger_time, job_group_ip, map_flow_id, run_command, end_time, node_id,job_type
</sql>
<sql id="Blob_Column_List">
<!-- generated @mbg.generated date: 2019-12-25 -->
run_msg, trigger_msg
</sql>
<select id="getById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
<!-- generated @mbg.generated date: 2019-12-25 -->
<select id="findJobTaskRunLogByLogId" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
select
<include refid="Base_Column_List" />
,
......@@ -48,32 +44,13 @@
from job_task_run_log
where log_id = #{logId,jdbcType=INTEGER}
</select>
<delete id="deleteById" parameterType="java.lang.Integer">
<!-- generated @mbg.generated date: 2019-12-25 -->
delete from job_task_run_log
where log_id = #{logId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.byit.model.JobTaskRunLogWithBLOBs">
<!-- generated @mbg.generated date: 2019-12-25 -->
insert into job_task_run_log (log_id, failed_remaining_count, version_name,
flow_id, flow_name, job_group_id,
handler_name, node_name, is_virtual,
run_code, run_params, start_time,
run_type, trigger_code, trigger_time,
job_group_ip, map_flow_id, run_command,
end_time, node_id, run_msg,
trigger_msg)
values (#{logId,jdbcType=INTEGER}, #{failedRemainingCount,jdbcType=INTEGER}, #{versionName,jdbcType=VARCHAR},
#{flowId,jdbcType=INTEGER}, #{flowName,jdbcType=VARCHAR}, #{jobGroupId,jdbcType=INTEGER},
#{handlerName,jdbcType=VARCHAR}, #{nodeName,jdbcType=VARCHAR}, #{isVirtual,jdbcType=CHAR},
#{runCode,jdbcType=VARCHAR}, #{runParams,jdbcType=VARCHAR}, #{startTime,jdbcType=TIMESTAMP},
#{runType,jdbcType=CHAR}, #{triggerCode,jdbcType=VARCHAR}, #{triggerTime,jdbcType=DATE},
#{jobGroupIp,jdbcType=VARCHAR}, #{mapFlowId,jdbcType=INTEGER}, #{runCommand,jdbcType=VARCHAR},
#{endTime,jdbcType=TIMESTAMP}, #{nodeId,jdbcType=INTEGER}, #{runMsg,jdbcType=LONGVARCHAR},
#{triggerMsg,jdbcType=LONGVARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.byit.model.JobTaskRunLogWithBLOBs">
<!-- generated @mbg.generated date: 2019-12-25 -->
<insert id="saveJobTaskRunLog" parameterType="com.byit.model.JobTaskRunLogWithBLOBs" useGeneratedKeys="true" keyProperty="logId" keyColumn="log_id">
insert into job_task_run_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="logId != null">
......@@ -136,6 +113,9 @@
<if test="nodeId != null">
node_id,
</if>
<if test="jobType != null">
job_type,
</if>
<if test="runMsg != null">
run_msg,
</if>
......@@ -204,6 +184,9 @@
<if test="nodeId != null">
#{nodeId,jdbcType=INTEGER},
</if>
<if test="jobType != null">
#{jobType,jdbcType=VARCHAR},
</if>
<if test="runMsg != null">
#{runMsg,jdbcType=LONGVARCHAR},
</if>
......@@ -212,8 +195,7 @@
</if>
</trim>
</insert>
<update id="updateByIdSelective" parameterType="com.byit.model.JobTaskRunLogWithBLOBs">
<!-- generated @mbg.generated date: 2019-12-25 -->
<update id="updateJobTaskRunLog" parameterType="com.byit.model.JobTaskRunLogWithBLOBs">
update job_task_run_log
<set>
<if test="failedRemainingCount != null">
......@@ -273,6 +255,9 @@
<if test="nodeId != null">
node_id = #{nodeId,jdbcType=INTEGER},
</if>
<if test="jobType != null">
job_type = #{jobType,jdbcType=VARCHAR},
</if>
<if test="runMsg != null">
run_msg = #{runMsg,jdbcType=LONGVARCHAR},
</if>
......@@ -282,54 +267,4 @@
</set>
where log_id = #{logId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.JobTaskRunLogWithBLOBs">
<!-- generated @mbg.generated date: 2019-12-25 -->
update job_task_run_log
set failed_remaining_count = #{failedRemainingCount,jdbcType=INTEGER},
version_name = #{versionName,jdbcType=VARCHAR},
flow_id = #{flowId,jdbcType=INTEGER},
flow_name = #{flowName,jdbcType=VARCHAR},
job_group_id = #{jobGroupId,jdbcType=INTEGER},
handler_name = #{handlerName,jdbcType=VARCHAR},
node_name = #{nodeName,jdbcType=VARCHAR},
is_virtual = #{isVirtual,jdbcType=CHAR},
run_code = #{runCode,jdbcType=VARCHAR},
run_params = #{runParams,jdbcType=VARCHAR},
start_time = #{startTime,jdbcType=TIMESTAMP},
run_type = #{runType,jdbcType=CHAR},
trigger_code = #{triggerCode,jdbcType=VARCHAR},
trigger_time = #{triggerTime,jdbcType=DATE},
job_group_ip = #{jobGroupIp,jdbcType=VARCHAR},
map_flow_id = #{mapFlowId,jdbcType=INTEGER},
run_command = #{runCommand,jdbcType=VARCHAR},
end_time = #{endTime,jdbcType=TIMESTAMP},
node_id = #{nodeId,jdbcType=INTEGER},
run_msg = #{runMsg,jdbcType=LONGVARCHAR},
trigger_msg = #{triggerMsg,jdbcType=LONGVARCHAR}
where log_id = #{logId,jdbcType=INTEGER}
</update>
<update id="updateById" parameterType="com.byit.model.JobTaskRunLog">
<!-- generated @mbg.generated date: 2019-12-25 -->
update job_task_run_log
set failed_remaining_count = #{failedRemainingCount,jdbcType=INTEGER},
version_name = #{versionName,jdbcType=VARCHAR},
flow_id = #{flowId,jdbcType=INTEGER},
flow_name = #{flowName,jdbcType=VARCHAR},
job_group_id = #{jobGroupId,jdbcType=INTEGER},
handler_name = #{handlerName,jdbcType=VARCHAR},
node_name = #{nodeName,jdbcType=VARCHAR},
is_virtual = #{isVirtual,jdbcType=CHAR},
run_code = #{runCode,jdbcType=VARCHAR},
run_params = #{runParams,jdbcType=VARCHAR},
start_time = #{startTime,jdbcType=TIMESTAMP},
run_type = #{runType,jdbcType=CHAR},
trigger_code = #{triggerCode,jdbcType=VARCHAR},
trigger_time = #{triggerTime,jdbcType=DATE},
job_group_ip = #{jobGroupIp,jdbcType=VARCHAR},
map_flow_id = #{mapFlowId,jdbcType=INTEGER},
run_command = #{runCommand,jdbcType=VARCHAR},
end_time = #{endTime,jdbcType=TIMESTAMP},
node_id = #{nodeId,jdbcType=INTEGER}
where log_id = #{logId,jdbcType=INTEGER}
</update>
</mapper>
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskScheduleMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.byit.mapper.JobTaskScheduleMapper">
<resultMap id="BaseResultMap" type="com.byit.model.JobTaskSchedule">
<!-- generated @mbg.generated date: 2019-12-25 -->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="node_id" jdbcType="INTEGER" property="nodeId" />
<result column="block_strategy" jdbcType="VARCHAR" property="blockStrategy" />
......@@ -32,12 +32,12 @@
<result column="log_id" jdbcType="INTEGER" property="logId" />
<result column="run_command" jdbcType="VARCHAR" property="runCommand" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTaskSchedule">
<!-- generated @mbg.generated date: 2019-12-25 -->
<result column="run_source" jdbcType="LONGVARCHAR" property="runSource" />
</resultMap>
<sql id="Base_Column_List">
<!-- generated @mbg.generated date: 2019-12-25 -->
id, node_id, block_strategy, plugin_token, failed_retry_count, flow_id, gateway_token,
job_type, handler_name, node_desc, node_name, map_flow_id, node_timeout, is_virtual,
plugin_urls, priority, failed_retry_interval, routing_strategy, run_id, run_param,
......@@ -45,11 +45,20 @@
log_id, run_command
</sql>
<sql id="Blob_Column_List">
<!-- generated @mbg.generated date: 2019-12-25 -->
run_source
</sql>
<select id="getById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
<!-- generated @mbg.generated date: 2019-12-25 -->
<!--查询五秒内将要执行的数据-->
<select id="findJobTaskScheduleByTriggerTimeLessThanEqual" resultMap="ResultMapWithBLOBs">
select
<include refid="Base_Column_List" />
,
<include refid="Blob_Column_List" />
from job_task_schedule
where trigger_time <![CDATA[ <= ]]> #{triggerTime,jdbcType=BIGINT}
</select>
<select id="findJobTaskScheduleById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
select
<include refid="Base_Column_List" />
,
......@@ -57,36 +66,13 @@
from job_task_schedule
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteById" parameterType="java.lang.Integer">
<!-- generated @mbg.generated date: 2019-12-25 -->
delete from job_task_schedule
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.byit.model.JobTaskSchedule">
<!-- generated @mbg.generated date: 2019-12-25 -->
insert into job_task_schedule (id, node_id, block_strategy,
plugin_token, failed_retry_count, flow_id,
gateway_token, job_type, handler_name,
node_desc, node_name, map_flow_id,
node_timeout, is_virtual, plugin_urls,
priority, failed_retry_interval, routing_strategy,
run_id, run_param, run_source_desc,
script_urls, source_principal, trigger_time,
trigger_status, version_name, log_id,
run_command, run_source)
values (#{id,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, #{blockStrategy,jdbcType=VARCHAR},
#{pluginToken,jdbcType=VARCHAR}, #{failedRetryCount,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER},
#{gatewayToken,jdbcType=VARCHAR}, #{jobType,jdbcType=VARCHAR}, #{handlerName,jdbcType=VARCHAR},
#{nodeDesc,jdbcType=VARCHAR}, #{nodeName,jdbcType=VARCHAR}, #{mapFlowId,jdbcType=INTEGER},
#{nodeTimeout,jdbcType=BIGINT}, #{isVirtual,jdbcType=CHAR}, #{pluginUrls,jdbcType=VARCHAR},
#{priority,jdbcType=CHAR}, #{failedRetryInterval,jdbcType=BIGINT}, #{routingStrategy,jdbcType=VARCHAR},
#{runId,jdbcType=VARCHAR}, #{runParam,jdbcType=VARCHAR}, #{runSourceDesc,jdbcType=VARCHAR},
#{scriptUrls,jdbcType=VARCHAR}, #{sourcePrincipal,jdbcType=VARCHAR}, #{triggerTime,jdbcType=BIGINT},
#{triggerStatus,jdbcType=CHAR}, #{versionName,jdbcType=VARCHAR}, #{logId,jdbcType=INTEGER},
#{runCommand,jdbcType=VARCHAR}, #{runSource,jdbcType=LONGVARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.byit.model.JobTaskSchedule">
<!-- generated @mbg.generated date: 2019-12-25 -->
<insert id="saveJobTaskSchedule" parameterType="com.byit.model.JobTaskSchedule">
insert into job_task_schedule
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -267,8 +253,37 @@
</if>
</trim>
</insert>
<update id="updateByIdSelective" parameterType="com.byit.model.JobTaskSchedule">
<!-- generated @mbg.generated date: 2019-12-25 -->
<insert id="saveJobTaskScheduleArray" parameterType="com.byit.model.JobTaskSchedule">
insert into job_task_schedule (id, node_id, block_strategy,
plugin_token, failed_retry_count, flow_id,
gateway_token, job_type, handler_name,
node_desc, node_name, map_flow_id,
node_timeout, is_virtual, plugin_urls,
priority, failed_retry_interval, routing_strategy,
run_id, run_param, run_source_desc,
script_urls, source_principal, trigger_time,
trigger_status, version_name, log_id,
run_command, run_source
)
values
<foreach collection="jobTaskSchedules" item="jobTaskSchedule" separator =",">
(#{jobTaskSchedule.id,jdbcType=INTEGER}, #{jobTaskSchedule.nodeId,jdbcType=INTEGER}, #{jobTaskSchedule.blockStrategy,jdbcType=VARCHAR},
#{jobTaskSchedule.pluginToken,jdbcType=VARCHAR}, #{jobTaskSchedule.failedRetryCount,jdbcType=INTEGER}, #{jobTaskSchedule.flowId,jdbcType=INTEGER},
#{jobTaskSchedule.gatewayToken,jdbcType=VARCHAR}, #{jobTaskSchedule.jobType,jdbcType=VARCHAR}, #{jobTaskSchedule.handlerName,jdbcType=VARCHAR},
#{jobTaskSchedule.nodeDesc,jdbcType=VARCHAR}, #{jobTaskSchedule.nodeName,jdbcType=VARCHAR}, #{jobTaskSchedule.mapFlowId,jdbcType=INTEGER},
#{jobTaskSchedule.nodeTimeout,jdbcType=BIGINT}, #{jobTaskSchedule.isVirtual,jdbcType=CHAR}, #{jobTaskSchedule.pluginUrls,jdbcType=VARCHAR},
#{jobTaskSchedule.priority,jdbcType=CHAR}, #{jobTaskSchedule.failedRetryInterval,jdbcType=BIGINT}, #{jobTaskSchedule.routingStrategy,jdbcType=VARCHAR},
#{jobTaskSchedule.runId,jdbcType=VARCHAR}, #{jobTaskSchedule.runParam,jdbcType=VARCHAR}, #{jobTaskSchedule.runSourceDesc,jdbcType=VARCHAR},
#{jobTaskSchedule.scriptUrls,jdbcType=VARCHAR}, #{jobTaskSchedule.sourcePrincipal,jdbcType=VARCHAR}, #{jobTaskSchedule.triggerTime,jdbcType=BIGINT},
#{jobTaskSchedule.triggerStatus,jdbcType=CHAR}, #{jobTaskSchedule.versionName,jdbcType=VARCHAR}, #{jobTaskSchedule.logId,jdbcType=INTEGER},
#{jobTaskSchedule.runCommand,jdbcType=VARCHAR}, #{jobTaskSchedule.runSource,jdbcType=LONGVARCHAR}
)
</foreach>
</insert>
<update id="updateJobTaskSchedule" parameterType="com.byit.model.JobTaskSchedule">
update job_task_schedule
<set>
<if test="nodeId != null">
......@@ -358,69 +373,4 @@
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.JobTaskSchedule">
<!-- generated @mbg.generated date: 2019-12-25 -->
update job_task_schedule
set node_id = #{nodeId,jdbcType=INTEGER},
block_strategy = #{blockStrategy,jdbcType=VARCHAR},
plugin_token = #{pluginToken,jdbcType=VARCHAR},
failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
flow_id = #{flowId,jdbcType=INTEGER},
gateway_token = #{gatewayToken,jdbcType=VARCHAR},
job_type = #{jobType,jdbcType=VARCHAR},
handler_name = #{handlerName,jdbcType=VARCHAR},
node_desc = #{nodeDesc,jdbcType=VARCHAR},
node_name = #{nodeName,jdbcType=VARCHAR},
map_flow_id = #{mapFlowId,jdbcType=INTEGER},
node_timeout = #{nodeTimeout,jdbcType=BIGINT},
is_virtual = #{isVirtual,jdbcType=CHAR},
plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
priority = #{priority,jdbcType=CHAR},
failed_retry_interval = #{failedRetryInterval,jdbcType=BIGINT},
routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
run_id = #{runId,jdbcType=VARCHAR},
run_param = #{runParam,jdbcType=VARCHAR},
run_source_desc = #{runSourceDesc,jdbcType=VARCHAR},
script_urls = #{scriptUrls,jdbcType=VARCHAR},
source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
trigger_time = #{triggerTime,jdbcType=BIGINT},
trigger_status = #{triggerStatus,jdbcType=CHAR},
version_name = #{versionName,jdbcType=VARCHAR},
log_id = #{logId,jdbcType=INTEGER},
run_command = #{runCommand,jdbcType=VARCHAR},
run_source = #{runSource,jdbcType=LONGVARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateById" parameterType="com.byit.model.JobTaskSchedule">
<!-- generated @mbg.generated date: 2019-12-25 -->
update job_task_schedule
set node_id = #{nodeId,jdbcType=INTEGER},
block_strategy = #{blockStrategy,jdbcType=VARCHAR},
plugin_token = #{pluginToken,jdbcType=VARCHAR},
failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
flow_id = #{flowId,jdbcType=INTEGER},
gateway_token = #{gatewayToken,jdbcType=VARCHAR},
job_type = #{jobType,jdbcType=VARCHAR},
handler_name = #{handlerName,jdbcType=VARCHAR},
node_desc = #{nodeDesc,jdbcType=VARCHAR},
node_name = #{nodeName,jdbcType=VARCHAR},
map_flow_id = #{mapFlowId,jdbcType=INTEGER},
node_timeout = #{nodeTimeout,jdbcType=BIGINT},
is_virtual = #{isVirtual,jdbcType=CHAR},
plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
priority = #{priority,jdbcType=CHAR},
failed_retry_interval = #{failedRetryInterval,jdbcType=BIGINT},
routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
run_id = #{runId,jdbcType=VARCHAR},
run_param = #{runParam,jdbcType=VARCHAR},
run_source_desc = #{runSourceDesc,jdbcType=VARCHAR},
script_urls = #{scriptUrls,jdbcType=VARCHAR},
source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
trigger_time = #{triggerTime,jdbcType=BIGINT},
trigger_status = #{triggerStatus,jdbcType=CHAR},
version_name = #{versionName,jdbcType=VARCHAR},
log_id = #{logId,jdbcType=INTEGER},
run_command = #{runCommand,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>
\ No newline at end of file
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