From 4afd76efea95a919944ff183f7ffb2cf814cce33 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 11 五月 2022 11:01:23 +0800
Subject: [PATCH] fix

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
index 8f4192e..ef8715c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
@@ -64,7 +64,6 @@
                 b.setStreetlightId(0L);
                 b.setExist(1);
                 save(b);
-//                broadcastTerminalV2EntityMapper.insert(b);
             }
         });
     }
@@ -201,7 +200,11 @@
         if (id == null || id.trim().length() == 0) {
             return equipmentInfo;
         }
-        equipmentInfo.setEquipmentMac(id);
+        BroadcastTerminalV2Entity one = getOne(Wrappers.lambdaQuery(BroadcastTerminalV2Entity.class).eq(BroadcastTerminalV2Entity::getId, id));
+        if (one != null) {
+            equipmentInfo.setEquipmentMac(id);
+            equipmentInfo.setEquipmentName(one.getTerminalName());
+        }
         TerminalVO terminalInfo = TerminalAPIUtils.getTerminalInfo(Integer.valueOf(id));
         if (terminalInfo != null) {
             //绌洪棽 1銆�   宸ヤ綔涓� 2 鎴栬�� 4銆�     鏂嚎 0锛�    鎶� 閿� 8

--
Gitblit v1.9.3