From cfb17d6e329f3cc7afe3018d6cc8784ebafd5965 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 14 九月 2022 16:08:57 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java | 78 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 6 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 0cc94e5..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;
@@ -18,6 +19,7 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
+import com.sandu.ximon.admin.utils.StringUtil;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.domain.AirEquipment;
@@ -73,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);
/**
@@ -146,6 +146,9 @@
* 鏌ヨ澶ф皵璁惧蹇冭烦鍖呮椂闂�
*/
public String QueryHeartBeatTime(String mac) {
+ if (StringUtil.strIsNullOrEmpty(mac)) {
+ throw new BusinessException("鐏潌mac鍙傛暟閿欒锛�");
+ }
AirEquipment airEquipment = SpringContextHolder.getBean(AirEquipmentService.class).
getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, mac).last("limit 1"));
@@ -178,6 +181,13 @@
* @param time
*/
public String setHeartBeatTime(String mac, Integer time) {
+ if (StringUtil.strIsNullOrEmpty(mac)) {
+ throw new BusinessException("鐏潌mac鍙傛暟閿欒锛�");
+ }
+ if (time == null) {
+ throw new BusinessException("蹇冭烦鍖呴棿闅旀椂闂翠笉鑳戒负绌猴紒");
+ }
+
if (time < 30) {
throw new BusinessException("蹇冭烦鍖呴棿闅旀椂闂翠笉鑳藉皯浜�30s锛�");
}
@@ -210,6 +220,10 @@
* @return
*/
public A5AtmosphereQuerySensorInfoReportInnerFrame.SensorInfoPackage QuerySensorInfo(String mac) {
+ if (StringUtil.strIsNullOrEmpty(mac)) {
+ throw new BusinessException("鐏潌mac鍙傛暟閿欒锛�");
+ }
+
AirEquipment airEquipment = SpringContextHolder.getBean(AirEquipmentService.class).
getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, mac).last("limit 1"));
@@ -239,8 +253,10 @@
* @param mac
* @return
*/
- public void QueryVersion(String mac) {
- //TODO
+ public String QueryVersion(String mac) {
+ if (StringUtil.strIsNullOrEmpty(mac)) {
+ throw new BusinessException("鐏潌mac鍙傛暟閿欒锛�");
+ }
AirEquipment airEquipment = SpringContextHolder.getBean(AirEquipmentService.class).
getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, mac).last("limit 1"));
@@ -255,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("鏁版嵁鏍￠獙寮傚父锛�");
+ }
}
/**
@@ -265,6 +288,10 @@
* @return
*/
public String Reboot(String mac) {
+ if (StringUtil.strIsNullOrEmpty(mac)) {
+ throw new BusinessException("鐏潌mac鍙傛暟閿欒锛�");
+ }
+
AirEquipment airEquipment = SpringContextHolder.getBean(AirEquipmentService.class).
getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, mac).last("limit 1"));
if (airEquipment == null) {
@@ -286,4 +313,43 @@
throw new BusinessException("鏁版嵁鏍￠獙寮傚父锛�");
}
}
+
+ /**
+ * 璁剧疆鏁版嵁淇鍊�
+ *
+ * @param mac 鐏潌MAC
+ * @param type 鏁版嵁淇璁惧绫诲瀷
+ * @param valueOfReal 浼犳劅鍣ㄦ暟鍊�
+ * @param valueOfStandard 鏍囧噯浠櫒鏁板��
+ */
+ public String ModifiedData(String mac, String type, String valueOfReal, String valueOfStandard) {
+ if (StringUtil.strIsNullOrEmpty(mac)) {
+ throw new BusinessException("鐏潌mac鍙傛暟閿欒锛�");
+ }
+ if (StringUtil.strIsNullOrEmpty(type)) {
+ throw new BusinessException("鏁版嵁淇璁惧绫诲瀷閿欒锛�");
+ }
+ if (valueOfReal == null || valueOfStandard == null) {
+ throw new BusinessException("浼犳劅鍣ㄦ暟鍊兼垨鏍囧噯浠櫒鏁板�奸敊璇紒");
+ }
+ AirEquipment airEquipment = SpringContextHolder.getBean(AirEquipmentService.class).
+ getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, mac).last("limit 1"));
+ if (airEquipment == null) {
+ throw new BusinessException("澶ф皵璁惧涓嶅瓨鍦紒");
+ }
+ AtmosphereModifiedDataReqInnerFrame atmosphereModifiedDataReqInnerFrame = new AtmosphereModifiedDataReqInnerFrame(type, valueOfReal, valueOfStandard);
+ A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), atmosphereModifiedDataReqInnerFrame);
+ System.out.println(a5Frame + " --------a5Frame");
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame);
+ 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