diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java index ad170fa..d4a5b1d 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java @@ -348,7 +348,11 @@ public class MonitorServiceImpl implements MonitorService { // 设备装机容量 if(CollectionUtil.isNotEmpty(deviceParams)){ Optional optional = deviceParams.stream().filter(param->param.getEmCode().equals(device.getDeviceCode())).findFirst(); - optional.ifPresent(eminfoAndEmParamVo -> device.setInstalledCapacity(eminfoAndEmParamVo.getInstalledCapacity())); + if(optional.isPresent()){ + device.setInstalledCapacity(optional.get().getInstalledCapacity()); + }else{ + device.setInstalledCapacity(0.0); + } } // 设备状态 : 故障、检修 if (CollectionUtil.isNotEmpty(faults) && faults.contains(device.getDeviceCode())) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java index 89d40ad..681e73f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java @@ -113,14 +113,14 @@ public class StationServiceImpl extends ServiceImpl deptResult = sysClient.getDept(stationEntity.getRefDept()); if (deptResult.isSuccess() && ObjectUtil.isNotEmpty(deptResult.getData())) { R projectResult = deptClient.deleteDeptById(stationEntity.getRefDept()); if (!projectResult.isSuccess()) { - log.info("hzims-operational:station:removeStation", stationEntity.getRefDept() + "所属机构删除失败,报错信息为:" + projectResult.getMsg()); + log.info("hzims-operational:station:removeStation : {}", stationEntity.getRefDept() + "所属机构删除失败,报错信息为:" + projectResult.getMsg()); } } } @@ -144,6 +144,9 @@ public class StationServiceImpl extends ServiceImpl