From 982359342d0a4c868580c1e7db9784865941b5e1 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 25 四月 2022 15:06:49 +0800
Subject: [PATCH] 大气设备、数据(农耕)

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
index 469963c..743228f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
@@ -1,12 +1,15 @@
 package com.sandu.ximon.admin.manager.iot.amqp.processor;
 
 import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.config.RedisConfig;
 import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3CommonReportInnerFrame;
 import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
 import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3OperationReportInnerFrame;
 import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
 import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3ChargingEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
 import com.sandu.ximon.admin.service.C3ChargingService;
+import com.sandu.ximon.admin.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -41,6 +44,9 @@
                         , heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac()
                         , heartbeatReportInnerFrame.getHeartBeatDataPackage().getStatusBit()
                         , heartbeatReportInnerFrame.getHeartBeatDataPackage().getDeviceTemperature());
+
+                RedisUtils.getBean().set(C3mRedisConstant.C3_STATUS.getCode() + heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac()
+                        , heartbeatReportInnerFrame.getHeartBeatDataPackage(), 300L);
             }
         } else if (C3ChargingEnum.StartCharging.getCode().equals(functionCode)) {
             log.info("蹇冭烦鍝嶅簲鈥斺�擟3鍏呯數妗╁紑濮嬪厖鐢�");
@@ -57,7 +63,10 @@
             log.info(netRequestFrame.toString());
 
             if (netRequestFrame.isValidate()) {
-                SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
+                boolean b = SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
+                if (!b) {
+                    return;
+                }
             }
         }
     }

--
Gitblit v1.9.3