Other/data-migration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.暂降同步调整

Browse Source
This commit is contained in:
chendaofei
2025-09-05 15:58:58 +08:00
parent b43728e154
commit 026d71a060
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleRmpEventDetailPO.java
View File

@@ -96,7 +96,7 @@ public class OracleRmpEventDetailPO implements Serializable {
* 处理结果第一条事件发生时间(读comtra文件获取) * 处理结果第一条事件发生时间(读comtra文件获取)
*/ */
@TableField(value = "FIRSTTIME") @TableField(value = "FIRSTTIME")
private Date firstTime; private LocalDateTime firstTime;
/** /**
* 处理结果第一条事件暂降类型（字典表PQS_Dicdata） * 处理结果第一条事件暂降类型（字典表PQS_Dicdata）

2
influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/RmpEventDetailPO.java
View File

@@ -94,7 +94,7 @@ public class RmpEventDetailPO implements Serializable {
* 处理结果第一条事件发生时间(读comtra文件获取) * 处理结果第一条事件发生时间(读comtra文件获取)
*/ */
@TableField(value = "first_time") @TableField(value = "first_time")
private Date firstTime; private LocalDateTime firstTime;
/** /**
* 处理结果第一条事件暂降类型（字典表PQS_Dicdata） * 处理结果第一条事件暂降类型（字典表PQS_Dicdata）

4
influx-data/influx-source/src/main/java/com/njcn/influx/config/IdMappingCache.java
View File

@@ -9,6 +9,7 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -31,7 +32,7 @@ public class IdMappingCache {
@Autowired @Autowired
private RedisUtil redisUtil; private RedisUtil redisUtil;
public static List<Integer> oracleIds = new ArrayList<>();
@PostConstruct @PostConstruct
public void init() { public void init() {
Map<String, String> DevIdMapping = new HashMap<>(); Map<String, String> DevIdMapping = new HashMap<>();
@@ -40,6 +41,7 @@ public class IdMappingCache {
for (PqLineBak row : resultList) { for (PqLineBak row : resultList) {
String id = row.getId(); String id = row.getId();
String lineId = row.getLineId(); String lineId = row.getLineId();
oracleIds.add(Integer.valueOf(lineId));
LineIdMapping.put(lineId,id ); LineIdMapping.put(lineId,id );
} }
redisUtil.saveByKey("LineIdMapping",LineIdMapping); redisUtil.saveByKey("LineIdMapping",LineIdMapping);

10
influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleEventDetailToMysqlServiceImpl.java
View File

@@ -16,10 +16,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -78,7 +75,10 @@ public class OracleEventDetailToMysqlServiceImpl extends ServiceImpl<RmpEventDet
po.setNum(oracleDetail.getNum()); po.setNum(oracleDetail.getNum());
po.setFileFlag(oracleDetail.getFileFlag()); po.setFileFlag(oracleDetail.getFileFlag());
po.setDealFlag(oracleDetail.getDealFlag()); 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.setFirstType(oracleDetail.getFirstType());
po.setFirstMs(oracleDetail.getFirstMs()); po.setFirstMs(oracleDetail.getFirstMs());
po.setEnergy(oracleDetail.getEnergy()); po.setEnergy(oracleDetail.getEnergy());