vertoryao/iot-gateway
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(iot): 重构温度超出事件处理

Browse Source 
- 将 TemperatureExceededEvent 和 TemperatureExceededEventListener 从 record 模块移动到 framework 包中
- 优化 RecordDataServiceImpl 中的比较逻辑，使用 JSONException 处理未知比较类型
- 移除了未使用的 Map 导入
This commit is contained in:
zhuangtianxiang 2025-03-12 11:24:20 +08:00
parent 0f803c242e
commit 0b5288cbe2
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zsc/edu/gateway/modules/iot/record/entity/TemperatureExceededEvent.java → src/main/java/com/zsc/edu/gateway/framework/springEvent/TemperatureExceededEvent.java
View File

@ -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;

3
src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/TemperatureExceededEventListener.java → src/main/java/com/zsc/edu/gateway/framework/springEvent/TemperatureExceededEventListener.java
View File

@ -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;

8
src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/RecordDataServiceImpl.java
View File

@ -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);
}
}
}