From c8ce26aac0004e249a0cef35fe15b2ddb280ad25 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 27 四月 2022 15:51:10 +0800
Subject: [PATCH] 大气数据推送到LED
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
index d147868..347691d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
@@ -11,8 +11,11 @@
import com.sandu.ximon.admin.manager.iot.frame.inner.request.*;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.LightPoleHeelingEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.LightPoleHeelingListParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.domain.Light;
import com.sandu.ximon.dao.domain.LightPoleHeeling;
import com.sandu.ximon.dao.domain.LightPoleHeelingEquipment;
@@ -33,7 +36,9 @@
* 妯＄硦鏌ヨ
*/
public List<LightPoleHeeling> listLightPoleHeelingByKeyword(BaseConditionVO baseConditionVO, LightPoleHeelingListParam lightPoleHeelingListParam) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
if (lightPoleHeelingListParam == null) {
lightPoleHeelingListParam = new LightPoleHeelingListParam();
}
@@ -43,10 +48,23 @@
lightPoleHeelingListParam.setKeyword(lightPoleHeelingListParam.getKeyword().trim());
}
- List<LightPoleHeeling> lightPoleHeelings
- = lightPoleHeelingMapper.listLightPoleHeeling(lightPoleHeelingListParam.getKeyword(), lightPoleHeelingListParam.getProcessingState());
+ List<LightPoleHeeling> lightPoleHeelings;
+ if (SecurityUtils.getClientId() == null) {
+ lightPoleHeelings = lightPoleHeelingMapper.listLightPoleHeeling(lightPoleHeelingListParam.getKeyword()
+ , lightPoleHeelingListParam.getProcessingState(), null);
+ } else {
+ lightPoleHeelings = lightPoleHeelingMapper.listLightPoleHeeling(lightPoleHeelingListParam.getKeyword()
+ , lightPoleHeelingListParam.getProcessingState(), SecurityUtils.getUserId());
+ }
return lightPoleHeelings;
+ }
+
+ /**
+ * 鏍规嵁Mac鑾峰彇鏈�鏂版暟鎹�
+ */
+ public LightPoleHeeling getLightPoleHeelingByMac(String mac) {
+ return getOne(Wrappers.lambdaQuery(LightPoleHeeling.class).eq(LightPoleHeeling::getMac, mac));
}
/**
@@ -202,6 +220,10 @@
} else {
lightPoleHeeling.setWarningLevel(0);//姝ｅ父
}
+
+ //瀛樺偍璁惧鐘舵�佸埌缂撳瓨
+ RedisUtils.getBean().set(LightPoleHeelingEnum.LIGHT_POLE_HEELING_STATE.getCode() + deviceName
+ , heartBeatDataPackage, 300L);
/**
* 灏嗙伅鏉嗗�炬枩纭欢娣诲姞鍒扮‖浠惰〃
*/
@@ -209,7 +231,6 @@
if (one == null) {
LightPoleHeelingEquipment equipment = new LightPoleHeelingEquipment();
equipment.setMac(deviceName);
- lightPoleHeelingEquipmentService.save(equipment);
}
return save(lightPoleHeeling);
--
Gitblit v1.9.3