From 13fdbffdc6bf5c6d264816286a36f5b8274d3a1b Mon Sep 17 00:00:00 2001 From: lcr <977192391@qq.com> Date: Tue, 18 Jun 2024 16:06:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E5=9B=9E=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/domain/bo/JobQueryLogBO.java | 27 ++++++++ .../business/domain/vo/JobQueryLogVO.java | 65 +++++++++++++++++++ .../business/service/IApplyPlanService.java | 7 ++ .../service/impl/ApplyPlanServiceImpl.java | 3 +- .../ruoyi/business/util/YinDaoHttpUtils.java | 22 ++++--- .../java/com/ruoyi/quartz/task/RyTask.java | 4 -- 6 files changed, 115 insertions(+), 13 deletions(-) create mode 100644 ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/JobQueryLogBO.java create mode 100644 ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/JobQueryLogVO.java diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/JobQueryLogBO.java b/ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/JobQueryLogBO.java new file mode 100644 index 0000000..0dc08e3 --- /dev/null +++ b/ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/JobQueryLogBO.java @@ -0,0 +1,27 @@ +package com.ruoyi.business.domain.bo; + +import lombok.Data; + +/** + * 查询运行日志 + * + * @author boyi + * @since 2022/8/26 10:16 + */ +@Data +public class JobQueryLogBO { + + /** + * 计划uuid + */ + private String scheduleUuid; + /** + * 翻页方向 + */ + private String cursorDirection; + /** + * 每页数量 + */ + private Integer size; +} + diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/JobQueryLogVO.java b/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/JobQueryLogVO.java new file mode 100644 index 0000000..4b0c4c2 --- /dev/null +++ b/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/JobQueryLogVO.java @@ -0,0 +1,65 @@ +package com.ruoyi.business.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * 查询job响应 + * + * @author boyi + * @since 2022/8/26 10:17 + */ +@Data +public class JobQueryLogVO { + + /** + * 用于判断继续翻页时是否有数据，可用作翻页按钮置灰操作比如当往下翻页到20页时，第21页没有数据，则在20页时hasData为false，表示不能继续往下翻页，只能往上翻页 + */ + private Boolean hasData; + + + /** + * 往下翻页时，可作为 cursorId 使用，表示从这个id开始往下翻页 + */ + private Long nextId; + + /** + * 往上翻页时，可作为 cursorId 使用，表示从这个id开始往上翻页 + */ + private Long preId; + + /** + * 当前的翻页方向 next表示当前往下翻页 pre表示当前往上翻页 + */ + private String cursorDirection; + + /** + * 日志 + */ + private List dataList; + + /** + * 任务结束运行的时 + + /** + * 应用运行参数 + */ + @Data + public static class DataList { + private String id; + private String jobUuid; + private String status; + private String taskName; + private String robotUuid; + private String robotName; + private String triggerTime; + private String robotClientUuid; + // remark + private String remark; + + } + +} \ No newline at end of file diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/IApplyPlanService.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/IApplyPlanService.java index ecab306..f4bca8a 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/service/IApplyPlanService.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/IApplyPlanService.java @@ -19,19 +19,23 @@ public interface IApplyPlanService extends IService { /** * 更新计划应用执行结果 + * * @param * @return */ void queryAppStartResult() throws IllegalAccessException; + /** * 获取应用执行结果 + * * @return */ boolean execPlan(ApplyStartBO applyStartBO) throws IllegalAccessException; /** * 定时查询指定时间执行的数据 + * * @return */ boolean runAppBySetTime() throws IllegalAccessException; @@ -43,6 +47,7 @@ public interface IApplyPlanService extends IService { /** * 创建计划 + * * @param addApplyPlanBO * @return */ @@ -50,10 +55,12 @@ public interface IApplyPlanService extends IService { /** * 修改计划 + * * @param addApplyPlanBO * @return */ boolean update(AddApplyPlanBO addApplyPlanBO); + /** * 查询应用执行计划管理列表 * diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java index 35819e7..66624cd 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java @@ -12,6 +12,7 @@ import com.ruoyi.business.domain.Apply; import com.ruoyi.business.domain.Rebot; import com.ruoyi.business.domain.ResourceLibrary; import com.ruoyi.business.domain.bo.*; +import com.ruoyi.business.domain.vo.JobQueryLogVO; import com.ruoyi.business.domain.vo.JobQueryVO; import com.ruoyi.business.domain.vo.JobStartVO; import com.ruoyi.business.domain.vo.ListRebotVO; @@ -307,7 +308,7 @@ public class ApplyPlanServiceImpl extends ServiceImpl data = BeanToMapUtil.convertEntityToMap(jobQueryLogBO); + BaseDTO baseDTO = sendPost(QUERY_APP_START_RESULT_LOG, data); + return JSON.parseObject(baseDTO.getData().toString(), JobQueryLogVO.class); + } + /** * 查询应用列表 */ diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java index 193a450..8577f96 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java @@ -71,8 +71,4 @@ public class RyTask { - - - - }