代码调整

This commit is contained in:
2023-11-07 11:28:30 +08:00
parent 8a0d956e06
commit 86816568ce
27 changed files with 660 additions and 84 deletions

View File

@@ -81,19 +81,19 @@ public class AutonomeWaveServiceImpl implements AutonomeWaveService {
/**
* 计算pt值和ct值
*/
private WaveDataDTO countPtCt(WaveDataDTO waveDataDTO){
private WaveDataDTO countPtCt(WaveDataDTO waveDataDTO) {
//取出集合
List<AnalogDTO> lstAnalogDTO = waveDataDTO.getComtradeCfgDTO().getLstAnalogDTO();
AnalogDTO ptParam = null;
for (AnalogDTO analogDTO : lstAnalogDTO) {
if (StringUtils.isNotBlank(analogDTO.getSzUnitName())&& analogDTO.getSzUnitName().contains("V")){
if (StringUtils.isNotBlank(analogDTO.getSzUnitName()) && analogDTO.getSzUnitName().contains("V")) {
ptParam = analogDTO;
break;
}
}
AnalogDTO ctParam = null;
for (AnalogDTO analogDTO : lstAnalogDTO) {
if (StringUtils.isNotBlank(analogDTO.getSzUnitName())&& analogDTO.getSzUnitName().contains("A")){
if (StringUtils.isNotBlank(analogDTO.getSzUnitName()) && analogDTO.getSzUnitName().contains("A")) {
ctParam = analogDTO;
break;
}
@@ -106,4 +106,5 @@ public class AutonomeWaveServiceImpl implements AutonomeWaveService {
waveDataDTO.setCt(ct1 / ct2);
return waveDataDTO;
}
}