diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/PqFrontLogsVO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/PqFrontLogsVO.java index b712abd7f..2df32a904 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/PqFrontLogsVO.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/PqFrontLogsVO.java @@ -18,13 +18,21 @@ public class PqFrontLogsVO extends BaseEntity { @TableId(value = "id", type = IdType.ASSIGN_UUID) private String id; private String nodeId; + //进程号 private String processNo; + //业务id private String businessId; + //业务名称 private String businessName; + //业务等级 private String level; + //日志类型 private String logType; + //日志级别 private String grade; + //前置业务类型 private String frontType; + //日志详情 private String log; private Integer state; } diff --git a/pqs-system/system-boot/pom.xml b/pqs-system/system-boot/pom.xml index fbabd65c1..34fc2af72 100644 --- a/pqs-system/system-boot/pom.xml +++ b/pqs-system/system-boot/pom.xml @@ -104,6 +104,17 @@ algorithm-api 1.0.0 + + com.njcn.platform + data-processing-api + 1.0.0 + + + com.njcn.platform + message-api + 1.0.0 + compile + diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java index 7b58ba68e..7c4eab6e9 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java @@ -52,10 +52,11 @@ public class PqFrontLogsServiceImpl extends ServiceImpl page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), queryWrapper); page.getRecords().forEach(temp->{ temp.setLevel(Objects.equals(temp.getLevel(),"terminal")?"设备":"监测点"); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/DataRecallTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/DataRecallTaskRunner.java new file mode 100644 index 000000000..917fb0f40 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/DataRecallTaskRunner.java @@ -0,0 +1,46 @@ +package com.njcn.system.timer.tasks; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.StrUtil; +import com.njcn.algorithm.pojo.bo.BaseParam; +import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient; +import com.njcn.dataProcess.api.DataRecallFeignClient; +import com.njcn.message.message.RecallMessage; +import com.njcn.system.timer.TimerTaskRunner; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +import java.time.LocalDate; + +/** + * 类的介绍:装置算法执行链定时任务 + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/12/6 9:35 + */ +@Component +@RequiredArgsConstructor +public class DataRecallTaskRunner implements TimerTaskRunner { + + private final DataRecallFeignClient dataRecallFeignClient; + + @Override + public void action(String date) { + RecallMessage baseParam = new RecallMessage(); + + if(StrUtil.isBlank(date)){ + baseParam.setReCallStartTime(LocalDate.now().minusDays(1)); + baseParam.setReCallEndTime(LocalDate.now()); + }else { + LocalDate localDate = LocalDateTimeUtil.parseDate(date,DatePattern.NORM_DATE_FORMATTER); + baseParam.setReCallStartTime(localDate); + baseParam.setReCallEndTime(localDate.plusDays(1)); + } + dataRecallFeignClient.recall(baseParam); + } + + +}