machunlei/springboot-xinda-dev
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

修改告警导出 新增公共档案

Browse Source
This commit is contained in:
15666619788
2025-08-02 17:05:55 +08:00
parent 6bc5fcb2aa
commit 1e7df355fa
14 changed files with 506 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xinda-gateway/xinda-mq/src/main/java/com/xinda/mq/ruleEngine/SceneContext.java
View File

@@ -392,7 +392,7 @@ public class SceneContext {
private boolean checkDeviceAlerting(Long sceneId, String deviceNum) {
AlertLog alertLog = new AlertLog();
alertLog.setSerialNumber(deviceNum);
alertLog.setStatus(2);
alertLog.setStatus("2");
alertLog.setCreateBy(sceneId.toString());
Long count = alertLogService.selectSceneAlertLogListCount(alertLog);
// 查询设备告警对应的场景是否有未处理告警
@@ -437,7 +437,7 @@ public class SceneContext {
AlertLog alertLog = new AlertLog();
alertLog.setCreateBy(scriptTemplate.getRecoverId().toString());
alertLog.setSerialNumber(deviceNum);
alertLog.setStatus(2);
alertLog.setStatus("2");
//自动设置告警处理状态
alertLogService.updateAlertLogStatus(alertLog);
//如果存在延时确认任务，则删除
@@ -529,14 +529,14 @@ public class SceneContext {
private AlertLog getTerminalUserAlertLog(SceneTerminalUserVO sceneTerminalUserVO, Device device, SceneThingsModelItem sceneThingsModelItem) {
AlertLog alertLog = new AlertLog();
alertLog.setAlertName("设备告警");
alertLog.setAlertLevel(1L);
alertLog.setAlertLevel("1");
alertLog.setSerialNumber(sceneThingsModelItem.getDeviceNumber());
alertLog.setProductId(sceneThingsModelItem.getProductId());
alertLog.setDeviceName(device.getDeviceName());
alertLog.setUserId(sceneTerminalUserVO.getUserId());
alertLog.setCreateBy(sceneThingsModelItem.getSceneId().toString());
// 统一未处理
alertLog.setStatus(2);
alertLog.setStatus("2");
JSONObject jsonObject = new JSONObject();
jsonObject.put("id", sceneThingsModelItem.getId());
jsonObject.put("value", sceneThingsModelItem.getValue());
@@ -564,7 +564,7 @@ public class SceneContext {
alertLog.setUserId(device.getTenantId());
alertLog.setCreateBy(sceneThingsModelItem.getSceneId().toString());
// 统一未处理
alertLog.setStatus(2);
alertLog.setStatus("2");
JSONObject jsonObject = new JSONObject();
jsonObject.put("id", sceneThingsModelItem.getId());
jsonObject.put("value", sceneThingsModelItem.getValue());