From bc359054c1330f486de6535fecb4b1325081d19a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 09 六月 2022 09:40:46 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 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 3064528..13da43f 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
@@ -14,6 +14,7 @@
import com.sandu.ximon.admin.vo.TerminalVO;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
+import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.IPBroadcastMapper;
@@ -157,6 +158,33 @@
}
}
+
+ public List<BroadcastTerminalV2EntityBo> newIpTerminalList(String keyword) {
+
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getListTerminalOnBind(SecurityUtils.getClientId(), keyword);
+
+
+ List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
+ for (BroadcastTerminalV2EntityBo bean : broadcastTerminalV2EntityBos) {
+ for (TerminalVO terminalVO : list) {
+ if (bean.getId().equals(terminalVO.getId())) {
+ bean.setStatus(terminalVO.getStatus());
+ bean.setIp(terminalVO.getIp());
+ bean.setVolumn(terminalVO.getVolumn());
+ bean.setDefaultVolumn(terminalVO.getDefaultVolumn());
+ bean.setPower(terminalVO.getPower());
+ bean.setDefaultPower(terminalVO.getDefaultPower());
+ bean.setLast(terminalVO.getLast());
+ bean.setTaskType(terminalVO.getTaskType());
+ bean.setTaskID(terminalVO.getTaskID());
+ break;
+ }
+ }
+ }
+
+ return broadcastTerminalV2EntityBos;
+ }
+
/**
* 淇敼璁惧缁戝畾鐘舵��
*
@@ -260,9 +288,11 @@
if (byId == null) {
throw new BusinessException("缁堢涓嶅瓨鍦�");
}
- boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME);
- if (!belong) {
- throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ if (AdministratorEnums.NORMAL.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME);
+ if (!belong) {
+ throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ }
}
byId.setTerminalName(name);
boolean flag = updateById(byId);
--
Gitblit v1.9.3