|
|
@ -170,8 +170,8 @@ public class DashboardAlertDao { |
|
|
if (!latestList.isEmpty() && latestList.get(0).getMergeAlarmFlag() == 1) { |
|
|
if (!latestList.isEmpty() && latestList.get(0).getMergeAlarmFlag() == 1) { |
|
|
AlertHistoryDTO latest = latestList.get(0); |
|
|
AlertHistoryDTO latest = latestList.get(0); |
|
|
String insertHandleSql = "INSERT INTO alert_handle_history (" + |
|
|
String insertHandleSql = "INSERT INTO alert_handle_history (" + |
|
|
"alert_history_id, device_id, alert_status, handle_at, detail_title, detail_content" + |
|
|
"alert_history_id, device_id, alert_status, handle_at, detail_title, detail_content, data_type" + |
|
|
") VALUES (?, ?, 0, ?, ?, ?)"; |
|
|
") VALUES (?, ?, 0, ?, ?, ?, 3)"; |
|
|
jdbcTemplate.update(insertHandleSql, |
|
|
jdbcTemplate.update(insertHandleSql, |
|
|
latest.getId(), |
|
|
latest.getId(), |
|
|
deviceId, |
|
|
deviceId, |
|
|
@ -228,8 +228,8 @@ public class DashboardAlertDao { |
|
|
|
|
|
|
|
|
// 20260702需求,告警发生的时候,这里也要记录一条告警发报记录
|
|
|
// 20260702需求,告警发生的时候,这里也要记录一条告警发报记录
|
|
|
String insertHandleSql = "INSERT INTO alert_handle_history (" + |
|
|
String insertHandleSql = "INSERT INTO alert_handle_history (" + |
|
|
"alert_history_id, device_id, handle_at" + |
|
|
"alert_history_id, device_id, handle_at, data_type" + |
|
|
") VALUES (?, ?, ?)"; |
|
|
") VALUES (?, ?, ?, 2)"; |
|
|
jdbcTemplate.update(insertHandleSql, |
|
|
jdbcTemplate.update(insertHandleSql, |
|
|
alertHistoryId, |
|
|
alertHistoryId, |
|
|
entity.getDeviceId(), |
|
|
entity.getDeviceId(), |
|
|
@ -274,8 +274,8 @@ public class DashboardAlertDao { |
|
|
// 20260630需求,自动恢复的要插入一条到处理历史
|
|
|
// 20260630需求,自动恢复的要插入一条到处理历史
|
|
|
long now = System.currentTimeMillis(); |
|
|
long now = System.currentTimeMillis(); |
|
|
String insertHandleSql = "INSERT INTO alert_handle_history (" + |
|
|
String insertHandleSql = "INSERT INTO alert_handle_history (" + |
|
|
"alert_history_id, device_id, alert_status, status, handle_at, detail_title, detail_content" + |
|
|
"alert_history_id, device_id, alert_status, status, handle_at, detail_title, detail_content, data_type" + |
|
|
") VALUES (?, ?, 1, 4, ?, ?, ?)"; |
|
|
") VALUES (?, ?, 1, 4, ?, ?, ?, 1)"; |
|
|
jdbcTemplate.update(insertHandleSql, |
|
|
jdbcTemplate.update(insertHandleSql, |
|
|
alertHistoryId, |
|
|
alertHistoryId, |
|
|
entity.getDeviceId(), |
|
|
entity.getDeviceId(), |
|
|
|