From 1bcef6a688ffbee58c347bbd87e1b5db08075041 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 13 四月 2022 18:25:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 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 382e7d3..73c845e 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,7 +5,6 @@
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;
@@ -55,6 +54,7 @@
* 妯＄硦鏌ヨ
*/
public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
+ Long clientId = SecurityUtils.getClientId();
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<MonitorBo> monitorList;
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
@@ -67,15 +67,7 @@
monitorParam.setEquipmentState(2);
}
-
- //涓虹┖鏄秴绠�
- 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());
- }
+ monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState(), monitorParam.getEquipmentState());
return monitorList;
}
@@ -123,7 +115,7 @@
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("accessToken", accessToken);
paramMap.put("deviceSerial", deviceSerial);
- if (validateCode != null) {
+ if(validateCode != null ){
paramMap.put("validateCode", validateCode);
}
String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);
--
Gitblit v1.9.3