修正前端的BUG

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

@@ -16,6 +16,8 @@ import java.util.List;
 @Repository
 public interface JobTaskRunLogMapper {
 
+ public List<JobTaskRunLogWithBLOBs> findAllByType(@Param("type") Integer type,@Param("jobName") String jobName);
+
   List<JobTaskRunLog> findImmediatelyNode(String nodeName);
     /**
      * 查询没有结束的节点

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

 package com.byit.model.vo;
 
 import com.byit.dto.plugin.JavaTask;
+import com.byit.dto.plugin.JobTaskRunLog;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -9,7 +10,7 @@ import lombok.EqualsAndHashCode;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class JavaTaskLogImportantVo extends JavaTask {
+public class JavaTaskLogImportantVo extends JobTaskRunLog {
     private String rowKey;
     private boolean hasChildren;
 }

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

@@ -14,6 +14,8 @@ import java.util.List;
  **/
 public interface JobTaskRunLogService {
 
+    List<JobTaskRunLogWithBLOBs> findAllByType(Integer type,String jobName);
+
     List<JobTaskRunLog> findImmediatelyNode(String nodeName);
 
     List<RunLogVo> findNodeLogByHandlerName(String handlerName);

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

@@ -2,8 +2,10 @@ package com.byit.service.impl;
 
 import com.byit.dto.plugin.JavaTask;
 import com.byit.mapper.JavaTaskMapper;
+import com.byit.model.JobTaskRunLogWithBLOBs;
 import com.byit.model.vo.JavaTaskLogImportantVo;
 import com.byit.service.JavaTaskService;
+import com.byit.service.JobTaskRunLogService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -17,9 +19,11 @@ import java.util.stream.Collectors;
 @Service
 public class JavaTaskServiceImpl implements JavaTaskService {
     private final JavaTaskMapper javaTaskMapper;
+    private final JobTaskRunLogService jobTaskRunLogService;
 
-    public JavaTaskServiceImpl(JavaTaskMapper javaTaskMapper) {
+    public JavaTaskServiceImpl(JavaTaskMapper javaTaskMapper, JobTaskRunLogService jobTaskRunLogService) {
         this.javaTaskMapper = javaTaskMapper;
+        this.jobTaskRunLogService = jobTaskRunLogService;
     }
 
     @Override
@@ -29,12 +33,12 @@ public class JavaTaskServiceImpl implements JavaTaskService {
 
     @Override
     public List<JavaTaskLogImportantVo> findAllJavaTaskLogImportantVo(String jobName) {
-        List<JavaTask> javaTasks = this.findAll(jobName);
-        return javaTasks.stream().map(javaTask -> {
+        List<JobTaskRunLogWithBLOBs> allByType = jobTaskRunLogService.findAllByType(5, jobName);
+        return allByType.stream().map(javaTaskLog -> {
             JavaTaskLogImportantVo javaTaskLogImportantVo = new JavaTaskLogImportantVo();
             javaTaskLogImportantVo.setRowKey(UUID.randomUUID().toString().replace("-",""));
             javaTaskLogImportantVo.setHasChildren(true);
-            BeanUtils.copyProperties(javaTask,javaTaskLogImportantVo);
+            BeanUtils.copyProperties(javaTaskLog,javaTaskLogImportantVo);
             return javaTaskLogImportantVo;
         }).collect(Collectors.toList());
     }

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

@@ -41,6 +41,12 @@ public class JobTaskRunLogServiceImpl implements JobTaskRunLogService {
     }
 
     @Override
+    public List<JobTaskRunLogWithBLOBs> findAllByType(Integer type,String jobName) {
+
+        return jobTaskRunLogMapper.findAllByType(type,jobName);
+    }
+
+    @Override
     public List<JobTaskRunLog> findImmediatelyNode(String nodeName) {
         return jobTaskRunLogMapper.findImmediatelyNode(nodeName);
     }

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

@@ -62,6 +62,17 @@
           </foreach>
   </select>
 
+  <select id="findAllByType" resultMap="ResultMapWithBLOBs">
+    select
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from job_task_run_log where schedule_type = #{type}
+    <if test="jobName != null and jobName != ''">
+      node_name = #{jobName}
+    </if>
+  </select>
+
   <select id="findImmediatelyNode" resultMap="ResultMapWithBLOBs">
     select
     <include refid="Base_Column_List" />