diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqDashboardPageServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqDashboardPageServiceImpl.java index 0d2180256..79261351b 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqDashboardPageServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqDashboardPageServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -82,8 +83,9 @@ public class PqDashboardPageServiceImpl extends ServiceImpl userList = Arrays.asList("0",RequestUtil.getUserIndex()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PqDashboardPage::getPagePath,pagePath); + queryWrapper.eq(PqDashboardPage::getPagePath,pagePath).in(PqDashboardPage::getUserId,userList); PqDashboardPage result = this.getOne(queryWrapper); if (Objects.isNull(result)) { return null; diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/cld/CldMeasurementTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/cld/CldMeasurementTaskRunner.java new file mode 100644 index 000000000..aa09e18ff --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/cld/CldMeasurementTaskRunner.java @@ -0,0 +1,40 @@ +package com.njcn.system.timer.tasks.cld; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.njcn.algorithm.pojo.bo.BaseParam; +import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient; +import com.njcn.system.timer.TimerTaskRunner; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * 类的介绍:物联监测点算法执行链定时任务 + * + * @author xuyang + * @version 1.0.0 + * @createTime 2025/11/11 + */ +@Component +@RequiredArgsConstructor +public class CldMeasurementTaskRunner implements TimerTaskRunner { + + private final LiteFlowAlgorithmFeignClient liteFlowAlgorithmFeignClient; + + @Override + public void action(String date) { + BaseParam baseParam = new BaseParam(); + baseParam.setFullChain(true); + baseParam.setRepair(false); + // 物联平台 + baseParam.setType(2); + if(StrUtil.isBlank(date)){ + baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); + }else { + baseParam.setDataDate(date); + } + liteFlowAlgorithmFeignClient.wlMeasurementPointExecutor(baseParam); + } + +}