From f214709cf1d896e7c9743f206b7a708f020e5322 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 21 十月 2022 17:54:03 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
index 0d6a337..8d6d8b7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -49,7 +49,11 @@
public boolean addClient(AddClientPrarm addClientPrarm) {
if (getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, addClientPrarm.getClientName().trim())) != null) {
- throw new BusinessException("璇ョ敤鎴峰悕宸插瓨鍦紒");
+ throw new BusinessException("璇ョ敤鎴峰悕宸插湪瀹㈡埛涓瓨鍦紒");
+ }
+ Admin admin = SpringContextHolder.getBean(AdminService.class).findByUserName(addClientPrarm.getClientName());
+ if (admin != null) {
+ throw new BusinessException("褰撳墠璐﹀彿" + addClientPrarm.getClientName() + "宸茬粡鍦ㄧ鐞嗗憳涓瓨鍦�");
}
Long userId = SecurityUtils.getUserId();
boolean clientId = findClientId();
@@ -257,9 +261,23 @@
poles.forEach(
pole -> {
pole.setClientId(-1L);
+ pole.setUserId(-1L);
}
);
+
+ //鍒犻櫎鐢ㄦ埛鍚庨渶瑕佽嚜鍔ㄨВ缁戣鐢ㄦ埛鐨勮澶�
+
+ //鐏潌id闆嗗悎
+ List<Long> collect = poles.stream().map(p -> p.getId()).collect(Collectors.toList());
+ List<Long> collect1 = poles.stream().map(Pole::getId).collect(Collectors.toList());
+ //鍒犻櫎缁戝畾鍏崇郴
+ SpringContextHolder.getBean(PoleBindingService.class)
+ .remove(Wrappers.lambdaQuery(PoleBinding.class)
+ .in(PoleBinding::getPoleId, collect));
+ //鏇存敼鐏潌褰掑睘
flag = SpringContextHolder.getBean(PoleService.class).updateBatchById(poles);
+
+
//鍒犻櫎澶辫触鍥炴粴鏁版嵁
if (!flag) {
throw new BusinessException("鍒犻櫎鐢ㄦ埛澶辫触锛�");
--
Gitblit v1.9.3