Middleware/cn-data-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

消息数据过滤

Browse Source
This commit is contained in:
hzj
2026-07-24 09:15:46 +08:00
parent 73004aafa7
commit 2280037b28
5 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageFlucDataSet.java
View File

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
@@ -21,10 +22,8 @@ import java.time.LocalDateTime;
@Data @Data
public class MessageFlucDataSet implements Serializable { public class MessageFlucDataSet implements Serializable {
private Integer FLAG; private Integer FLAG;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Instant TIME;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
private LocalDateTime TIME;
@JsonProperty("F_S") @JsonProperty("F_S")
private MessageFs fs; private MessageFs fs;

6
analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageHarmonicDataSet.java
View File

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
@@ -20,10 +21,7 @@ import java.time.LocalDateTime;
@Data @Data
public class MessageHarmonicDataSet implements Serializable { public class MessageHarmonicDataSet implements Serializable {
private Integer FLAG; private Integer FLAG;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS") private Instant TIME;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
private LocalDateTime TIME;
private MessageV V; private MessageV V;
private MessageI I; private MessageI I;
private MessageP PQ; private MessageP PQ;

7
analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessagePltDataSet.java
View File

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
@@ -21,10 +22,8 @@ import java.time.LocalDateTime;
@Data @Data
public class MessagePltDataSet implements Serializable { public class MessagePltDataSet implements Serializable {
private Integer FLAG; private Integer FLAG;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Instant TIME;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
private LocalDateTime TIME;
@JsonProperty("F_L") @JsonProperty("F_L")
private MessageFl fl; private MessageFl fl;

14
analysis/stat/stat-boot/src/main/java/com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java
View File

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.temporal.ChronoField; import java.time.temporal.ChronoField;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -92,7 +93,8 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService {
String value = messageDataDTO.getValue(); String value = messageDataDTO.getValue();
if(Objects.equals(DataTypeEnum.HARMONIC.getCode(),dataType)){ if(Objects.equals(DataTypeEnum.HARMONIC.getCode(),dataType)){
MessageHarmonicDataSet messageHarmonicDataSet = JSONObject.parseObject(value, MessageHarmonicDataSet.class); MessageHarmonicDataSet messageHarmonicDataSet = JSONObject.parseObject(value, MessageHarmonicDataSet.class);
LocalDateTime localDateTime = messageHarmonicDataSet.getTIME(); LocalDateTime localDateTime = LocalDateTime.ofInstant(messageHarmonicDataSet.getTIME(), ZoneId.systemDefault());;
//排除上电下电等情况前置上送上不是整分的数据 //排除上电下电等情况前置上送上不是整分的数据
if((localDateTime.getSecond() != 0)||localDateTime.get(ChronoField.MILLI_OF_SECOND)!=0){ if((localDateTime.getSecond() != 0)||localDateTime.get(ChronoField.MILLI_OF_SECOND)!=0){
return; return;
@@ -387,8 +389,9 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService {
}else if(Objects.equals(DataTypeEnum.FLUC.getCode(),dataType)){ }else if(Objects.equals(DataTypeEnum.FLUC.getCode(),dataType)){
MessageFlucDataSet messageFlucDataSet = JSONObject.parseObject(value, MessageFlucDataSet.class); MessageFlucDataSet messageFlucDataSet = JSONObject.parseObject(value, MessageFlucDataSet.class);
LocalDateTime localDateTime = messageFlucDataSet.getTIME(); //LocalDateTime.ofInstant(messageFlucDataSet.getTIME(), ZoneId.systemDefault()).withNano(0).withSecond(0); LocalDateTime localDateTime = LocalDateTime.ofInstant(messageFlucDataSet.getTIME(), ZoneId.systemDefault());;
if(!(localDateTime.getSecond() == 0)){
if((localDateTime.getSecond() != 0)||localDateTime.get(ChronoField.MILLI_OF_SECOND)!=0){
return; return;
} }
Integer flag = messageFlucDataSet.getFLAG(); Integer flag = messageFlucDataSet.getFLAG();
@@ -462,10 +465,11 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService {
}else if(Objects.equals(DataTypeEnum.PLT.getCode(),dataType)){ }else if(Objects.equals(DataTypeEnum.PLT.getCode(),dataType)){
MessagePltDataSet messagePltDataSet = JSONObject.parseObject(value, MessagePltDataSet.class); MessagePltDataSet messagePltDataSet = JSONObject.parseObject(value, MessagePltDataSet.class);
LocalDateTime localDateTime = messagePltDataSet.getTIME(); LocalDateTime localDateTime = LocalDateTime.ofInstant(messagePltDataSet.getTIME(), ZoneId.systemDefault());;
Integer flag = messagePltDataSet.getFLAG(); Integer flag = messagePltDataSet.getFLAG();
MessageFl fl = messagePltDataSet.getFl(); MessageFl fl = messagePltDataSet.getFl();
if(!(localDateTime.getSecond() == 0)){ if((localDateTime.getSecond() != 0)||localDateTime.get(ChronoField.MILLI_OF_SECOND)!=0){
return; return;
} }
//长时闪变ABC //长时闪变ABC

3
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/LnDataDealController.java
View File

@@ -28,6 +28,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@@ -85,7 +86,7 @@ public class LnDataDealController extends BaseController {
String value = messageDataDTO.getValue(); String value = messageDataDTO.getValue();
if(Objects.equals(DataTypeEnum.HARMONIC.getCode(),dataType)) { if(Objects.equals(DataTypeEnum.HARMONIC.getCode(),dataType)) {
MessageHarmonicDataSet messageHarmonicDataSet = JSONObject.parseObject(value, MessageHarmonicDataSet.class); MessageHarmonicDataSet messageHarmonicDataSet = JSONObject.parseObject(value, MessageHarmonicDataSet.class);
LocalDateTime localDateTime = messageHarmonicDataSet.getTIME(); LocalDateTime localDateTime = LocalDateTime.ofInstant(messageHarmonicDataSet.getTIME(), ZoneId.systemDefault());;
Integer flag = messageHarmonicDataSet.getFLAG(); Integer flag = messageHarmonicDataSet.getFLAG();
MessageP pq = messageHarmonicDataSet.getPQ(); MessageP pq = messageHarmonicDataSet.getPQ();