From 5007dda683309b75bb89c90e8385c344b693c275 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Mon, 28 Apr 2025 13:32:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../read/job/MigrationInfluxDBJob.java | 43 +++++++++---------- .../read/service/MigrationService.java | 3 +- .../service/impl/MigrationServiceImpl.java | 4 +- 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/job/MigrationInfluxDBJob.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/job/MigrationInfluxDBJob.java index a8f9ee9..6051a55 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/job/MigrationInfluxDBJob.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/job/MigrationInfluxDBJob.java @@ -4,20 +4,19 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import com.alibaba.excel.EasyExcel; -import com.njcn.migration.read.service.IDataV; -import com.njcn.migration.read.service.IPqsCommunicate; +import com.njcn.migration.read.mapper.RmpEventDetailMapper; import com.njcn.migration.read.service.MigrationService; import com.njcn.migration.read.util.TimeUtil; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataV; -import com.njcn.po.influx.PqsCommunicate; +import com.njcn.po.mysql.DevTimeDto; +import com.njcn.po.mysql.LineTimeDto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.core.io.ClassPathResource; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import java.io.File; import java.io.IOException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -41,9 +40,7 @@ public class MigrationInfluxDBJob { private final MigrationService migrationService; - private final IDataV dataV; - private final IPqsCommunicate communicate; - + private final RmpEventDetailMapper detailMapper; @Scheduled(cron = "0 2 * * * ?") public void InfluxDBJob() { // 获取当前时间 @@ -65,33 +62,33 @@ public class MigrationInfluxDBJob { @Scheduled(cron = "0 0 22 * * ?") public void mapJob() throws IOException { - ClassPathResource picPathResource = new ClassPathResource("file/sj.xlsx"); - List excelDataV = EasyExcel.read(picPathResource.getFile()) - .head(DataV.class) + File file = new File("/usr/local/jar/sj.xlsx"); + List excelDataV = EasyExcel.read(file) + .head(LineTimeDto.class) .sheet(0).doReadSync(); - List datav = dataV.listDataVDesc(new LineCountEvaluateParam()); + List datav = detailMapper.getLineTime(); if (CollUtil.isNotEmpty(excelDataV)) { //获取最新监测点最新数据集合 - List ids = excelDataV.stream().map(DataV::getLineId).collect(Collectors.toList()); - List notExcel = datav.stream().filter(x -> !ids.contains(x.getLineId())).collect(Collectors.toList()); + List ids = excelDataV.stream().map(LineTimeDto::getLineId).collect(Collectors.toList()); + List notExcel = datav.stream().filter(x -> !ids.contains(x.getLineId())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(notExcel)) { - for (DataV v : notExcel) { - TimeUtil.putLineTime(v.getLineId(), DateUtil.format(DateUtil.beginOfDay(DateUtil.parse(v.getTimeId(), DatePattern.NORM_DATETIME_FORMAT)), DatePattern.NORM_DATETIME_FORMAT)); + for (LineTimeDto v : notExcel) { + TimeUtil.putLineTime(v.getLineId(), DateUtil.format(DateUtil.beginOfDay(DateUtil.parse(v.getTimeData(), DatePattern.NORM_DATETIME_FORMAT)), DatePattern.NORM_DATETIME_FORMAT)); } } } - List excelCommunicates = EasyExcel.read(picPathResource.getFile()) - .head(PqsCommunicate.class) + List excelCommunicates = EasyExcel.read(file) + .head(DevTimeDto.class) .sheet(1).doReadSync(); - List communicates = communicate.listPqsCommunicateDesc(new LineCountEvaluateParam()); + List communicates = detailMapper.getDevTime(); if (CollUtil.isNotEmpty(excelCommunicates)) { //获取最新监测点最新数据集合 - List ids = excelCommunicates.stream().map(PqsCommunicate::getDevId).collect(Collectors.toList()); - List notExcel = communicates.stream().filter(x -> !ids.contains(x.getDevId())).collect(Collectors.toList()); + List ids = excelCommunicates.stream().map(DevTimeDto::getDevId).collect(Collectors.toList()); + List notExcel = communicates.stream().filter(x -> !ids.contains(x.getDevId())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(notExcel)) { - for (PqsCommunicate v : notExcel) { - TimeUtil.putDevTime(v.getDevId(), DateUtil.format(DateUtil.beginOfDay(DateUtil.parse(v.getTimeId(), DatePattern.NORM_DATETIME_FORMAT)), DatePattern.NORM_DATETIME_FORMAT)); + for (DevTimeDto v : notExcel) { + TimeUtil.putDevTime(v.getDevId(), DateUtil.format(DateUtil.beginOfDay(DateUtil.parse(v.getTimeData(), DatePattern.NORM_DATETIME_FORMAT)), DatePattern.NORM_DATETIME_FORMAT)); } } } diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/MigrationService.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/MigrationService.java index 45f18f7..de86d4e 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/MigrationService.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/MigrationService.java @@ -2,7 +2,6 @@ package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; -import java.io.IOException; /** * @author wr @@ -15,7 +14,7 @@ public interface MigrationService { void hourseDevDataBacthSysc(LineCountEvaluateParam param); - void initializeExcel() throws IOException; + void initializeExcel(); } diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/MigrationServiceImpl.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/MigrationServiceImpl.java index 7a4937a..879d831 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/MigrationServiceImpl.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/MigrationServiceImpl.java @@ -128,7 +128,7 @@ public class MigrationServiceImpl implements MigrationService { @Override @Async("asyncInfluxDBExecutor") - public void initializeExcel() throws IOException { + public void initializeExcel() { File file = new File("/usr/local/jar/sj.xlsx"); Map map = TimeUtil.getLineMap(); List lineExcel = new ArrayList<>(); @@ -139,7 +139,7 @@ public class MigrationServiceImpl implements MigrationService { lineExcel.add(data); }); - Map devmap = TimeUtil.getLineMap(); + Map devmap = TimeUtil.getDevMap(); List devExcel = new ArrayList<>(); devmap.forEach((line,value)->{ PqsCommunicate data=new PqsCommunicate();