From 0143b00ead241cc2b894745eff9d8ed5493b0b68 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 13 四月 2022 16:19:04 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
index 706f23f..382e7d3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -5,6 +5,7 @@
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.SerializationUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
@@ -54,7 +55,6 @@
* 妯＄硦鏌ヨ
*/
public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
- Long clientId = SecurityUtils.getClientId();
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<MonitorBo> monitorList;
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
@@ -67,7 +67,15 @@
monitorParam.setEquipmentState(2);
}
- monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState(), monitorParam.getEquipmentState());
+
+ //涓虹┖鏄秴绠�
+ if (SecurityUtils.getClientId() == null) {
+ monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword()
+ , monitorParam.getBindingState(), monitorParam.getEquipmentState(), null);
+ } else {
+ monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword()
+ , monitorParam.getBindingState(), monitorParam.getEquipmentState(), SecurityUtils.getUserId());
+ }
return monitorList;
}
@@ -85,7 +93,7 @@
}
//鍒犻櫎鎽勫儚澶磋澶囧墠闇�瑕佸厛瑙ｇ粦
- poleBindingService.unBindPole(monitor.getDeviceSerial());
+ poleBindingService.unBindPole(null, monitor.getDeviceSerial());
return removeById(Id);
}
@@ -109,13 +117,15 @@
* @param deviceSerial 璁惧搴忓垪鍙�,瀛樺湪鑻辨枃瀛楁瘝鐨勮澶囧簭鍒楀彿锛屽瓧姣嶉渶涓哄ぇ鍐�
* // * @param validateCode 璁惧楠岃瘉鐮侊紝璁惧鏈鸿韩涓婄殑鍏綅澶у啓瀛楁瘝
*/
-// public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
- public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial) {
+ public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
+// public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial) {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("accessToken", accessToken);
paramMap.put("deviceSerial", deviceSerial);
-// paramMap.put("validateCode", validateCode);
+ if (validateCode != null) {
+ paramMap.put("validateCode", validateCode);
+ }
String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);
System.out.println(s);
YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
--
Gitblit v1.9.3