From bb061305db626e2aca73b110b251ec2fb49bf631 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Mon, 28 Apr 2025 14:27:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E5=87=BAexcel?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MigrationServiceImpl.java    | 21 +++++++++----------
 .../njcn/migration/read/util/TimeUtil.java    |  8 +++----
 2 files changed, 13 insertions(+), 16 deletions(-)

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<String, String> map = TimeUtil.getLineMap();
-        List<DataV> lineExcel = new ArrayList<>();
+        List<LineTimeDto> 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<String, String> devmap = TimeUtil.getDevMap();
-        List<PqsCommunicate> devExcel = new ArrayList<>();
+        List<DevTimeDto> 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<LineTimeDto> 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);