fys/fys-Multi-tenant
0
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

自动报警

Browse Source
This commit is contained in:
daiyongfei
2025-09-28 15:28:19 +08:00
parent 4d2b7c6adf
commit 5230a95865
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AlarmInformationVo.java
View File

@ -4,6 +4,7 @@ import lombok.Data;
/**
* 报警信息
* 0-强制报警，1-撞击闯入，2-自动报警，3-电子围栏告警
*
* @author: 默苍璃
* @date: 2025-09-0114:24
@ -21,7 +22,6 @@ public class AlarmInformationVo {
*/
private Integer processingAlarm = 0;
/**
* 今日报警总数
*/
@ -32,7 +32,6 @@ public class AlarmInformationVo {
*/
private Integer processingAlarmToday = 0;
/**
* 强制报警
*/
@ -44,12 +43,12 @@ public class AlarmInformationVo {
private Integer intrusionImpact = 0;
/**
* 手动报警
* 自动报警
*/
private Integer alarmManual = 0;
private Integer alarmAuto = 0;
/**
*
* 电子围栏告警
*/
private Integer fenceElectronic = 0;

4
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AlarmStatisticsVo.java
View File

@ -43,10 +43,10 @@ public class AlarmStatisticsVo implements Serializable {
private Integer intrusionImpactAlarms = 0;
/**
* 手动报警数量
* 自动报警数量
* device_action = 2
*/
private Integer manualAlarms = 0;
private Integer autoAlarms = 0;
/**
* 电子围栏告警数量

2
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml
View File

@ -76,7 +76,7 @@
(SELECT COUNT(1) FROM device_alarm WHERE treatment_state = 0) AS processedAlarms,
(SELECT COUNT(1) FROM device_alarm WHERE device_action = 0) AS forcedAlarms,
(SELECT COUNT(1) FROM device_alarm WHERE device_action = 1) AS intrusionImpactAlarms,
(SELECT COUNT(1) FROM device_alarm WHERE device_action = 2) AS manualAlarms,
(SELECT COUNT(1) FROM device_alarm WHERE device_action = 2) AS autoAlarms,
(SELECT COUNT(1) FROM device_alarm WHERE device_action = 3) AS geoFenceAlarms
</select>

2
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
View File

@ -404,7 +404,7 @@
SELECT COUNT (1)
FROM device_alarm
WHERE device_action = 2
) AS alarmManual
) AS alarmAuto
, (
SELECT COUNT (1)
FROM device_alarm