From 7f0de1e34e102d06e182b8f47af7334ac45cca07 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 31 Jan 2025 18:04:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E3=80=91IoT=EF=BC=9Aserver=20=E5=AE=9E=E7=8E=B0=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E8=A1=8C=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=88?=
 =?UTF-8?q?=E4=B8=8D=E5=8C=85=E6=8B=AC=20http=20=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../control/IotDeviceUpstreamServiceImpl.java | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamServiceImpl.java
index ca0263e7e2..6188d0b5d7 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamServiceImpl.java
@@ -67,7 +67,10 @@ public class IotDeviceUpstreamServiceImpl implements IotDeviceUpstreamService {
         }
         // 2.2 情况二：事件上报
         if (Objects.equals(simulatorReqVO.getType(), IotDeviceMessageTypeEnum.EVENT.getType())) {
-            // TODO 芋艿：待实现
+            reportDeviceEvent(((IotDeviceEventReportReqDTO)
+                    new IotDeviceEventReportReqDTO().setRequestId(requestId).setReportTime(LocalDateTime.now())
+                            .setProductKey(device.getProductKey()).setDeviceName(device.getDeviceName()))
+                    .setIdentifier(simulatorReqVO.getIdentifier()).setParams((Map<String, Object>) simulatorReqVO.getData()));
             return;
         }
         // 2.3 情况三：状态变更
@@ -120,7 +123,7 @@ public class IotDeviceUpstreamServiceImpl implements IotDeviceUpstreamService {
     @Override
     public void reportDeviceProperty(IotDevicePropertyReportReqDTO reportReqDTO) {
         // 1.1 获得设备
-        log.info("[reportDevicePropertyData][上报设备属性数据: {}]", reportReqDTO);
+        log.info("[reportDevicePropertyData][上报设备属性: {}]", reportReqDTO);
         IotDeviceDO device = deviceService.getDeviceByProductKeyAndDeviceNameFromCache(
                 reportReqDTO.getProductKey(), reportReqDTO.getDeviceName());
         if (device == null) {
@@ -141,9 +144,24 @@ public class IotDeviceUpstreamServiceImpl implements IotDeviceUpstreamService {
 
     @Override
     public void reportDeviceEvent(IotDeviceEventReportReqDTO reportReqDTO) {
-        log.info("[reportDeviceEventData][上报设备事件数据: {}]", reportReqDTO);
+        // 1.1 获得设备
+        log.info("[reportDeviceEventData][上报设备事件: {}]", reportReqDTO);
+        IotDeviceDO device = deviceService.getDeviceByProductKeyAndDeviceNameFromCache(
+                reportReqDTO.getProductKey(), reportReqDTO.getDeviceName());
+        if (device == null) {
+            log.error("[reportDeviceEventData][设备({}/{})不存在]",
+                    reportReqDTO.getProductKey(), reportReqDTO.getDeviceName());
+            return;
+        }
+        // 1.2 记录设备的最后时间
+        updateDeviceLastTime(device, reportReqDTO);
 
-        // TODO 芋艿：待实现
+        // 2. 发送设备消息
+        IotDeviceMessage message = BeanUtils.toBean(reportReqDTO, IotDeviceMessage.class)
+                .setType(IotDeviceMessageTypeEnum.EVENT.getType())
+                .setIdentifier(reportReqDTO.getIdentifier())
+                .setData(reportReqDTO.getParams());
+        sendDeviceMessage(message, device);
     }
 
     private void updateDeviceLastTime(IotDeviceDO device, IotDeviceUpstreamAbstractReqDTO reqDTO) {