1.暂降同步调整
This commit is contained in:
@@ -96,7 +96,7 @@ public class OracleRmpEventDetailPO implements Serializable {
|
||||
* 处理结果第一条事件发生时间(读comtra文件获取)
|
||||
*/
|
||||
@TableField(value = "FIRSTTIME")
|
||||
private Date firstTime;
|
||||
private LocalDateTime firstTime;
|
||||
|
||||
/**
|
||||
* 处理结果第一条事件暂降类型(字典表PQS_Dicdata)
|
||||
|
||||
@@ -94,7 +94,7 @@ public class RmpEventDetailPO implements Serializable {
|
||||
* 处理结果第一条事件发生时间(读comtra文件获取)
|
||||
*/
|
||||
@TableField(value = "first_time")
|
||||
private Date firstTime;
|
||||
private LocalDateTime firstTime;
|
||||
|
||||
/**
|
||||
* 处理结果第一条事件暂降类型(字典表PQS_Dicdata)
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user