增加运行日志信息

byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowServiceImpl.java

@@ -742,7 +742,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         ValidationUtil.dataNotNull(runRecording, "运行实例不存在！");
         RunRecordingVo runRecordingVo = new RunRecordingVo();
         BeanUtils.copyProperties(runRecording, runRecordingVo);
-        List<JobTaskRunLog> jobTaskRunLogList = jobTaskRunLogMapper.findByRunIdAndFlowName(runRecording.getRunId(), flowName);
+        List<JobTaskRunLogWithBLOBs> jobTaskRunLogList = jobTaskRunLogMapper.findByRunIdAndFlowName(runRecording.getRunId(), flowName);
         runRecordingVo.setJobTaskRunLogList(jobTaskRunLogList);
 
         return runRecordingVo;

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/JobTaskRunLogMapper.java

@@ -102,7 +102,7 @@ public interface JobTaskRunLogMapper {
     * @param nodeName
     * @return
     */
-    JobTaskRunLog findByRunIdAndFlowAndNode(@Param("runId")String runId, @Param("flowName")String flowName, @Param("nodeName")String nodeName);
+   JobTaskRunLogWithBLOBs findByRunIdAndFlowAndNode(@Param("runId")String runId, @Param("flowName")String flowName, @Param("nodeName")String nodeName);
 
     /**
      * 根据runid和flowname获取运行记录
@@ -110,7 +110,7 @@ public interface JobTaskRunLogMapper {
      * @param flowName
      * @return
      */
-    List<JobTaskRunLog> findByRunIdAndFlowName(@Param("runId")String runId, @Param("flowName")String flowName);
+    List<JobTaskRunLogWithBLOBs> findByRunIdAndFlowName(@Param("runId")String runId, @Param("flowName")String flowName);
 
     /**
      * 根据runid获取所有的运行任务

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/vo/RunRecordingVo.java

 package com.byit.model.vo;
 
 import com.byit.model.JobTaskRunLog;
+import com.byit.model.JobTaskRunLogWithBLOBs;
 import com.byit.model.RunRecording;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,6 +17,6 @@ import java.util.List;
 public class RunRecordingVo extends RunRecording {
 
     @ApiModelProperty("运行实例下的运行任务日志")
-    private List<JobTaskRunLog> jobTaskRunLogList;
+    private List<JobTaskRunLogWithBLOBs> jobTaskRunLogList;
 
 }

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/impl/FlowServiceImpl.java

@@ -365,14 +365,14 @@ public class FlowServiceImpl implements FlowService {
         String nodeName = jsonpObject.getString("nodeName");
         ValidationUtil.dataNotBank(nodeName, "节点名称不允许为空！");
         Boolean result = true;
-        JobTaskRunLog jobTaskRunLog = jobTaskRunLogMapper.findByRunIdAndFlowAndNode(runId, flowName, nodeName);
+        JobTaskRunLogWithBLOBs jobTaskRunLog = jobTaskRunLogMapper.findByRunIdAndFlowAndNode(runId, flowName, nodeName);
         ValidationUtil.dataNotNull(jobTaskRunLog, "不存在【" + flowName + "】下节点【" + nodeName + "】的运行日志,或尚未开始调度!");
         ValidationUtil.isTrueValidation(!"0".equals(jobTaskRunLog.getRunCode()), "该任务已经运行结束！");
         if (FlowPropertyEnum.IS_INNER.getCode().equals(jobTaskRunLog.getIsVirtual())){
             runRecordingMapper.killInnerFlow(runId, flowName);
-            List<JobTaskRunLog> jobTaskRunLogList = jobTaskRunLogMapper.findByRunIdAndFlowName(runId, flowName);
+            List<JobTaskRunLogWithBLOBs> jobTaskRunLogList = jobTaskRunLogMapper.findByRunIdAndFlowName(runId, flowName);
             ValidationUtil.dataNotNull(jobTaskRunLogList, "该任务尚未开始调度");
-            for (JobTaskRunLog innerJobTaskRunLog : jobTaskRunLogList){
+            for (JobTaskRunLogWithBLOBs innerJobTaskRunLog : jobTaskRunLogList){
                 if (!"0".equals(innerJobTaskRunLog.getRunCode())){
                     if (StringUtils.isEmpty(innerJobTaskRunLog.getJobGroupIp())){
                         log.warn("已经调度成功但是还未返回具体的调用机器的ip地址");

byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskRunLogMapper.xml

@@ -108,15 +108,19 @@
     where node_id = #{nodeId} and run_id = #{runId}
   </select>
 
-  <select id="findByRunIdAndFlowAndNode" resultMap="BaseResultMap">
+  <select id="findByRunIdAndFlowAndNode" resultMap="ResultMapWithBLOBs">
     select <include refid="Base_Column_List"/>
+    ,
+    <include refid="Blob_Column_List" />
     from job_task_run_log
     where run_id = #{runId} and flow_name = #{flowName}
           and node_name = #{nodeName}
   </select>
 
-  <select id="findByRunIdAndFlowName" resultMap="BaseResultMap">
+  <select id="findByRunIdAndFlowName" resultMap="ResultMapWithBLOBs">
     select <include refid="Base_Column_List"/>
+    ,
+    <include refid="Blob_Column_List" />
     from job_task_run_log
     where run_id = #{runId} and flow_name = #{flowName}
   </select>