Commit 13f47729 by huangfusuper

增加运行日志信息

parent c3c0554f
...@@ -2,6 +2,7 @@ package com.byit.api; ...@@ -2,6 +2,7 @@ package com.byit.api;
import com.byit.dto.web.ResponseResult; import com.byit.dto.web.ResponseResult;
import com.byit.model.JobTaskRunLog; import com.byit.model.JobTaskRunLog;
import com.byit.model.JobTaskRunLogWithBLOBs;
import com.byit.service.ApiNodeService; import com.byit.service.ApiNodeService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -43,7 +44,7 @@ public class ApiNodeController { ...@@ -43,7 +44,7 @@ public class ApiNodeController {
@PostMapping("runHistory") @PostMapping("runHistory")
public ResponseResult runHistory(String nodeId){ public ResponseResult runHistory(String nodeId){
List<JobTaskRunLog> jobTaskRunLogList = apiNodeService.runHistory(nodeId); List<JobTaskRunLogWithBLOBs> jobTaskRunLogList = apiNodeService.runHistory(nodeId);
return ResponseResult.ok(jobTaskRunLogList); return ResponseResult.ok(jobTaskRunLogList);
} }
......
package com.byit.service; package com.byit.service;
import com.byit.model.JobTaskRunLog; import com.byit.model.JobTaskRunLog;
import com.byit.model.JobTaskRunLogWithBLOBs;
import java.text.ParseException; import java.text.ParseException;
import java.util.List; import java.util.List;
...@@ -24,7 +25,7 @@ public interface ApiNodeService { ...@@ -24,7 +25,7 @@ public interface ApiNodeService {
* @param nodeId * @param nodeId
* @return * @return
*/ */
List<JobTaskRunLog> runHistory(String nodeId); List<JobTaskRunLogWithBLOBs> runHistory(String nodeId);
/** /**
* 功能描述 自动发布任务的接口 * 功能描述 自动发布任务的接口
......
...@@ -151,12 +151,12 @@ public class ApiNodeServiceImpl implements ApiNodeService { ...@@ -151,12 +151,12 @@ public class ApiNodeServiceImpl implements ApiNodeService {
} }
@Override @Override
public List<JobTaskRunLog> runHistory(String nodeId) { public List<JobTaskRunLogWithBLOBs> runHistory(String nodeId) {
ValidationUtil.dataNotBank(nodeId, "nodeId不允许为空!"); ValidationUtil.dataNotBank(nodeId, "nodeId不允许为空!");
String runId = "REAL:EXEC:" + nodeId; String runId = "REAL:EXEC:" + nodeId;
List<JobTaskRunLog> jobTaskRunLogList = jobTaskRunLogMapper.findByRunId(runId); List<JobTaskRunLogWithBLOBs> jobTaskRunLogList = jobTaskRunLogMapper.findByRunId(runId);
return jobTaskRunLogList; return jobTaskRunLogList;
} }
...@@ -220,6 +220,7 @@ public class ApiNodeServiceImpl implements ApiNodeService { ...@@ -220,6 +220,7 @@ public class ApiNodeServiceImpl implements ApiNodeService {
JavaTask oldJavaTask = javaTaskMapper.findByJobName(javaTask.getJobName()); JavaTask oldJavaTask = javaTaskMapper.findByJobName(javaTask.getJobName());
ValidationUtil.dataNotNull(oldJavaTask,javaTask.getJobName() + "的任务不存在!"); ValidationUtil.dataNotNull(oldJavaTask,javaTask.getJobName() + "的任务不存在!");
javaTask.setUpdateTime(new Date()); javaTask.setUpdateTime(new Date());
javaTaskMapper.updateByJobName(javaTask); javaTaskMapper.updateByJobName(javaTask);
} }
......
...@@ -117,7 +117,7 @@ public interface JobTaskRunLogMapper { ...@@ -117,7 +117,7 @@ public interface JobTaskRunLogMapper {
* @param runId * @param runId
* @return * @return
*/ */
List<JobTaskRunLog> findByRunId(String runId); List<JobTaskRunLogWithBLOBs> findByRunId(String runId);
/** /**
* 查询运行汇总 * 查询运行汇总
......
...@@ -169,6 +169,11 @@ public class JobTaskRunLog implements Serializable { ...@@ -169,6 +169,11 @@ public class JobTaskRunLog implements Serializable {
private String logFileName; private String logFileName;
/** /**
* 运行数据
*/
private String runMsg;
/**
* 是否上级运行成功时运行(0 是 1 否) * 是否上级运行成功时运行(0 是 1 否)
*/ */
@ApiModelProperty("是否上级运行成功时运行(0 是 1 否)") @ApiModelProperty("是否上级运行成功时运行(0 是 1 否)")
......
...@@ -121,8 +121,10 @@ ...@@ -121,8 +121,10 @@
where run_id = #{runId} and flow_name = #{flowName} where run_id = #{runId} and flow_name = #{flowName}
</select> </select>
<select id="findByRunId" resultMap="BaseResultMap"> <select id="findByRunId" resultMap="ResultMapWithBLOBs">
select <include refid="Base_Column_List"/> select <include refid="Base_Column_List"/>
,
<include refid="Blob_Column_List" />
from job_task_run_log from job_task_run_log
where run_id = #{runId} where run_id = #{runId}
order by trigger_time desc order by trigger_time desc
......
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