From dcba22e179675ec0072cd5cef41f60c78cdd416f Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Mon, 29 Jul 2024 11:20:49 +0800
Subject: [PATCH] =?UTF-8?q?#=E9=9B=86=E4=B8=AD=E7=9B=91=E6=8E=A7=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E8=A3=85=E6=9C=BA=E5=AE=B9=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/operation/monitor/impl/MonitorServiceImpl.java         | 6 +++++-
 .../hzims/operational/station/service/impl/StationServiceImpl.java | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

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<EminfoAndEmParamVo> 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<StationMapper, StationEntity
             // 删除数据平台项目
             Result dataDelete = projectClient.delete(stationEntity.getCode());
             if(dataDelete.isSuccess()) {
-                log.error("hzims-operational:station:removeStation", stationEntity.getCode() + "删除失败，报错信息为：" + dataDelete.getMsg());
+                log.error("hzims-operational:station:removeStation : {}", stationEntity.getCode() + "删除失败，报错信息为：" + dataDelete.getMsg());
             }
             // 删除所属机构
             R<Dept> deptResult = sysClient.getDept(stationEntity.getRefDept());
             if (deptResult.isSuccess() && ObjectUtil.isNotEmpty(deptResult.getData())) {
                 R<Void> 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<StationMapper, StationEntity
             if (StringUtil.isNotBlank(req.getName())) {
                 like(StationEntity::getName, "%".concat(req.getName()).concat("%"));
             }
+            if (ObjectUtil.isNotEmpty(req.getId())) {
+                eq(StationEntity::getId, req.getId());
+            }
             if (ObjectUtil.isNotEmpty(req.getType())) {
                 eq(StationEntity::getType, req.getType());
             }