diff --git a/README.md b/README.md index 87b8e91..d3abc4a 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,5 @@ data-processing 数据处理模块,主要用于对外提供数据,以及 message 消息处理模块,主要用于处理各类消息。 analysis 数据解析模块,用来解析装置上送的各类数据。 algorithm 算法模块,用来计算装置数据、业务数据。 -log 日志模块,用来存储各类日志。 \ No newline at end of file +log 日志模块,用来存储各类日志。 +migration influxdb迁移模块。 \ No newline at end of file diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java index 6b7b63a..296c8ed 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java @@ -1,21 +1,10 @@ package com.njcn.migration.read.controller; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.CharsetUtil; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.write.metadata.WriteSheet; -import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; -import com.njcn.migration.read.service.IDataV; -import com.njcn.migration.read.service.IPqsCommunicate; -import com.njcn.migration.read.util.TimeUtil; import com.njcn.param.LineCountEvaluateParam; import com.njcn.migration.read.service.MigrationService; -import com.njcn.po.influx.DataV; -import com.njcn.po.influx.PqsCommunicate; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -33,11 +22,6 @@ import java.time.LocalDateTime; import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** @@ -56,8 +40,8 @@ import java.util.stream.Collectors; public class MigrationInfluxDBController { private final MigrationService migrationService; - private final IDataV dataV; - private final IPqsCommunicate communicate; + + @GetMapping("/influxdb") @ApiOperation("influxdb数据同步->天数按小时进行分组同步") @ApiImplicitParams({ @@ -93,8 +77,8 @@ public class MigrationInfluxDBController { @GetMapping(value = "/importExcel",produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) @ApiOperation(value ="获取最新数据信息文件", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) public void importDistributionAreaExcel(HttpServletResponse response) throws IOException { - ClassPathResource picPathResource = new ClassPathResource("file/sj.xlsx"); migrationService.initializeExcel(); + ClassPathResource picPathResource = new ClassPathResource("file/sj.xlsx"); response.setHeader("Content-Disposition", "attachment;filename="+ URLEncoder.encode("最新数据信息.xlsx", CharsetUtil.UTF_8)); // 输出文件内容 InputStream fileInputStream = picPathResource.getInputStream(); 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 7e6eaa4..a8f9ee9 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 @@ -95,7 +95,7 @@ public class MigrationInfluxDBJob { } } } - + migrationService.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 c543efc..795e964 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 @@ -93,6 +93,7 @@ public class MigrationServiceImpl implements MigrationService { TimeUtil.putLineTime(lineId,format); } }); + System.gc(); } @Override @@ -122,6 +123,7 @@ public class MigrationServiceImpl implements MigrationService { TimeUtil.putDevTime(lineId,format); } }); + System.gc(); } @Override