From 1af7d5e48d6cfaac6123ea67c9223d32b291a564 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Tue, 14 Sep 2021 10:31:32 +0800 Subject: [PATCH] screen-api 修改接口bug --- screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java index b957e2d..66b431a 100644 --- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java +++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java @@ -391,6 +391,16 @@ mpInfo.put("provinceCode", monitorPoint.getProvinceCode()); deviceInfo.put("monitorPoint", mpInfo); + //������������ + Map<String, Object> govMpInfo = new LinkedHashMap<>(); + + govMpInfo.put("guid", null); + govMpInfo.put("name", null); + if (device.getGovMonitorPoint() != null) { + govMpInfo.put("guid", device.getGovMonitorPoint().getGuid()); + govMpInfo.put("name", device.getGovMonitorPoint().getName()); + } + deviceInfo.put("govMonitorPoint", govMpInfo); setDeviceInfoToRedis(mac, deviceInfo); return deviceInfo; } -- Gitblit v1.8.0