diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/record/entity/TemperatureExceededEvent.java b/src/main/java/com/zsc/edu/gateway/framework/springEvent/TemperatureExceededEvent.java
similarity index 83%
rename from src/main/java/com/zsc/edu/gateway/modules/iot/record/entity/TemperatureExceededEvent.java
rename to src/main/java/com/zsc/edu/gateway/framework/springEvent/TemperatureExceededEvent.java
index 4419632..b566f17 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/iot/record/entity/TemperatureExceededEvent.java
+++ b/src/main/java/com/zsc/edu/gateway/framework/springEvent/TemperatureExceededEvent.java
@@ -1,5 +1,6 @@
-package com.zsc.edu.gateway.modules.iot.record.entity;
+package com.zsc.edu.gateway.framework.springEvent;
 
+import com.zsc.edu.gateway.modules.iot.record.entity.RecordData;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.context.ApplicationEvent;
diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/TemperatureExceededEventListener.java b/src/main/java/com/zsc/edu/gateway/framework/springEvent/TemperatureExceededEventListener.java
similarity index 91%
rename from src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/TemperatureExceededEventListener.java
rename to src/main/java/com/zsc/edu/gateway/framework/springEvent/TemperatureExceededEventListener.java
index dd8d487..1db9799 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/TemperatureExceededEventListener.java
+++ b/src/main/java/com/zsc/edu/gateway/framework/springEvent/TemperatureExceededEventListener.java
@@ -1,8 +1,7 @@
-package com.zsc.edu.gateway.modules.iot.record.service.impl;
+package com.zsc.edu.gateway.framework.springEvent;
 
 import com.zsc.edu.gateway.modules.iot.device.repo.DeviceRepository;
 import com.zsc.edu.gateway.modules.iot.record.entity.RecordData;
-import com.zsc.edu.gateway.modules.iot.record.entity.TemperatureExceededEvent;
 import com.zsc.edu.gateway.modules.iot.tsl.entity.EventLog;
 import com.zsc.edu.gateway.modules.iot.tsl.repo.EventLogRepository;
 import com.zsc.edu.gateway.modules.iot.tsl.repo.EventRepository;
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 98b6928..33ce8f9 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,6 +1,6 @@
 package com.zsc.edu.gateway.modules.iot.record.service.impl;
 
-import com.alibaba.fastjson2.JSON;
+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;
@@ -11,7 +11,7 @@ import com.zsc.edu.gateway.modules.iot.device.repo.DeviceRepository;
 import com.zsc.edu.gateway.modules.iot.record.entity.DataWarningVo;
 import com.zsc.edu.gateway.modules.iot.record.entity.RecordData;
 import com.zsc.edu.gateway.modules.iot.record.entity.RecordDataStatusVo;
-import com.zsc.edu.gateway.modules.iot.record.entity.TemperatureExceededEvent;
+import com.zsc.edu.gateway.framework.springEvent.TemperatureExceededEvent;
 import com.zsc.edu.gateway.modules.iot.record.repo.RecordDataRepository;
 import com.zsc.edu.gateway.modules.iot.record.service.RecordDataService;
 import com.zsc.edu.gateway.modules.iot.tsl.entity.Event;
@@ -24,7 +24,6 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author zhuang
@@ -128,8 +127,7 @@ public class RecordDataServiceImpl extends ServiceImpl<RecordDataRepository, Rec
                     break;
                 default:
                     // 处理未知的比较类型
-                    System.err.println("Unknown compare type: " + compareType);
-                    break;
+                    throw new JSONException("Unknown compare type: " + compareType);
             }
         }
     }