增加查询标识

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

@@ -60,19 +60,24 @@ public class ApiFlowStatusServiceImpl implements ApiFlowStatusService {
                     FlowEntityCoreDto flowEntityCoreDto = new FlowEntityCoreDto();
                     flowEntityCoreDto.setFlowName(jobStatus.getJobName());
                     flowEntityCoreDto.setScheduleType(jobStatus.getScheduleType().getCode());
+                    if(StringUtils.isNoneBlank(jobStatus.getHasMark())) {
+                        flowEntityCoreDto.setStartTime(0L);
+                        flowEntityCoreDto.setEndTime(999999999999999L);
+                    }else{
+                        flowEntityCoreDto.setStartTime(DateUtil.getThisDayStartDate().getTime());
+                        flowEntityCoreDto.setEndTime(DateUtil.getThisDayEndDate().getTime());
+                    }
                     return flowEntityCoreDto;
                 }).collect(Collectors.toList());
                 flowStatusCoreDto.setFlowEntityCoreDtos(flowEntityCoreDtos);
                 //查询对应条件的实例
 
-                if(flowStatusCoreDto != null) {
-                    List<RunRecording> byFlowNameAndTypeAndWId = runRecordingMapper.findByFlowNameAndTypeAndWId(flowStatusCoreDto);
+                if(CollectionUtil.isNotEmpty(flowStatusCoreDto.getFlowEntityCoreDtos() )) {
+                    List<RunRecording> byFlowName = runRecordingMapper.findByFlowNameAndTypeAndWId(flowStatusCoreDto);
 
-                    if(CollectionUtil.isNotEmpty(byFlowNameAndTypeAndWId)) {
-                        //筛选当天数据
-                        List<RunRecording> collect = byFlowNameAndTypeAndWId.stream().filter(byFlowName -> byFlowName.getTriggerTime() > DateUtil.getThisDayStartDate().getTime() && byFlowName.getTriggerTime() <= DateUtil.getThisDayEndDate().getTime()).collect(Collectors.toList());
-                        if(CollectionUtil.isNotEmpty(collect)) {
-                            collect.forEach(byFlowNameAndType ->{
+                    if(CollectionUtil.isNotEmpty(byFlowName)) {
+                        if(CollectionUtil.isNotEmpty(byFlowName)) {
+                            byFlowName.forEach(byFlowNameAndType ->{
                                 JobStatusResultDto jobStatusResultDto = new JobStatusResultDto();
                                 jobStatusResultDto.setFindDateTime(System.currentTimeMillis());
                                 Date endTime = byFlowNameAndType.getEndTime();

byit-myth-core/myth-admin-core/src/main/java/com/byit/dto/FlowEntityCoreDto.java

@@ -16,4 +16,8 @@ import java.io.Serializable;
 public class FlowEntityCoreDto implements Serializable {
     private String flowName;
     private Integer  scheduleType;
+
+    private Long startTime;
+
+    private Long endTime;
 }

byit-myth-core/myth-admin-core/src/main/java/com/byit/dto/FlowStatusCoreDto.java

@@ -18,6 +18,10 @@ import java.util.List;
 public class FlowStatusCoreDto implements Serializable {
 
     private Integer workspaceId;
+    /**
+     * 查询全部的标记
+     */
+    private String hasMark;
 
     private List<FlowEntityCoreDto> flowEntityCoreDtos;
 

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

@@ -212,6 +212,7 @@
           <if test="flowStatusCoreDtos != null">
             <foreach collection="flowStatusCoreDtos.flowEntityCoreDtos" item="flowEntityCoreDto" separator=" or " open="(" close=")">
               flow_name = #{flowEntityCoreDto.flowName} and schedule_type = #{flowEntityCoreDto.scheduleType}
+              and trigger_time &gt;= #{flowEntityCoreDto.startTime} and trigger_time &lt;= #{flowEntityCoreDto.endTime}
             </foreach>
             and workspace_id = #{flowStatusCoreDtos.workspaceId}
           </if>

byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/api/JavaCallbackLogDto.java

@@ -20,4 +20,6 @@ public class JavaCallbackLogDto implements Serializable {
 
     private String logId;
     private ReturnResult returnResult;
+
+    private String hasAllReturnOne;
 }

byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/plugin/JobStatusDto.java

@@ -29,4 +29,9 @@ public class JobStatusDto implements Serializable {
      * 调度类型
      */
     private ScheduleTypeEnum scheduleType;
+
+    /**
+     * 是否查询全部的标记
+     */
+    private String hasMark;
 }

byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/plugin/JobStatusResultDto.java

@@ -38,4 +38,9 @@ public class JobStatusResultDto implements Serializable {
      */
     private boolean runIng;
 
+    /**
+     * 是否查询全部
+     */
+    private String hasReturnAllOneMark;
+
 }