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 oracleIds = new ArrayList<>(); @PostConstruct public void init() { Map 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