From 6267d4a377eb61103d899e3f77f96c77be594e5d Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期三, 07 五月 2025 10:00:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointArchivingTaskNet1h.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointArchivingTaskNet1h.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointArchivingTaskNet1h.java index 27bac8f..926d419 100644 --- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointArchivingTaskNet1h.java +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointArchivingTaskNet1h.java @@ -1,10 +1,10 @@ package com.iailab.module.data.job.task; import com.iailab.module.data.common.enums.ArcTypeEnum; -import com.iailab.module.data.point.collection.PointCollector; -import com.iailab.module.data.point.service.ArcPointDataService; +import com.iailab.module.data.arc.service.ArcDataService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.time.LocalDateTime; @@ -15,19 +15,21 @@ * @author: dyk * @date: 2025/2/20 16:30 **/ +@Component("pointArchivingTaskNet1h") public class PointArchivingTaskNet1h implements ITask { private Logger logger = LoggerFactory.getLogger(getClass()); - private final String NET = "1h"; - @Resource - private ArcPointDataService arcPointDataService; + private ArcDataService arcPointDataService; @Override public void run(String params){ logger.debug("PointArchivingTaskNet1h定时任务正在执行,参数为:{}", params); try { - arcPointDataService.archiving(ArcTypeEnum.HOUR.getCode()); + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.MILLISECOND, 0); + calendar.set(Calendar.SECOND, 0); + arcPointDataService.archiving(ArcTypeEnum.HOUR.getCode(), calendar); logger.info("PointArchivingTaskNet1h定时任务完成时间:" + LocalDateTime.now()); } catch (Exception ex) { ex.printStackTrace(); -- Gitblit v1.9.3