zzkj/smart_storage_java
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

中车电站数据融合

Browse Source
This commit is contained in:
root
2026-03-25 09:40:33 +08:00
parent b6acb9bcf4
commit a7f21789f7
7 changed files with 73 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business-service-dao/src/main/java/com/ho/business/service/ShipEnergyService.java
View File

@ -243,7 +243,8 @@ public class ShipEnergyService {
JSONObject jsonObj = (JSONObject) i;
Integer stationId = jsonObj.getInteger("stationId");
String json = getMainTotal(stationId);
String mainKey = CommonConstant.SHIP_ENERGY_MAIN + stationId;
Integer finalStationId = stationId +10000;
String mainKey = CommonConstant.SHIP_ENERGY_MAIN + finalStationId;
redisService.set(mainKey,json);
});
}

9
business-service-dao/src/main/java/com/ho/business/service/impl/IargeScreenShowServiceImpl.java
View File

@ -349,16 +349,15 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
}
// 寄点站点数据融合
stations.forEach(s->{
if(s.getId()==11003 || s.getId()==10942) {
if(s.getId()==11003 || s.getId()==10942 || s.getId()==11006) {
// 寄点电站数据
Integer stationId = s.getId() - 10000;
String mainKey = CommonConstant.SHIP_ENERGY_MAIN + stationId;
String mainKey = CommonConstant.SHIP_ENERGY_MAIN + s.getId();
String json = (String) redisService.get(mainKey);
ShipStationRespVO respVO = JSON.parseObject(json, ShipStationRespVO.class);
// 日充
annualOverviewResp.setDayCharge(annualOverviewResp.getDayCharge().add(BigDecimal.valueOf(respVO.getPositivePowerToday())));
annualOverviewResp.setDayCharge(annualOverviewResp.getDayCharge().add(respVO.getPositivePowerToday()==null?BigDecimal.ZERO:BigDecimal.valueOf(respVO.getPositivePowerToday())));
// 日放
annualOverviewResp.setDayDischarge(annualOverviewResp.getDayDischarge().add(BigDecimal.valueOf(respVO.getReversePowerToday())));
annualOverviewResp.setDayDischarge(annualOverviewResp.getDayDischarge().add(respVO.getReversePowerToday()==null?BigDecimal.ZERO:BigDecimal.valueOf(respVO.getReversePowerToday())));
}
});
return annualOverviewResp;

2
business-service-dao/src/main/java/com/ho/business/service/impl/OutApiServiceImpl.java
View File

@ -176,7 +176,7 @@ public class OutApiServiceImpl implements OutApiService {
}
String deviceType = DeviceTypeConstant.BMS;
log.info("stations.size:" + stations.size());
stations = stations.stream().filter(i->i.getId()!=11003 && i.getId()!=10942).collect(Collectors.toList());
stations = stations.stream().filter(i->i.getId()!=11003 && i.getId()!=10942 && i.getId()!=11006).collect(Collectors.toList());
for (Station station : stations) {
try {
//先删除站的当日数据

9
business-service-dao/src/main/java/com/ho/business/service/impl/StationHomeServiceImpl.java
View File

@ -960,14 +960,13 @@ public class StationHomeServiceImpl implements StationHomeService {
dailyDischargeElec = new BigDecimal(dailyDischargeElecStr);
pcsElecData.setChargeElec(dailyChargeElec);
pcsElecData.setDischargeElec(dailyDischargeElec);
if(req.getStationId()==11003 || req.getStationId()==10942){
if(req.getStationId()==11003 || req.getStationId()==10942 || req.getStationId()==11006){
// 寄点电站数据
Integer stationId = req.getStationId()-10000;
String mainKey = CommonConstant.SHIP_ENERGY_MAIN + stationId;
String mainKey = CommonConstant.SHIP_ENERGY_MAIN + req.getStationId();
String json = (String)redisService.get(mainKey);
ShipStationRespVO vo = JSON.parseObject(json,ShipStationRespVO.class);
pcsElecData.setChargeElec(BigDecimal.valueOf(vo.getPositivePowerToday()));
pcsElecData.setDischargeElec(BigDecimal.valueOf(vo.getReversePowerToday()));
pcsElecData.setChargeElec(vo.getPositivePowerToday()==null?BigDecimal.ZERO:BigDecimal.valueOf(vo.getPositivePowerToday()));
pcsElecData.setDischargeElec(vo.getReversePowerToday()==null?BigDecimal.ZERO:BigDecimal.valueOf(vo.getReversePowerToday()));
}
}
}