From 9f21969b69703a35bde9d659be19f3e39795010d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 12 五月 2022 11:58:01 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 4ea615e..616ce3a 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
@@ -66,7 +66,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
@@ -244,7 +247,7 @@
}
boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME);
if (!belong) {
- throw new RuntimeException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
}
byId.setTerminalName(name);
return updateById(byId);
--
Gitblit v1.9.3