From c6699730f630399689a8dbffe750c9f2c4d3f2ee Mon Sep 17 00:00:00 2001 From: yanps Date: Thu, 7 Dec 2023 11:13:12 +0800 Subject: [PATCH] fix: monitor --- .../src/main/java/org/nl/acs/monitor/DeviceStageMonitor.java | 2 +- .../org/nl/acs/monitor/service/DeviceStageMonitorService.java | 3 ++- .../monitor/service/impl/DeviceStageMonitorServiceImpl.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/DeviceStageMonitor.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/DeviceStageMonitor.java index 8634b77..43d29c9 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/DeviceStageMonitor.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/DeviceStageMonitor.java @@ -10,8 +10,8 @@ import com.alibaba.fastjson.JSONObject; public interface DeviceStageMonitor { /** * 根据设备获取设备状态(中文名:如故障、联机等) - * * @return + * @throws Exception */ public JSONObject getDeviceStatusName() throws Exception; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/DeviceStageMonitorService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/DeviceStageMonitorService.java index 27d0bca..8877f9a 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/DeviceStageMonitorService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/DeviceStageMonitorService.java @@ -8,11 +8,12 @@ import com.alibaba.fastjson.JSONArray; * @Date: 2022-08-17 */ public interface DeviceStageMonitorService { + /** * 取设备舞台监控数据 - * * @param jsonArray 前端传来设备编号和节点的id * @return + * @throws Exception */ public JSONArray getData(JSONArray jsonArray) throws Exception; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java index 0ff2d36..d29eef4 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java @@ -50,7 +50,8 @@ public class DeviceStageMonitorServiceImpl implements DeviceStageMonitorService obj.put("data", json); obj.put("device_name", json.get("device_name")); obj.put("device_code", js.get("device_code")); - obj.put("id", js.getString("id")); // 设备不存在就只保留id,方便前端查看 + // 设备不存在就只保留id,方便前端查看 + obj.put("id", js.getString("id")); arr.add(obj); }