From af4cd17b9851e940dd1dc8a43b3b21fbdd452f76 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 23 九月 2022 17:09:54 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 d15a52d..a9b9dec 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
@@ -10,6 +10,7 @@
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartBeatTimeReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereOperationReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereQuerySensorInfoReportInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereQueryVersionReportInnerFrame;
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;
@@ -74,9 +75,7 @@
*/
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);
/**
@@ -254,11 +253,10 @@
* @param mac
* @return
*/
- public void QueryVersion(String mac) {
+ public String QueryVersion(String mac) {
if (StringUtil.strIsNullOrEmpty(mac)) {
throw new BusinessException("鐏潌mac鍙傛暟閿欒锛�");
}
- //TODO
AirEquipment airEquipment = SpringContextHolder.getBean(AirEquipmentService.class).
getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, mac).last("limit 1"));
@@ -273,7 +271,14 @@
System.out.println(commonFrame + " -----------commonFrame");
// FEA504000AFE040002FFFF8E00974C --------a5Frame
-// FEA584000BFE040003FFFFFF38586A49EE3EAF62 -----------commonFrame
+// FEA584000CFE040004FFFF0105954FAA7F1123C0CB -----------commonFrame
+ A5AtmosphereQueryVersionReportInnerFrame a5AtmosphereQueryVersionReportInnerFrame =
+ new A5AtmosphereQueryVersionReportInnerFrame().transformFrame(commonFrame.getPayload());
+ if (a5AtmosphereQueryVersionReportInnerFrame != null && a5AtmosphereQueryVersionReportInnerFrame.isValidate()) {
+ return a5AtmosphereQueryVersionReportInnerFrame.getVersion();
+ } else {
+ throw new BusinessException("鏁版嵁鏍￠獙寮傚父锛�");
+ }
}
/**
@@ -317,8 +322,7 @@
* @param valueOfReal 浼犳劅鍣ㄦ暟鍊�
* @param valueOfStandard 鏍囧噯浠櫒鏁板��
*/
- public void ModifiedData(String mac, String type, Double valueOfReal, Double valueOfStandard) {
- //TODO
+ public String ModifiedData(String mac, String type, String valueOfReal, String valueOfStandard) {
if (StringUtil.strIsNullOrEmpty(mac)) {
throw new BusinessException("鐏潌mac鍙傛暟閿欒锛�");
}
@@ -340,5 +344,12 @@
System.out.println(commonFrame + " -----------commonFrame");
+ A5AtmosphereOperationReportInnerFrame a5AtmosphereOperationReportInnerFrame
+ = new A5AtmosphereOperationReportInnerFrame().transformFrame(commonFrame.getPayload());
+ if (a5AtmosphereOperationReportInnerFrame.isValidate()) {
+ return a5AtmosphereOperationReportInnerFrame.getState();
+ } else {
+ throw new BusinessException("鏁版嵁鏍￠獙寮傚父锛�");
+ }
}
}
--
Gitblit v1.9.3