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 879d831..acf8566 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 @@ -12,12 +12,13 @@ import com.njcn.param.LineCountEvaluateParam; import com.njcn.po.influx.DataV; import com.njcn.migration.read.util.TimeUtil; import com.njcn.po.influx.PqsCommunicate; +import com.njcn.po.mysql.DevTimeDto; +import com.njcn.po.mysql.LineTimeDto; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -131,33 +132,31 @@ public class MigrationServiceImpl implements MigrationService { public void initializeExcel() { File file = new File("/usr/local/jar/sj.xlsx"); Map map = TimeUtil.getLineMap(); - List lineExcel = new ArrayList<>(); + List lineExcel = new ArrayList<>(); map.forEach((line,value)->{ - DataV data=new DataV(); + LineTimeDto data=new LineTimeDto(); data.setLineId(line); - data.setTimeId(value); + data.setTimeData(value); lineExcel.add(data); }); Map devmap = TimeUtil.getDevMap(); - List devExcel = new ArrayList<>(); + List devExcel = new ArrayList<>(); devmap.forEach((line,value)->{ - PqsCommunicate data=new PqsCommunicate(); + DevTimeDto data=new DevTimeDto(); data.setDevId(line); - data.setTimeId(value); + data.setTimeData(value); devExcel.add(data); }); ExcelWriter excelWriter = EasyExcel.write(file).build(); //模板1 - WriteSheet writeSheet = EasyExcel.writerSheet(0, "line" ).head(DataV.class) - .includeColumnFiledNames(Arrays.asList("lineId","timeId")) + WriteSheet writeSheet = EasyExcel.writerSheet(0, "line" ).head(LineTimeDto.class) .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) .build(); excelWriter.write(lineExcel, writeSheet); //模板2 - WriteSheet writeSheet2 = EasyExcel.writerSheet(1, "dev" ).head(PqsCommunicate.class) - .includeColumnFiledNames(Arrays.asList("devId","timeId")) + WriteSheet writeSheet2 = EasyExcel.writerSheet(1, "dev" ).head(DevTimeDto.class) .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) .build(); excelWriter.write(devExcel, writeSheet2); diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TimeUtil.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TimeUtil.java index ebcabe9..f9d89aa 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TimeUtil.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TimeUtil.java @@ -79,7 +79,7 @@ public class TimeUtil { } @PostConstruct - public void init() throws IOException { + public void init() { File file = new File("/usr/local/jar/sj.xlsx"); List excelDataV = EasyExcel.read(file) .head(LineTimeDto.class) @@ -119,15 +119,13 @@ public class TimeUtil { ExcelWriter excelWriter = EasyExcel.write(file).build(); //模板1 - WriteSheet writeSheet = EasyExcel.writerSheet(0, "line").head(DataV.class) - .includeColumnFiledNames(Arrays.asList("lineId", "timeData")) + WriteSheet writeSheet = EasyExcel.writerSheet(0, "line").head(LineTimeDto.class) .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) .build(); excelWriter.write(excelDataV, writeSheet); //模板2 - WriteSheet writeSheet2 = EasyExcel.writerSheet(1, "dev").head(PqsCommunicate.class) - .includeColumnFiledNames(Arrays.asList("devId", "timeData")) + WriteSheet writeSheet2 = EasyExcel.writerSheet(1, "dev").head(DevTimeDto.class) .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) .build(); excelWriter.write(excelCommunicates, writeSheet2);