From 798400ebc4769a6afec56ebbf8198e87e6c1a683 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 18:16:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/LightDataProcessor.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/LightDataProcessor.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/LightDataProcessor.java
index 13fb0de..b3e0627 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/LightDataProcessor.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/LightDataProcessor.java
@@ -1,5 +1,8 @@
package com.sandu.ximon.admin.manager.iot.amqp.processor;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightErrorCodeReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightHeartbeatReportInnerFrame;
@@ -9,6 +12,7 @@
import com.sandu.ximon.admin.service.LightReportDataService;
import com.sandu.ximon.admin.service.LightReportErrorService;
import com.sandu.ximon.admin.service.LightService;
+import com.sandu.ximon.dao.domain.LightReportError;
import lombok.extern.slf4j.Slf4j;
/**
@@ -38,8 +42,11 @@
log.info("蹇冭烦鐩稿簲");
A5LightHeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5LightHeartbeatReportInnerFrame().transformFrame(frame.getPayload());
- SpringContextHolder.getBean(LightReportDataService.class).saveReportData(deviceName, heartbeatReportInnerFrame.getHeartBeatDataPackage());
- SpringContextHolder.getBean(LightService.class).saveLight(deviceName,heartbeatReportInnerFrame.getHeartBeatDataPackage());
+ if (heartbeatReportInnerFrame.isValidate()) {
+ SpringContextHolder.getBean(LightReportDataService.class).saveReportData(deviceName, heartbeatReportInnerFrame.getHeartBeatDataPackage());
+ //蹇冭烦鍖呬笂鎶ヤ笉淇濆瓨纭欢璁惧淇℃伅
+// SpringContextHolder.getBean(LightService.class).saveLight(deviceName, heartbeatReportInnerFrame.getHeartBeatDataPackage());
+ }
} else if (A5LightReportEnum.Time_Synchronized.getCode().equals(functionCode)) {
// log.info("璇锋眰鏃堕棿鍚屾");
@@ -48,7 +55,10 @@
} else if (A5LightReportEnum.Error_Code.getCode().equals(functionCode)) {
log.info("鏁呴殰鐮佷笂鎶�");
A5LightErrorCodeReportInnerFrame codeRespInnerFrame = new A5LightErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
- if (codeRespInnerFrame.getErrorCode() != 0) {
+ System.out.println(JSON.toJSONString(codeRespInnerFrame) + "++++++++++++++++++++++++++++");
+ log.info(codeRespInnerFrame.isValidate() + "鏄惁閫氳繃鏍￠獙");
+ log.info(codeRespInnerFrame.getErrorCode() + "鏁呴殰鐮�");
+ if (codeRespInnerFrame.isValidate() && (codeRespInnerFrame.getErrorCode() != 0)) {
SpringContextHolder.getBean(LightReportErrorService.class).saveReportError(deviceName, codeRespInnerFrame);
}
}
--
Gitblit v1.9.3