Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.无线设bug修改

Browse Source 
2.添加测试项每日扫描功能
This commit is contained in:
chendaofei
2024-09-26 08:46:25 +08:00
parent 16551b2451
commit 196de3a1d8
8 changed files with 168 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java
View File

@@ -31,6 +31,8 @@ import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static com.njcn.csharmonic.constant.HarmonicConstant.POWER_LIST;
/**
* Description:
* Date: 2023/6/26 9:14【需求编号】
@@ -83,13 +85,25 @@ public class DeviceDataTrendServiceImpl implements DeviceDataTrendService {
//判断监测点类型 针对治理设备 模块数据是一次值、电能质量设备是二次值
if (linePo.getClDid() != 0 && Objects.equals(devicDataTrendQueryParam.getDataLevel(),"Primary") && ObjectUtil.isNotNull(epdPqd.getPrimaryFormula())) {
double secondaryData = DataChangeUtil.secondaryToPrimary(epdPqd.getPrimaryFormula(), statisticalDataDTO.getValue(), linePo.getPtRatio(), linePo.getCtRatio());
if (changePower(epdPqd.getShowName())) {
secondaryData = secondaryData/1000;
}
vo.setStatisticalData(BigDecimal.valueOf(secondaryData).setScale(4, RoundingMode.HALF_UP).doubleValue());
} else {
vo.setStatisticalData(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.HALF_UP).doubleValue());
Double temVal = statisticalDataDTO.getValue();
if (changePower(epdPqd.getShowName())) {
temVal = temVal/1000;
}
vo.setStatisticalData(BigDecimal.valueOf(temVal).setScale(4, RoundingMode.HALF_UP).doubleValue());
}
vo.setStatisticalIndex(temp.getDataId());
vo.setStatisticalName(temp.getName());
vo.setUnit(temp.getUnit());
if (changePower(epdPqd.getShowName())) {
vo.setUnit("k" + temp.getUnit());
} else {
vo.setUnit(temp.getUnit());
}
vo.setAnotherName(temp.getAnotherName());
return vo;
}).collect(Collectors.toList());
@@ -97,4 +111,14 @@ public class DeviceDataTrendServiceImpl implements DeviceDataTrendService {
});
return result;
}
//判断功率是否需要转换
public boolean changePower(String name) {
return POWER_LIST.stream()
.anyMatch(name::contains);
}
}