From 1ab0b018c6d0b5a12b5310ae23f37cb9e5a2887b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Sep 2021 10:07:42 +0800
Subject: [PATCH] update

---
 screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java |    7 +++----
 1 files changed, 3 insertions(+), 4 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 4d4ea98..4dfe2bb 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
@@ -394,14 +394,13 @@
 
         //������������
         Map<String, Object> govMpInfo = new LinkedHashMap<>();
-
-        govMpInfo.put("guid", null);
-        govMpInfo.put("name", null);
-        if (device.getGovMonitorPoint() != null) {
+        GovMonitorPoint govMonitorPoint = device.getGovMonitorPoint();
+        if (govMonitorPoint != 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