From 4aa7567b93429acc0f6c6a3e7ff0e29d61487af6 Mon Sep 17 00:00:00 2001
From: zhuangtianxiang <2913129173@qq.com>
Date: Fri, 21 Mar 2025 11:26:45 +0800
Subject: [PATCH] =?UTF-8?q?refactor(iot):=20=E4=BC=98=E5=8C=96=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=92=8C=E4=BA=8B=E4=BB=B6=E7=9B=B8=E5=85=B3=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了 DeviceController 中未使用的导入- 更新了 EventController 中的事件日志分页接口，使用路径变量
- 在 RecordDataServiceImpl 中增加了对设备下无事件的异常处理
- 移除了 DeviceServiceImpl 中的冗余空行
---
 .../modules/iot/device/controller/DeviceController.java     | 3 ---
 .../modules/iot/device/service/impl/DeviceServiceImpl.java  | 2 +-
 .../iot/record/service/impl/RecordDataServiceImpl.java      | 3 ++-
 .../gateway/modules/iot/tsl/controller/EventController.java | 6 +++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/controller/DeviceController.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/controller/DeviceController.java
index 3315907..b17ebd4 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/controller/DeviceController.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/controller/DeviceController.java
@@ -15,14 +15,11 @@ import com.zsc.edu.gateway.modules.iot.device.vo.DeviceVo;
 import com.zsc.edu.gateway.modules.iot.record.entity.RecordData;
 import com.zsc.edu.gateway.modules.iot.record.service.RecordDataService;
 import com.zsc.edu.gateway.modules.operationLog.entity.OperationLogAnnotation;
-import jakarta.annotation.Resource;
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import java.util.List;
 
diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java
index c1ae71c..5b3bc70 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java
@@ -240,4 +240,4 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceRepository, Device> imp
         device.setOnline(!device.getOnline());
         return baseMapper.updateById(device);
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/RecordDataServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/RecordDataServiceImpl.java
index f84bab7..53e9fd3 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/RecordDataServiceImpl.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/RecordDataServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zsc.edu.gateway.modules.iot.record.service.impl;
 
+import com.alibaba.fastjson2.JSONException;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -106,7 +107,7 @@ public class RecordDataServiceImpl extends ServiceImpl<RecordDataRepository, Rec
         // 获取产品下的所有事件
         List<Event> events = eventRepository.selectByProductId(device.getProductId(), true);
         if (events.isEmpty()) {
-            return; // 如果没有事件，直接返回
+            throw new JSONException("该设备下事件并未启用！或者该设备下无定义事件！");
         }
 
         // 遍历每个事件
diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/controller/EventController.java b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/controller/EventController.java
index decaa29..4e6c09d 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/controller/EventController.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/controller/EventController.java
@@ -74,12 +74,12 @@ public class EventController {
      * @param page     分页参数
      * @return Page<Device> 事件分页数据
      */
-    @GetMapping("/log")
+    @GetMapping("/{clientId}/log")
     @PreAuthorize("hasAuthority('iot:event:query')")
-    public IPage<EventLog> eventLogPage(Page<EventLog> page, String clientId) {
+    public IPage<EventLog> eventLogPage(Page<EventLog> page, @PathVariable("clientId") String clientId) {
         return eventLogRepository.selectPage(page, new LambdaQueryWrapper<EventLog>().eq(EventLog::getRecordId, clientId));
     }
-
+//TODO 详情接口
 
     /**
      * 删除事件