|
@@ -258,13 +258,13 @@ public class ReceiveDataService {
|
|
|
public void savePowerStationStatusData(ElectricField electricField) {
|
|
|
try {
|
|
|
log.info("开始计算实际功率");
|
|
|
- BigDecimal powerStationStatusData = new BigDecimal("0");
|
|
|
+ BigDecimal pssd = new BigDecimal("0");
|
|
|
if (electricField.getElectricFieldTypeEnum().getCode() == 1) {
|
|
|
List<InverterInfo> inverterInfoList = inverterInfoService.getByStationCode(electricField.getStationCode());
|
|
|
for (InverterInfo inverterInfo : inverterInfoList) {
|
|
|
Map<String, String> getMap = redisUtils.hgetall("nbq-" + electricField.getStationCode() + "-" + inverterInfo.getId());
|
|
|
if (getMap.get("activePower") != null) {
|
|
|
- powerStationStatusData = powerStationStatusData.add(new BigDecimal(getMap.get("activePower")));
|
|
|
+ pssd = pssd.add(new BigDecimal(getMap.get("activePower")));
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
@@ -272,14 +272,14 @@ public class ReceiveDataService {
|
|
|
for (WindTurbineInfo windTurbineInfo : windTurbineInfoList) {
|
|
|
Map<String, String> getMap = redisUtils.hgetall("fj-" + electricField.getStationCode() + "-" + windTurbineInfo.getId());
|
|
|
if (getMap.get("activePower") != null) {
|
|
|
- powerStationStatusData = powerStationStatusData.add(new BigDecimal(getMap.get("activePower")));
|
|
|
+ pssd = pssd.add(new BigDecimal(getMap.get("activePower")));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (powerStationStatusData.compareTo(new BigDecimal("0")) > 0) {
|
|
|
- powerStationStatusData.divide(new BigDecimal("1000"), 2, BigDecimal.ROUND_HALF_UP);
|
|
|
+ if (pssd.compareTo(new BigDecimal("0")) > 0) {
|
|
|
+ pssd = pssd.divide(new BigDecimal("1000"), 2, BigDecimal.ROUND_HALF_UP);
|
|
|
}
|
|
|
- PowerStationStatusData p = powerStationDataPackerContainer.getDataPacker(electricField.getStationCode()).packageData(powerStationStatusData);
|
|
|
+ PowerStationStatusData p = powerStationDataPackerContainer.getDataPacker(electricField.getStationCode()).packageData(pssd);
|
|
|
powerStationStatusDataRepository.save(p);
|
|
|
//对象转map
|
|
|
Map<String, String> map = JSON.parseObject(JSON.toJSONString(p), new TypeReference<Map<String, String>>() {
|