From 0d2e4e6b8954d77dd34664f861135ae41f7eb828 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 13 五月 2022 10:31:34 +0800
Subject: [PATCH] 单灯数据直接下载
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 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 60a41e8..aff5829 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,9 +11,12 @@
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.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.domain.Light;
import com.sandu.ximon.dao.domain.LightPoleHeeling;
import com.sandu.ximon.dao.domain.LightPoleHeelingEquipment;
@@ -34,7 +37,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();
}
@@ -59,8 +64,27 @@
/**
* 鏍规嵁Mac鑾峰彇鏈�鏂版暟鎹�
*/
- public LightPoleHeeling getLightPoleHeelingByMac(String mac) {
- return getOne(Wrappers.lambdaQuery(LightPoleHeeling.class).eq(LightPoleHeeling::getMac, mac));
+ public EquipmentInfomation getLightPoleHeelingByMac(String mac) {
+ EquipmentInfomation equipmentInfo = new EquipmentInfomation();
+ equipmentInfo.setEquipmentType("鏉嗕綋鍊炬祴");
+ if (mac == null || mac.trim().length() == 0) {
+ return equipmentInfo;
+ }
+
+ LightPoleHeeling one = getOne(Wrappers.lambdaQuery(LightPoleHeeling.class).eq(LightPoleHeeling::getMac, mac));
+ if (one != null) {
+ equipmentInfo.setEquipmentCreateTime(one.getCreateTime());
+ equipmentInfo.setEquipmentMac(one.getMac());
+
+ }
+ //瀛樺偍璁惧鐘舵�佸埌缂撳瓨
+ String s = RedisUtils.getBean().get(LightPoleHeelingEnum.LIGHT_POLE_HEELING_STATE.getCode() + mac);
+ if (s == null) {
+ equipmentInfo.setEquipmentState("绂荤嚎");
+ } else {
+ equipmentInfo.setEquipmentState("鍦ㄧ嚎");
+ }
+ return equipmentInfo;
}
/**
@@ -216,6 +240,10 @@
} else {
lightPoleHeeling.setWarningLevel(0);//姝ｅ父
}
+
+ //瀛樺偍璁惧鐘舵�佸埌缂撳瓨
+ RedisUtils.getBean().set(LightPoleHeelingEnum.LIGHT_POLE_HEELING_STATE.getCode() + deviceName
+ , heartBeatDataPackage, 300L);
/**
* 灏嗙伅鏉嗗�炬枩纭欢娣诲姞鍒扮‖浠惰〃
*/
@@ -223,7 +251,6 @@
if (one == null) {
LightPoleHeelingEquipment equipment = new LightPoleHeelingEquipment();
equipment.setMac(deviceName);
- lightPoleHeelingEquipmentService.addLightPoleHeelingEquipment(equipment);
}
return save(lightPoleHeeling);
--
Gitblit v1.9.3