From 9330e9b0e4e70151d36084ecb5695b818cfda2db Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 16:07:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 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..f7fd652 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,7 +54,10 @@
* 妯＄硦鏌ヨ
*/
public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ Long clientId = SecurityUtils.getClientId();
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
List<MonitorBo> monitorList;
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
if (monitorParam.getBindingState() == null) {
@@ -67,15 +69,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(), monitorParam.getBindingState(), monitorParam.getEquipmentState(), clientId);
return monitorList;
}
@@ -110,6 +104,22 @@
return accessTokenDto.getData().getAccessToken();
}
+
+ /**
+ * 鑾峰彇钀ょ煶浜戞憚鍍忓ご淇℃伅 鏃犻渶楠岃瘉accessToken
+ *
+ * @return
+ */
+ public YSY_MonitorDto.MonitorDto getMonitorInfo(String deviceSerial) {
+ String token = getAccessToken();
+ Map<String, Object> paramMap = new HashMap<>();
+ paramMap.put("accessToken", token);
+ paramMap.put("deviceSerial", deviceSerial);
+ String s = HttpUtil.post(YSY_URL + GET_DEVICE_URL, paramMap);
+ YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
+ return monitorDto.getData();
+ }
+
/**
* 娣诲姞钀ょ煶浜戞憚鍍忓ご
*
@@ -123,7 +133,7 @@
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("accessToken", accessToken);
paramMap.put("deviceSerial", deviceSerial);
- if (validateCode != null) {
+ if (validateCode != null && validateCode.trim().length() != 0) {
paramMap.put("validateCode", validateCode);
}
String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);
--
Gitblit v1.9.3