From 2c52eaf28f9b8a666547e1307a76c3032598e57f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 11 五月 2022 16:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java
index a5722d8..a72f3e7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java
@@ -6,13 +6,13 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.PoleBindingParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.PoleBindingMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import javax.swing.*;
import java.util.List;
/**
@@ -56,12 +56,15 @@
poleBinding.setDeviceCode(param.getDeviceCode());
return save(poleBinding);
} else {
- //鍒犻櫎鐏潌鐨刣evicescode
- PoleService poleService = SpringContextHolder.getBean(PoleService.class);
- Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, one.getPoleId()));
- if (pole != null) {
- pole.setDeviceCode(null);
- poleService.updateById(pole);
+ //淇敼鍗曠伅鐨勭粦瀹氬叧绯荤殑鏃跺�欒棰濆澶勭悊鐨勪簨鍔�
+ // 鍒犻櫎鐏潌鐨刣evicescode
+ if (param.getDeviceType() == 0) {
+ PoleService poleService = SpringContextHolder.getBean(PoleService.class);
+ Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, one.getPoleId()));
+ if (pole != null) {
+ pole.setDeviceCode(null);
+ poleService.updateById(pole);
+ }
}
one.setPoleId(poleId);
@@ -117,4 +120,25 @@
public PoleBinding getPoleIdByMac(String deviceCode) {
return getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode));
}
+
+
+ /**
+ * 鍒ゆ柇璁惧褰掑睘
+ *
+ * @param deviceCode 璁惧缂栧彿
+ * @param type 璁惧绫诲瀷
+ * @return 宸茬粦瀹氳繑鍥瀟rue锛屾湭缁戝畾杩斿洖false
+ */
+ public boolean isBelong(String deviceCode, String type) {
+ if (type.isEmpty() || deviceCode.isEmpty()) {
+ throw new BusinessException("璁惧缂栧彿鎴栫被鍨嬩笉鑳戒负绌�");
+ }
+ Long userId = SecurityUtils.getClientId();
+ Pole binding = baseMapper.getPoleByBinding(type, deviceCode, userId);
+ if (binding != null) {
+ return true;
+ } else {
+ return false;
+ }
+ }
}
--
Gitblit v1.9.3