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 | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 325d0fe..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
@@ -1,8 +1,10 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
@@ -10,6 +12,7 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.admin.dto.YSY_AccessTokenDto;
@@ -52,7 +55,9 @@
*/
public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
Long clientId = SecurityUtils.getClientId();
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
List<MonitorBo> monitorList;
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
if (monitorParam.getBindingState() == null) {
@@ -64,7 +69,7 @@
monitorParam.setEquipmentState(2);
}
- monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState(), monitorParam.getEquipmentState());
+ monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), monitorParam.getBindingState(), monitorParam.getEquipmentState(), clientId);
return monitorList;
}
@@ -102,6 +107,7 @@
/**
* 鑾峰彇钀ょ煶浜戞憚鍍忓ご淇℃伅 鏃犻渶楠岃瘉accessToken
+ *
* @return
*/
public YSY_MonitorDto.MonitorDto getMonitorInfo(String deviceSerial) {
@@ -127,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