From 0362c0c8502a81fc974afb8d2aff85d9efd7bbb1 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 29 六月 2023 17:28:22 +0800
Subject: [PATCH] 修改报警逻辑 增加优先级队列
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 395 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 289 insertions(+), 106 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 0327572..2fa6745 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
@@ -5,7 +5,12 @@
import com.ruoyi.alarm.cameraAlarm.mapper.ArdAlarmCameraMapper;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmCondition;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmData;
+import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
+import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
import com.ruoyi.alarm.globalAlarm.service.IGlobalAlarmService;
+import com.ruoyi.alarm.radarAlarm.domain.ArdAlarmRadar;
+import com.ruoyi.alarm.radarAlarm.domain.RadarAlarmData;
+import com.ruoyi.alarm.radarAlarm.mapper.ArdAlarmRadarMapper;
import com.ruoyi.alarm.stealAlarm.domain.ArdAlarmStealelec;
import com.ruoyi.alarm.stealAlarm.mapper.ArdAlarmStealelecMapper;
import com.ruoyi.alarm.tubeAlarm.domain.ArdAlarmTube;
@@ -19,6 +24,7 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.constant.CamPriority;
import com.ruoyi.utils.tools.ArdTool;
import com.ruoyi.utils.tools.GisTool;
import com.ruoyi.common.utils.uuid.IdUtils;
@@ -51,17 +57,19 @@
@Slf4j(topic = "mqtt")
public class GlobalAlarmServiceImpl implements IGlobalAlarmService {
@Resource
- ArdAlarmStealelecMapper ardAlarmStealelecMapper;
+ private ArdAlarmRadarMapper ardAlarmRadarMapper;
@Resource
- ArdAlarmTubeMapper ardAlarmTubeMapper;
+ private ArdAlarmStealelecMapper ardAlarmStealelecMapper;
@Resource
- ArdAlarmCameraMapper ardAlarmCameraMapper;
+ private ArdAlarmTubeMapper ardAlarmTubeMapper;
@Resource
- ArdTubesMapper ardTubesMapper;
+ private ArdAlarmCameraMapper ardAlarmCameraMapper;
@Resource
- ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;
+ private ArdTubesMapper ardTubesMapper;
@Resource
- ArdTubesDetailsMapper ardTubesDetailsMapper;
+ private ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;
+ @Resource
+ private ArdTubesDetailsMapper ardTubesDetailsMapper;
@Resource
private ISysConfigService configService;
@Resource
@@ -111,6 +119,36 @@
.setLatitude(ardAlarmCamera.getLatitude())
.setCount(ardAlarmCamera.getCount())
.setTotal(ardAlarmCamera.getTotal());
+ return globalAlarmData;
+ })
+ .collect(Collectors.toList());
+ case 1003:
+ List<ArdAlarmRadar> ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "杩愬姩鐩爣妫�娴�");
+ return ardAlarmRadars.stream()
+ .map(ardAlarmRadar -> {
+ GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+ .setId(ardAlarmRadar.getId())
+ .setName(ardAlarmRadar.getName())
+ .setAlarmTime(ardAlarmRadar.getAlarmTime())
+ .setLongitude(ardAlarmRadar.getLongitude())
+ .setLatitude(ardAlarmRadar.getLatitude())
+ .setCount(ardAlarmRadar.getCount())
+ .setTotal(ardAlarmRadar.getTotal());
+ return globalAlarmData;
+ })
+ .collect(Collectors.toList());
+ case 1004:
+ ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "鐑簮妫�娴�");
+ return ardAlarmRadars.stream()
+ .map(ardAlarmRadar -> {
+ GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+ .setId(ardAlarmRadar.getId())
+ .setName(ardAlarmRadar.getName())
+ .setAlarmTime(ardAlarmRadar.getAlarmTime())
+ .setLongitude(ardAlarmRadar.getLongitude())
+ .setLatitude(ardAlarmRadar.getLatitude())
+ .setCount(ardAlarmRadar.getCount())
+ .setTotal(ardAlarmRadar.getTotal());
return globalAlarmData;
})
.collect(Collectors.toList());
@@ -177,20 +215,14 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
@Override
- @Async("alarmExecutor")
+// @Async("alarmExecutor")
public void receiveAlarm(String topic, String message) {
try {
- String simpleUUID = IdUtils.simpleUUID();
switch (topic) {
case "stealelec":
//region 澶勭悊鐩楃數鎶ヨ
ArdAlarmStealelec ardAlarmStealelec = JSONObject.parseObject(message, ArdAlarmStealelec.class);
- ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(ardAlarmStealelec.getDescribe());
- if (well != null) {
- ardAlarmStealelec.setLongitude(well.getLongitude());
- ardAlarmStealelec.setLatitude(well.getLatitude());
- ardAlarmStealelec.setAltitude(well.getAltitude());
- }
+
ArdAlarmStealelec existe = ardAlarmStealelecMapper.selectByPrimaryKey(ardAlarmStealelec.getId());
if (StringUtils.isNotNull(existe)) {
return;
@@ -198,26 +230,13 @@
int aas = ardAlarmStealelecMapper.insertArdAlarmStealelec(ardAlarmStealelec);
if (aas > 0) {
log.info("stealelec鍏ュ簱鎴愬姛锛�" + ardAlarmStealelec);
- //寮曞褰曞儚
- CameraCmd cmd = new CameraCmd();
- cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("stealelec");
- cmd.setOperator("sys_steal_elec");
- cmd.setExpired(30);
- cmd.setTargetPosition(new double[]{well.getLongitude(), well.getLatitude(), well.getAltitude()});
- String url = guideCamera(cmd);
- if (StringUtils.isNotEmpty(url)) {
- //鏇存柊褰曞儚
- ardAlarmStealelec.setRecordUrl(url);
- ardAlarmStealelecMapper.updateArdAlarmStealelec(ardAlarmStealelec);
- }
}
//endregion
break;
case "tube":
//region 澶勭悊绠＄嚎娉勯湶鎶ヨ
ArdAlarmTube ardAlarmTube = JSONObject.parseObject(message, ArdAlarmTube.class);
- ardAlarmTube.setId(simpleUUID);
+ ardAlarmTube.setId(IdUtils.simpleUUID());
ArdTubesDetails atd = new ArdTubesDetails();
atd.setReelNumber(ardAlarmTube.getTubeId());
List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(atd);
@@ -238,18 +257,9 @@
int aat = ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
if (aat > 0) {
log.debug("tube鍏ュ簱鎴愬姛锛�" + ardAlarmTube);
- //寮曞褰曞儚
- CameraCmd cmd = new CameraCmd();
- cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("tube");
- cmd.setOperator("sys_tube_leak");
- cmd.setExpired(30);
- cmd.setTargetPosition(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude(), ardAlarmTube.getAltitude()});
- String url = guideCamera(cmd);
- //鏇存柊褰曞儚
- if (StringUtils.isNotEmpty(url)) {
- ardAlarmTube.setRecordUrl(url);
- ardAlarmTubeMapper.updateArdAlarmTube(ardAlarmTube);
+ String nearbyCamera = getNearbyCamera(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude()});
+ if(StringUtils.isNotEmpty(nearbyCamera)) {
+ addTaskQueue(nearbyCamera, ardAlarmTube.getId(), "sys_tube_leak", ardAlarmTube.getAlarmTime(), 1);
}
}
//endregion
@@ -257,94 +267,234 @@
case "camera":
//region 澶勭悊閫氱敤鍏夌數鎶ヨ
ArdAlarmCamera ardAlarmCamera = JSONObject.parseObject(message, ArdAlarmCamera.class);
- ardAlarmCamera.setId(simpleUUID);
+ ardAlarmCamera.setId(IdUtils.simpleUUID());
+
int aac = ardAlarmCameraMapper.insertArdAlarmCamera(ardAlarmCamera);
if (aac > 0) {
log.debug("camera鍏ュ簱鎴愬姛锛�" + ardAlarmCamera);
- //寮曞褰曞儚
- CameraCmd cmd = new CameraCmd();
- cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("camera");
- cmd.setOperator("sys_camera");
- cmd.setExpired(30);
- cmd.setTargetPosition(new double[]{ardAlarmCamera.getLongitude(), ardAlarmCamera.getLatitude()});
- String url = guideCamera(cmd);
- //鏇存柊褰曞儚
- if (StringUtils.isNotEmpty(url)) {
- ardAlarmCamera.setRecordUrl(url);
- ardAlarmCameraMapper.updateArdAlarmCamera(ardAlarmCamera);
+ String nearbyCamera = getNearbyCamera(new double[]{ardAlarmCamera.getLongitude(), ardAlarmCamera.getLatitude()});
+ if(StringUtils.isNotEmpty(nearbyCamera)) {
+ addTaskQueue(nearbyCamera, ardAlarmCamera.getId(), "sys_camera", ardAlarmCamera.getAlarmTime(), 1);
}
+ //寮曞褰曞儚
+// CameraCmd cmd = new CameraCmd();
+// cmd.setRecordBucketName("record");
+// cmd.setRecordObjectName("camera");
+// cmd.setOperator("sys_camera");
+// cmd.setExpired(30);
+// cmd.setTargetPosition(new double[]{ardAlarmCamera.getLongitude(), ardAlarmCamera.getLatitude()});
+// boolean res = guideCamera(cmd);
+// if (res) {
+// String url = alarmToRecord(cmd);
+// if (StringUtils.isNotEmpty(url)) {
+// //鏇存柊褰曞儚
+// ardAlarmCamera.setRecordUrl(url);
+// ardAlarmCameraMapper.updateArdAlarmCamera(ardAlarmCamera);
+// }
+// }
}
//endregion
break;
+ case "radar":
+ //region 澶勭悊闆疯揪鎶ヨ
+ RadarAlarmData radarAlarmData = JSONObject.parseObject(message, RadarAlarmData.class);
+ List<ArdAlarmRadar> ardAlarmRadars = radarAlarmData.getArdAlarmRadars();
+ for (ArdAlarmRadar ardAlarmRadar : ardAlarmRadars) {
+ String uuid = IdUtils.simpleUUID();
+ ardAlarmRadar.setId(uuid);
+ ardAlarmRadar.setAlarmTime(radarAlarmData.getAlarmTime());
+ String name = ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")";
+ ardAlarmRadar.setName(name);
+ ardAlarmRadar.setCreateTime(new Date());
+ String alarmType = "";
+ switch (ardAlarmRadar.getAlarmType()) {
+ case "杩愬姩鐩爣妫�娴�":
+ alarmType = "sys_radar_move";
+ break;
+ case "鐑簮妫�娴�":
+ alarmType = "sys_radar_fire";
+ break;
+ }
+ //鍒ゆ柇褰撳墠鎶ヨ鐐�5鍒嗛挓鍐呮槸鍚﹀凡寮曞
+ ardAlarmRadar.setGuideFlag(1);
+ ArdAlarmRadar AlarmRadar = ardAlarmRadarMapper.getArdAlarmRadarWithGuide(ardAlarmRadar);
+ if (StringUtils.isNull(AlarmRadar)) {
+ //5鍒嗛挓鍐呮湭寮曞鐩存帴鍏ュ簱
+ ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
+ //鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
+ String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
+ if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
+ //鍏ラ槦鍒楀緟寮曞
+ addTaskQueue(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getAlarmTime(), 1);
+ }
+ } else {
+ //5鍒嗛挓鍐呮湁寮曞
+ ardAlarmRadar.setGuideFlag(0);
+ int count = ardAlarmRadarMapper.getArdAlarmRadarWithNotGuide(ardAlarmRadar, AlarmRadar.getCreateTime());
+ if (count >= 3) {
+ //鏈紩瀵艰秴杩�3娆★紝鐩存帴鍏ュ簱鍏ラ槦
+ //5鍒嗛挓鍐呮湭寮曞鐩存帴鍏ュ簱
+ ardAlarmRadar.setGuideFlag(1);
+ ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
+ //鍏ラ槦鍒楀緟寮曞
+ //鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
+ String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
+ if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
+ //濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
+ addTaskQueue(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getAlarmTime(), count);
+ }
+ } else {
+ //鏈紩瀵兼湭瓒呰繃3娆★紝鐩存帴鍏ュ簱
+ ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
+ }
+
+ }
+
+
+ //鑾峰彇鍏磋叮鐐瑰叧鑱旂殑澶у厜鐢�
+// ArdAlarmpointsWell well=new ArdAlarmpointsWell();
+// well.setWellId(ardAlarmRadar.getName());
+// List<ArdAlarmpointsWell> ardAlarmpointsWells = ardAlarmpointsWellMapper.selectArdAlarmpointsWellList(well);
+// if(ardAlarmpointsWells!=null&&ardAlarmpointsWells.size()>0)
+// {
+// String cameraIdWithWell = ardAlarmpointsWells.get(0).getCameraId();
+// }
+
+ }
+ printPriorityQueue();
+ //endregion
+ break;
}
+ printPriorityQueue();
} catch (Exception ex) {
log.error("鎺ユ敹鎶ヨ寮傚父:" + ex.getMessage());
}
}
/**
+ * 寮曞浠诲姟鍏ラ槦鏂规硶
+ */
+ private void addTaskQueue(String cameraId, String alarmId, String alarmType, Date alarmTime, Integer num) {
+
+ GuideTask guideTask = new GuideTask();
+ guideTask.setCameraId(cameraId);
+ guideTask.setAlarmId(alarmId);
+ SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ guideTask.setAlarmTime(fmt.format(alarmTime));
+ Integer priority = CamPriority.priorityMap.get(alarmType);
+ guideTask.setPriority(priority);
+ guideTask.setNum(num);
+
+ PriorityQueue<GuideTask> priorityQueue = GuidePriorityQueue.cameraQueueMap.get(guideTask.getCameraId());
+ priorityQueue.add(guideTask);
+ }
+
+ /**
+ * 鎵撳嵃闃熷垪
+ */
+ private void printPriorityQueue() {
+ for (String cameraId : GuidePriorityQueue.cameraQueueMap.keySet()) {
+ log.info("cameraId" + cameraId);
+ PriorityQueue<GuideTask> priorityQueue = GuidePriorityQueue.cameraQueueMap.get(cameraId);
+ for (GuideTask task : priorityQueue) {
+ log.info("alarmId:" + task.getAlarmId() + " alarmTime:" + task.getAlarmTime() + " priority:" + task.getPriority() + " num:" + task.getNum() + " cameraId:" + task.getCameraId());
+ }
+
+ }
+ }
+
+ /**
+ * 鏌ユ壘闄勮繎寮�鍚姤璀﹀紩瀵煎姛鑳藉厜鐢�
+ */
+ private String getNearbyCamera(double[] targetPosition) {
+ String minDistanceCameraId = "";
+ //鑾峰彇鎵�鏈夊ぇ鍏夌數
+ List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(new ArdCameras("1"));
+ //缁熻鎵�鏈夊ぇ鍏夌數鍙鑼冨洿鍐呬笌鎶ヨ鐐圭殑璺濈
+ Map<String, Double> distanceMap = new HashMap<>();
+ Map<String, Integer> guideMap = new HashMap<>();
+ for (ArdCameras camera : ardCamerasList) {
+ double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
+ double distance = GisTool.getDistance(targetPosition, camPosition);
+ if (distance != 0.0 && distance <= camera.getCamMaxVisibleDistance()) {
+ distanceMap.put(camera.getId(), distance);
+ if (StringUtils.isNull(camera.getCamAlarmGuideEnable())) {
+ camera.setCamAlarmGuideEnable(0);
+ }
+ guideMap.put(camera.getId(), camera.getCamAlarmGuideEnable());
+ }
+ }
+ if (distanceMap.size() > 0) {
+ log.debug("灏濊瘯鏌ユ壘鏈�杩戝厜鐢�");
+ //鑾峰彇璺濈瀛楀吀涓渶杩戠殑涓�涓浉鏈篒D
+ minDistanceCameraId = ArdTool.getKeyByMinValue(distanceMap);
+ log.debug("鏌ユ壘鍒版渶杩戝厜鐢�:" + minDistanceCameraId);
+ if (guideMap.get(minDistanceCameraId).equals(0)) {
+ log.debug("璇ュ厜鐢垫湭寮�鍚姤璀﹀紩瀵�");
+ return " ";
+ }
+ }
+ return minDistanceCameraId;
+ }
+
+ /**
* @鎻忚堪 寮曞鏈�杩戠殑澶у厜鐢垫寚鍚戠洰鏍�
- * @鍙傛暟 [targetPosition]
- * @杩斿洖鍊� java.lang.String
+ * @鍙傛暟 [cmd]
+ * @杩斿洖鍊� boolean
* @鍒涘缓浜� 鍒樿嫃涔�
- * @鍒涘缓鏃堕棿 2023/6/15 11:55
+ * @鍒涘缓鏃堕棿 2023/6/28 16:34
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
- private String guideCamera(CameraCmd cmd) {
- String url = "";
+ private boolean guideCamera(CameraCmd cmd) {
try {
String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
- //鑾峰彇鎵�鏈夊ぇ鍏夌數
- List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(new ArdCameras("1"));
- //缁熻鎵�鏈夊ぇ鍏夌數鍙鑼冨洿鍐呬笌鎶ヨ鐐圭殑璺濈
- Map<String, Double> distanceMap = new HashMap<>();
- Map<String, Integer> guideMap = new HashMap<>();
- for (ArdCameras camera : ardCamerasList) {
- double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
- double distance = GisTool.getDistance(cmd.getTargetPosition(), camPosition);
- if (distance != 0.0 && distance <= camera.getCamMaxVisibleDistance()) {
- distanceMap.put(camera.getId(), distance);
- if (StringUtils.isNull(camera.getCamAlarmGuideEnable())) {
- camera.setCamAlarmGuideEnable(0);
- }
- 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("璇ュ厜鐢垫湭寮�鍚姤璀﹀紩瀵�");
- return "";
- }
+ String nearbyCamera = getNearbyCamera(cmd.getTargetPosition());
+ if (StringUtils.isNotEmpty(nearbyCamera)) {
//寮曞鍏夌數
- cmd.setCameraId(minDistanceCameraId);
+ cmd.setCameraId(nearbyCamera);
cmd.setChannelNum(ArdTool.getChannelBydayNightTime(dayNightTime));
boolean guideRes = hikClientService.guideTargetPosition(cmd);
- if (guideRes) {
- log.debug("寮曞鎴愬姛锛屽皾璇曞綍鍍�");
- hikClientService.controlLock(cmd);//涓婇攣
- cmd.setEnable(true);//寮�濮嬪綍鍍�
- hikClientService.recordToMinio(cmd);//寮�濮嬪綍鍍�
- GlobalVariable.threadMap.put(minDistanceCameraId, Thread.currentThread().getName());//灏嗙浉鏈篿d涓庡綋鍓嶅鐞嗙嚎绋嬪悕绉扮粦瀹�
- Thread.sleep(cmd.getExpired() * 1000);//褰曞儚鏃堕暱
- String thread = GlobalVariable.threadMap.get(minDistanceCameraId);
- String currentThread = Thread.currentThread().getName();
- //鍒ゆ柇鐩告満缁戝畾绾跨▼鏄惁鏄綋鍓嶇嚎绋嬶紝濡傛灉鏄紝鍋滄褰曞儚锛屽鏋滀笉鏄紝璇存槑鐩告満琚叾浠栫嚎绋嬫姠鍗狅紝涓嶅仠姝㈠綍鍍�
- if (thread.equals(currentThread)) {
- cmd.setEnable(false);//鍋滄褰曞儚
- cmd.setUploadMinio(true);//涓婁紶minio
- url = hikClientService.recordToMinio(cmd);//鍋滄褰曞儚杩斿洖url
- }
- }
+ return guideRes;
} else {
log.debug("鏈煡鎵惧埌鏈�杩戝厜鐢�");
+ return false;
+ }
+ } catch (
+ Exception ex) {
+ log.error("寮曞寮傚父:" + ex.getMessage());
+ return false;
+ }
+
+ }
+
+ /**
+ * @鎻忚堪 鎶ヨ褰曞儚
+ * @鍙傛暟 [cmd]
+ * @杩斿洖鍊� java.lang.String
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/28 16:33
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+ public String alarmToRecord(CameraCmd cmd) {
+ String url = "";
+ try {
+ log.debug("寮曞鎴愬姛锛屽皾璇曞綍鍍�");
+ String cameraId = cmd.getCameraId();
+ hikClientService.controlLock(cmd);//涓婇攣
+ cmd.setEnable(true);//寮�濮嬪綍鍍�
+ hikClientService.recordToMinio(cmd);//寮�濮嬪綍鍍�
+ GlobalVariable.threadMap.put(cameraId, Thread.currentThread().getName());//灏嗙浉鏈篿d涓庡綋鍓嶅鐞嗙嚎绋嬪悕绉扮粦瀹�
+ Thread.sleep(cmd.getExpired() * 1000);//褰曞儚鏃堕暱
+ String thread = GlobalVariable.threadMap.get(cameraId);
+ String currentThread = Thread.currentThread().getName();
+ //鍒ゆ柇鐩告満缁戝畾绾跨▼鏄惁鏄綋鍓嶇嚎绋嬶紝濡傛灉鏄紝鍋滄褰曞儚锛屽鏋滀笉鏄紝璇存槑鐩告満琚叾浠栫嚎绋嬫姠鍗狅紝涓嶅仠姝㈠綍鍍�
+ if (thread.equals(currentThread)) {
+ cmd.setEnable(false);//鍋滄褰曞儚
+ cmd.setUploadMinio(true);//涓婁紶minio
+ url = hikClientService.recordToMinio(cmd);//鍋滄褰曞儚杩斿洖url
}
} catch (Exception ex) {
- log.error("寮曞寮傚父:" + ex.getMessage());
+ log.error("褰曞儚寮傚父:" + ex.getMessage());
}
return url;
}
@@ -358,18 +508,34 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
@Override
- public Map<String, Integer> selectAlarmLogsCount() {
+ public Map<String, Object> selectAlarmLogsCount() {
+ Map<String, Object> map = new HashMap<>();
Map<String, Integer> countMap = new HashMap<>();
String refreshTime = configService.selectConfigByKey("refreshTime");
int count1001 = ardAlarmStealelecMapper.selectCountByStartTime(refreshTime);
countMap.put("1001", count1001);
- int count1014 = ardAlarmTubeMapper.selectCountByStartTime(refreshTime);
- countMap.put("1014 ", count1014);
- return countMap;
+ int count1002 = ardAlarmCameraMapper.selectCountByAlarmTime(refreshTime);
+ countMap.put("1002", count1002);
+ int count1003 = ardAlarmRadarMapper.selectCountByAlarmTime(refreshTime, "杩愬姩鐩爣妫�娴�");
+ countMap.put("1003", count1003);
+ int count1004 = ardAlarmRadarMapper.selectCountByAlarmTime(refreshTime, "鐑簮妫�娴�");
+ countMap.put("1004", count1004);
+ int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
+ countMap.put("1014", count1014);
+ map.put("20000", countMap);
+ return map;
}
+ /**
+ * @鎻忚堪 鍘嗗彶鎶ヨ鏌ヨ
+ * @鍙傛暟 [command, beginTime, endTime, pageNum, pageSize]
+ * @杩斿洖鍊� java.lang.Object
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/28 13:30
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
@Override
- public Object selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) {
+ public Object selectAlarmList(Integer command, String beginTime, String endTime, Integer pageNum, Integer pageSize) {
Map<String, Object> params = new HashMap<>();
params.put("beginTime", beginTime);
params.put("endTime", endTime);
@@ -388,6 +554,22 @@
aac.setPageSize(pageSize);
List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectArdAlarmCameraList(aac);
return ardAlarmCameras;
+ case 1003:
+ ArdAlarmRadar aar = new ArdAlarmRadar();
+ aar.setParams(params);
+ aar.setPageNum(pageNum);
+ aar.setPageSize(pageSize);
+ aar.setAlarmType("杩愬姩鐩爣妫�娴�");
+ List<ArdAlarmRadar> ardAlarmRadar = ardAlarmRadarMapper.selectArdAlarmRadarList(aar);
+ return ardAlarmRadar;
+ case 1004:
+ ArdAlarmRadar aarr = new ArdAlarmRadar();
+ aarr.setParams(params);
+ aarr.setPageNum(pageNum);
+ aarr.setPageSize(pageSize);
+ aarr.setAlarmType("鐑簮妫�娴�");
+ List<ArdAlarmRadar> ardAlarmRadarr = ardAlarmRadarMapper.selectArdAlarmRadarList(aarr);
+ return ardAlarmRadarr;
case 1014:
ArdAlarmTube aat = new ArdAlarmTube();
aat.setParams(params);
@@ -398,4 +580,5 @@
}
return null;
}
+
}
--
Gitblit v1.9.3