From 98505f497a12382b259f643232f2c6c63f5004f8 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 24 六月 2023 10:40:23 +0800
Subject: [PATCH] 增加历史报警数据按command和时间区间查询
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
index 71b98b5..70ebb7c 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
@@ -70,6 +70,7 @@
private IHikClientService hikClientService;
@Resource
private RedisCache redisCache;
+
/**
* @鎻忚堪 鎸夋潯浠舵煡璇㈡姤璀�
* @鍙傛暟 [condition]
@@ -133,6 +134,7 @@
return null;
}
}
+
/**
* @鎻忚堪 鎸夋潯浠舵洿鏂版煡鐪嬫椂闂�
* @鍙傛暟 [condition]
@@ -165,6 +167,7 @@
return null;
}
}
+
/**
* @鎻忚堪 寮傛澶勭悊鎺ユ敹鐨勬姤璀�
* @鍙傛暟 [topic, message]
@@ -302,20 +305,18 @@
double distance = GisTool.getDistance(cmd.getTargetPosition(), camPosition);
if (distance != 0.0 && distance <= camera.getCamMaxVisibleDistance()) {
distanceMap.put(camera.getId(), distance);
- if(StringUtils.isNull(camera.getCamAlarmGuideEnable()))
- {
+ if (StringUtils.isNull(camera.getCamAlarmGuideEnable())) {
camera.setCamAlarmGuideEnable(0);
}
- guideMap.put(camera.getId(),camera.getCamAlarmGuideEnable());
+ guideMap.put(camera.getId(), camera.getCamAlarmGuideEnable());
}
}
if (distanceMap.size() > 0) {
log.debug("灏濊瘯鏌ユ壘鏈�杩戝厜鐢�");
//鑾峰彇璺濈瀛楀吀涓渶杩戠殑涓�涓浉鏈篒D
String minDistanceCameraId = ArdTool.getKeyByMinValue(distanceMap);
- log.debug("鏌ユ壘鍒版渶杩戝厜鐢�:"+minDistanceCameraId+"锛屽皾璇曞紩瀵�");
- if(guideMap.get(minDistanceCameraId).equals(0))
- {
+ log.debug("鏌ユ壘鍒版渶杩戝厜鐢�:" + minDistanceCameraId + "锛屽皾璇曞紩瀵�");
+ if (guideMap.get(minDistanceCameraId).equals(0)) {
log.debug("璇ュ厜鐢垫湭寮�鍚姤璀﹀紩瀵�");
return "";
}
@@ -366,4 +367,25 @@
countMap.put("1014 ", count1014);
return countMap;
}
+
+ @Override
+ public Object selectAlarmList(Integer command, String beginTime, String endTime) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("beginTime", beginTime);
+ params.put("endTime", endTime);
+ switch (command) {
+ case 1001:
+ ArdAlarmStealelec aas = new ArdAlarmStealelec();
+ aas.setParams(params);
+ List<ArdAlarmStealelec> ardAlarmStealelecs = ardAlarmStealelecMapper.selectArdAlarmStealelecList(aas);
+ return ardAlarmStealelecs;
+
+ case 1014:
+ ArdAlarmTube aat = new ArdAlarmTube();
+ aat.setParams(params);
+ List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectArdAlarmTubeList(aat);
+ return ardAlarmTubes;
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3