From 0b5288cbe246dc9a03b287dc011aa75b29a4ae10 Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Wed, 12 Mar 2025 11:24:20 +0800 Subject: [PATCH] =?UTF-8?q?refactor(iot):=20=E9=87=8D=E6=9E=84=E6=B8=A9?= =?UTF-8?q?=E5=BA=A6=E8=B6=85=E5=87=BA=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 TemperatureExceededEvent 和 TemperatureExceededEventListener 从 record 模块移动到 framework 包中 - 优化 RecordDataServiceImpl 中的比较逻辑，使用 JSONException 处理未知比较类型 - 移除了未使用的 Map 导入 --- .../springEvent}/TemperatureExceededEvent.java | 3 ++- .../springEvent}/TemperatureExceededEventListener.java | 3 +-- .../iot/record/service/impl/RecordDataServiceImpl.java | 8 +++----- 3 files changed, 6 insertions(+), 8 deletions(-) rename src/main/java/com/zsc/edu/gateway/{modules/iot/record/entity => framework/springEvent}/TemperatureExceededEvent.java (83%) rename src/main/java/com/zsc/edu/gateway/{modules/iot/record/service/impl => framework/springEvent}/TemperatureExceededEventListener.java (91%) 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