diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml index 6e2cc3f..8bcbb06 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml @@ -70,7 +70,7 @@ SELECT - distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts, + distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId,ar.DETAIL AS detail, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts, , bs.STATION_NAME as stationName, bo.LINE_NAME as lineName diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmCancelRequest.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmCancelRequest.java index 85541a3..68e32f6 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmCancelRequest.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmCancelRequest.java @@ -18,4 +18,6 @@ private Integer resumeTime; + private String detail; + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml index 6e2cc3f..8bcbb06 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml @@ -70,7 +70,7 @@ SELECT - distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts, + distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId,ar.DETAIL AS detail, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts, , bs.STATION_NAME as stationName, bo.LINE_NAME as lineName diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmCancelRequest.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmCancelRequest.java index 85541a3..68e32f6 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmCancelRequest.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmCancelRequest.java @@ -18,4 +18,6 @@ private Integer resumeTime; + private String detail; + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordResponse.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordResponse.java index 564700e..dfda5f3 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordResponse.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordResponse.java @@ -79,5 +79,7 @@ private String nvrUser; + private String detail; + private String nvrPassword; } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java index 1d17d71..cfb900f 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java @@ -124,6 +124,12 @@ */ @TableField("LINE_NUM") private Integer lineNum; + + /** + * 巡航号 + */ + @TableField("DETAIL") + private String detail; /** * 预置点号 */ @@ -159,6 +165,8 @@ private String lineName; + + public AlarmRecord() { } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml index 6e2cc3f..8bcbb06 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml @@ -70,7 +70,7 @@