From 026d71a060b685e1eac45d198d17ab657f95bf0b Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Fri, 5 Sep 2025 15:58:58 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9A=82=E9=99=8D=E5=90=8C=E6=AD=A5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/influx/bo/po/OracleRmpEventDetailPO.java  |  2 +-
 .../java/com/njcn/influx/bo/po/RmpEventDetailPO.java   |  2 +-
 .../java/com/njcn/influx/config/IdMappingCache.java    |  4 +++-
 .../impl/OracleEventDetailToMysqlServiceImpl.java      | 10 +++++-----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleRmpEventDetailPO.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleRmpEventDetailPO.java
index b5da466..1f6c763 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleRmpEventDetailPO.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleRmpEventDetailPO.java
@@ -96,7 +96,7 @@ public class OracleRmpEventDetailPO implements Serializable {
      * 处理结果第一条事件发生时间(读comtra文件获取)
      */
     @TableField(value = "FIRSTTIME")
-    private Date firstTime;
+    private LocalDateTime firstTime;
 
     /**
      * 处理结果第一条事件暂降类型（字典表PQS_Dicdata）
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/RmpEventDetailPO.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/RmpEventDetailPO.java
index bcbcb86..9f63cbf 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/RmpEventDetailPO.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/RmpEventDetailPO.java
@@ -94,7 +94,7 @@ public class RmpEventDetailPO implements Serializable {
      * 处理结果第一条事件发生时间(读comtra文件获取)
      */
     @TableField(value = "first_time")
-    private Date firstTime;
+    private LocalDateTime firstTime;
 
     /**
      * 处理结果第一条事件暂降类型（字典表PQS_Dicdata）
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/config/IdMappingCache.java b/influx-data/influx-source/src/main/java/com/njcn/influx/config/IdMappingCache.java
index 4aaba2f..2cae928 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/config/IdMappingCache.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/config/IdMappingCache.java
@@ -9,6 +9,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,7 +32,7 @@ public class IdMappingCache {
     @Autowired
     private RedisUtil redisUtil;
 
-
+    public static   List<Integer> oracleIds = new ArrayList<>();
     @PostConstruct
     public void init() {
         Map<String, String> DevIdMapping = new HashMap<>();
@@ -40,6 +41,7 @@ public class IdMappingCache {
         for (PqLineBak row : resultList) {
             String id = row.getId();
             String lineId = row.getLineId();
+            oracleIds.add(Integer.valueOf(lineId));
             LineIdMapping.put(lineId,id );
         }
         redisUtil.saveByKey("LineIdMapping",LineIdMapping);
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleEventDetailToMysqlServiceImpl.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleEventDetailToMysqlServiceImpl.java
index 3f81ff9..d435b03 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleEventDetailToMysqlServiceImpl.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleEventDetailToMysqlServiceImpl.java
@@ -16,10 +16,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -78,7 +75,10 @@ public class OracleEventDetailToMysqlServiceImpl extends ServiceImpl<RmpEventDet
                 po.setNum(oracleDetail.getNum());
                 po.setFileFlag(oracleDetail.getFileFlag());
                 po.setDealFlag(oracleDetail.getDealFlag());
-                po.setFirstTime(oracleDetail.getFirstTime());
+
+                if(Objects.nonNull(oracleDetail.getFirstTime())) {
+                    po.setFirstTime(oracleDetail.getFirstTime().plus(oracleDetail.getFirstMs().intValue(), ChronoUnit.MILLIS));
+                }
                 po.setFirstType(oracleDetail.getFirstType());
                 po.setFirstMs(oracleDetail.getFirstMs());
                 po.setEnergy(oracleDetail.getEnergy());