添加电压含有率
This commit is contained in:
@@ -41,6 +41,7 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService {
|
||||
//12张表数据
|
||||
List<DataVDTO> dataVList = new ArrayList<>();
|
||||
List<DataHarmphasicVDTO> dataHarmphasicVDTOList = new ArrayList<>();
|
||||
List<DataHarmrateVDTO> dataHarmrateVDTOList = new ArrayList<>();
|
||||
List<DataInharmVDTO> dataInharmVDTOList = new ArrayList<>();
|
||||
List<DataIDTO> dataIDTOList = new ArrayList<>();
|
||||
List<DataHarmphasicIDTO> dataHarmphasicIDTOList = new ArrayList<>();
|
||||
@@ -70,8 +71,7 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService {
|
||||
DataVDTO dataVa = BeanVConverter.messageDataVTODataV(v.getA());
|
||||
DataVDTO dataVb = BeanVConverter.messageDataVTODataV(v.getB());
|
||||
DataVDTO dataVc = BeanVConverter.messageDataVTODataV(v.getC());
|
||||
DataVDTO dataVt = BeanVConverter.messageDataVTODataV(v.getT());
|
||||
|
||||
DataVDTO dataVt = BeanVConverter.messageDataVTODataV(v.getT(),v.getA(),v.getB(),v.getC());
|
||||
dataVa.setTimeid(localDateTime);
|
||||
dataVa.setLineid(lineId);
|
||||
dataVa.setPhasicType("A");
|
||||
@@ -135,6 +135,24 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService {
|
||||
dataInharmVc.setPhasicType("C");
|
||||
dataInharmVc.setQualityflag(flag);
|
||||
|
||||
DataHarmrateVDTO dataHarmrateVDTOa = BeanVConverter.messageDataVTODataHarmprateV(v.getA());
|
||||
DataHarmrateVDTO dataHarmrateVDTOb = BeanVConverter.messageDataVTODataHarmprateV(v.getB());
|
||||
DataHarmrateVDTO dataHarmrateVDTOc = BeanVConverter.messageDataVTODataHarmprateV(v.getC());
|
||||
dataHarmrateVDTOa.setTimeid(localDateTime);
|
||||
dataHarmrateVDTOa.setLineid(lineId);
|
||||
dataHarmrateVDTOa.setPhasicType("A");
|
||||
dataHarmrateVDTOa.setQualityflag(flag);
|
||||
|
||||
dataHarmrateVDTOb.setTimeid(localDateTime);
|
||||
dataHarmrateVDTOb.setLineid(lineId);
|
||||
dataHarmrateVDTOb.setPhasicType("B");
|
||||
dataHarmrateVDTOb.setQualityflag(flag);
|
||||
|
||||
dataHarmrateVDTOc.setTimeid(localDateTime);
|
||||
dataHarmrateVDTOc.setLineid(lineId);
|
||||
dataHarmrateVDTOc.setPhasicType("C");
|
||||
dataHarmrateVDTOc.setQualityflag(flag);
|
||||
|
||||
dataInharmVDTOList.add(dataInharmVa);
|
||||
dataInharmVDTOList.add(dataInharmVb);
|
||||
dataInharmVDTOList.add(dataInharmVc);
|
||||
@@ -142,6 +160,10 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService {
|
||||
dataVList.add(dataVb);
|
||||
dataVList.add(dataVc);
|
||||
dataVList.add(dataVt);
|
||||
dataHarmrateVDTOList.add(dataHarmrateVDTOa);
|
||||
dataHarmrateVDTOList.add(dataHarmrateVDTOb);
|
||||
dataHarmrateVDTOList.add(dataHarmrateVDTOc);
|
||||
|
||||
|
||||
}
|
||||
//解析出电流数据ABCT
|
||||
@@ -471,6 +493,7 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService {
|
||||
});
|
||||
LnDataDTO lnDataDTO = new LnDataDTO();
|
||||
lnDataDTO.setDataVList(dataVList);
|
||||
lnDataDTO.setDataHarmrateVDTOList(dataHarmrateVDTOList);
|
||||
lnDataDTO.setDataHarmphasicVDTOList(dataHarmphasicVDTOList);
|
||||
lnDataDTO.setDataInharmVDTOList(dataInharmVDTOList);
|
||||
lnDataDTO.setDataIDTOList(dataIDTOList);
|
||||
|
||||
Reference in New Issue
Block a user