From 176b4072534a7bffdd108222251d798059da5f25 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 07 七月 2022 16:23:48 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java
index 2b2d128..44399b9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java
@@ -12,7 +12,6 @@
import com.sandu.ximon.dao.bo.InterphoneHostBo;
import com.sandu.ximon.dao.domain.InterphoneHost;
import com.sandu.ximon.dao.domain.InterphoneHostSubPole;
-import com.sandu.ximon.dao.domain.InterphoneSub;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.InterphoneHostMapper;
import lombok.AllArgsConstructor;
@@ -37,7 +36,7 @@
*/
public boolean addHost(InterphoneHostParam interphoneHostParam) {
List<InterphoneHost> list = list(Wrappers.lambdaQuery(InterphoneHost.class).eq(InterphoneHost::getHostMac, interphoneHostParam.getHostMac()));
- if(list.size()>0){
+ if (list.size() > 0) {
throw new BusinessException("璇ヨ澶囧凡瀛樺湪");
}
InterphoneHost interphoneHost = new InterphoneHost();
@@ -69,12 +68,12 @@
return false;
}
- if(SecurityUtils.getClientId()!=null){
- boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getHostMac(), PoleBindingEnums.FOR_HELP);
- if (!belong) {
- throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
- }
- }
+ if (SecurityUtils.getClientId() != null) {
+ boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getHostMac(), PoleBindingEnums.FOR_HELP);
+ if (!belong) {
+ throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ }
+ }
InterphoneHost interphoneHost = new InterphoneHost();
interphoneHost.setHostId(id);
BeanUtils.copyProperties(interphoneHostParam, interphoneHost);
@@ -91,11 +90,17 @@
/**
* 缂栬緫涓�閿眰鍔╀富鏈� 鏃ュ織璁板綍缁撴潫
*/
- boolean b = updateById(interphoneHost);
List<InterphoneHost> list = list(Wrappers.lambdaQuery(InterphoneHost.class).eq(InterphoneHost::getHostMac, interphoneHostParam.getHostMac()));
- if(list.size()>1){
- throw new BusinessException("璇锋鏌ヨ澶噈ac鏄惁閲嶅");
+ if (list.size() > 0) {
+ list.forEach(
+ host -> {
+ if (!host.getHostId().equals(id)) {
+ throw new BusinessException("璇锋鏌ヨ澶噈ac鏄惁閲嶅");
+ }
+ }
+ );
}
+ boolean b = updateById(interphoneHost);
return b;
}
--
Gitblit v1.9.3