From f2dfd5e6fbbb9c4e96e91c86be0bb6f7a44d87c3 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 11:56:21 +0800
Subject: [PATCH] LED屏列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
index 5a993ef..30f920b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
@@ -7,7 +7,10 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.domain.AirData;
@@ -31,10 +34,14 @@
* 妯＄硦鏌ヨ
*/
public List<AirEquipmentBo> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
- Long clientId = SecurityUtils.getClientId();
- PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<AirEquipmentBo> airEquipmentBos;
+ if (SecurityUtils.getClientId() == null) {
+ airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(keyword, null);
+ }else{
+ airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
+ }
- List<AirEquipmentBo> airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(keyword,clientId);
return airEquipmentBos;
}
@@ -45,6 +52,9 @@
*/
public void addAirEquipment(AirEquipment airEquipment) {
AirEquipment one = getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, airEquipment.getMac()));
+ //瀛樺偍璁惧鐘舵�佸埌缂撳瓨
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_EQUIPMENT_STATE.getCode() + airEquipment.getMac()
+ , 1, 300L);
if (one == null) {
save(airEquipment);
}
--
Gitblit v1.9.3