Merge remote-tracking branch 'origin/liaoning' into liaoning

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;
 }

pqs-system/system-boot/pom.xml

@@ -104,6 +104,17 @@
             <artifactId>algorithm-api</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.njcn.platform</groupId>
+            <artifactId>data-processing-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.njcn.platform</groupId>
+            <artifactId>message-api</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java

@@ -52,10 +52,11 @@ public class PqFrontLogsServiceImpl extends ServiceImpl<PqFrontLogsMapper, PqFro
         if (Objects.nonNull(baseParam.getSearchBeginTime()) && Objects.nonNull(baseParam.getSearchEndTime())) {
             queryWrapper.between("A.Create_Time", baseParam.getSearchBeginTime(), baseParam.getSearchEndTime());
         }
+
         if(Objects.nonNull(baseParam.getSearchValue())){
             queryWrapper.like("A.log",baseParam.getSearchValue());
         }
-
+        queryWrapper.orderByDesc("A.Create_Time");
         Page<PqFrontLogsVO>  page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), queryWrapper);
         page.getRecords().forEach(temp->{
             temp.setLevel(Objects.equals(temp.getLevel(),"terminal")?"设备":"监测点");

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);
+    }
+
+
+}