From b8efcd7ee94cc4ab6088e4e2d8c2e09f3cd4a1cc Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 01 七月 2023 11:58:20 +0800
Subject: [PATCH] 雷达历史查询接口增加录像1录像2
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 161 ++++++++++++++++++++++-------------------------------
1 files changed, 68 insertions(+), 93 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 b90f567..fcf5f7e 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
@@ -48,8 +48,8 @@
/**
+ * @Description: 鍏ㄥ眬鎶ヨ涓氬姟
* @ClassName: globalAlarmServiceImpl
- * @Description:
* @Author: Administrator
* @Date: 2023骞�03鏈�10鏃� 11:03
* @Version: 1.0
@@ -332,6 +332,7 @@
ardAlarmTube.setColor(ardTubes.getColor());
ardAlarmTube.setPipeDiameter(ardTubes.getPipeDiameter());
ardAlarmTube.setTubeType(ardTubes.getType());
+ ardAlarmTube.setCreateTime(new Date());
GeoPoint geoPoint = TubeTools.CalculateCoordinates(ardTubesDetails, ardAlarmTube.getPosition());
if (StringUtils.isNotNull(geoPoint)) {
ardAlarmTube.setLongitude(geoPoint.getLongitude());
@@ -342,9 +343,16 @@
int aat = ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
if (aat > 0) {
log.debug("tube鍏ュ簱鎴愬姛锛�" + ardAlarmTube);
- String nearbyCamera = getNearbyCamera(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude()});
- if (StringUtils.isNotEmpty(nearbyCamera)) {
- messagesEnqueued(nearbyCamera, ardAlarmTube.getId(), "sys_tube_leak", ardAlarmTube.getAlarmTime(), 1,1);
+ Double longitude = ardAlarmTube.getLongitude();
+ Double latitude = ardAlarmTube.getLatitude();
+ if(StringUtils.isNull(longitude)||StringUtils.isNull(latitude))
+ {
+ return;
+ }
+ double[] coordinate=new double[]{longitude,latitude};
+ String nearbyCameraId = getNearbyCamera(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude()});
+ if (StringUtils.isNotEmpty(nearbyCameraId)) {
+ messagesEnqueued(nearbyCameraId, ardAlarmTube.getId(), "sys_tube_leak",ardAlarmTube.getCreateTime(), 1,1,coordinate);
}
}
//endregion
@@ -366,11 +374,12 @@
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());
+ ardAlarmRadar.setId(uuid);//鎶ヨID
+ ardAlarmRadar.setAlarmTime(radarAlarmData.getAlarmTime());//鎶ヨ鏃堕棿
+ String alarmpointName = ardAlarmRadar.getName();//鍏磋叮鐐瑰悕绉�
+ ardAlarmRadar.setName(ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")");//鎶ヨ鐐瑰悕绉�
+ ardAlarmRadar.setCreateTime(new Date());//鎺ユ敹鏃堕棿
+ double[] coordinate=new double[]{ardAlarmRadar.getLongitude(),ardAlarmRadar.getLatitude()};//鎶ヨ鍧愭爣
String alarmType = "";
switch (ardAlarmRadar.getAlarmType()) {
case "杩愬姩鐩爣妫�娴�":
@@ -389,8 +398,22 @@
//鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
- //鍏ラ槦鍒楀緟寮曞
- messagesEnqueued(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getAlarmTime(), 1,1);
+ log.info("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:"+cameraIdWithTower);
+ //濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
+ messagesEnqueued(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getCreateTime(),1,1,coordinate);
+ }
+ //鑾峰彇鎶ヨ鐐瑰叧鑱旂殑澶у厜鐢�
+ ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
+ if(StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId()))
+ {
+ String cameraId = ardAlarmpointsWell.getCameraId();
+ if(cameraIdWithTower.equals(cameraId))
+ {
+ return;
+ }
+ log.info("鑾峰彇鍒版姤璀︾偣鍏宠仈鐨勫厜鐢�:"+cameraId);
+ //濡傛灉鎶ヨ鐐瑰叧鑱斾簡鍏夌數
+ messagesEnqueued(cameraId, uuid, alarmType,ardAlarmRadar.getCreateTime(), 1,2,coordinate);
}
} else {
//5鍒嗛挓鍐呮湁寮曞
@@ -404,16 +427,22 @@
//鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
+ log.info("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:"+cameraIdWithTower);
//濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
- messagesEnqueued(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getAlarmTime(), count,1);
+ messagesEnqueued(cameraIdWithTower, uuid, alarmType,ardAlarmRadar.getCreateTime(), count,1,coordinate);
}
//鑾峰彇鎶ヨ鐐瑰叧鑱旂殑澶у厜鐢�
- ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(ardAlarmRadar.getName());
+ ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
if(StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId()))
{
String cameraId = ardAlarmpointsWell.getCameraId();
+ if(cameraIdWithTower.equals(cameraId))
+ {
+ return;
+ }
+ log.info("鑾峰彇鍒版姤璀︾偣鍏宠仈鐨勫厜鐢�:"+cameraId);
//濡傛灉鎶ヨ鐐瑰叧鑱斾簡鍏夌數
- messagesEnqueued(cameraId, uuid, alarmType, ardAlarmRadar.getAlarmTime(), count,1);
+ messagesEnqueued(cameraId, uuid, alarmType,ardAlarmRadar.getCreateTime(), count,2,coordinate);
}
} else {
//鏈紩瀵兼湭瓒呰繃3娆★紝鐩存帴鍏ュ簱
@@ -424,45 +453,53 @@
//endregion
break;
}
- GuidePriorityQueue.printPriorityQueue();//鎵撳嵃闃熷垪
} catch (Exception ex) {
log.error("鎺ユ敹鎶ヨ寮傚父:" + ex.getMessage());
}
}
-
/**
* 娑堟伅鍏ラ槦
+ *
+ * cameraId 鐩告満ID
+ * alarmId 鎶ヨID
+ * alarmType 鎶ヨ绫诲瀷
+ * num 鎶ヨ娆℃暟
+ * recordSn 褰曞儚瀛樺偍浣嶇疆 1-recordUrl1 2-recordUrl2
+ * targetPosition 鎶ヨ鐐逛綅缃潗鏍�
*/
- private void messagesEnqueued(String cameraId, String alarmId, String alarmType, Date alarmTime, Integer num, Integer recordSn) {
-
+ private void messagesEnqueued(String cameraId, String alarmId, String alarmType,Date receiveTime, Integer num, Integer recordSn,double[] targetPosition) {
+ SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
GuideTask guideTask = new GuideTask();
- /*閰嶇疆鐩告満ID*/
+ //鐩告満ID
guideTask.setCameraId(cameraId);
- /*鏍规嵁閰嶇疆鏃堕棿閰嶇疆閫氶亾*/
+ //鎶ヨ绫诲瀷
+ guideTask.setAlarmType(alarmType);
+ //閫氶亾(閫氳繃鏃ュ鏃堕棿鐮斿垽)
String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
Integer channel = ArdTool.getChannelBydayNightTime(dayNightTime);
guideTask.setChanNum(channel);
- /*閰嶇疆鎶ヨID*/
+ //鎶ヨID
guideTask.setAlarmId(alarmId);
- /*閰嶇疆鎶ヨ鏃堕棿*/
- SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- guideTask.setAlarmTime(fmt.format(alarmTime));
- /*閰嶇疆鎶ヨ浼樺厛绾�*/
+ //鎺ユ敹鏃堕棿
+ guideTask.setReceiveTime(fmt.format(receiveTime));
+ //鎶ヨ浼樺厛绾�(閫氳繃浼樺厛绾у瓧鍏�)
Integer priority = CamPriority.priorityMap.get(alarmType);
guideTask.setPriority(priority);
- /*閰嶇疆鎶ヨ娆℃暟*/
+ //鎶ヨ娆℃暟
guideTask.setNum(num);
- /*閰嶇疆褰曞儚瀛樺偍浣嶇疆*/
+ //褰曞儚瀛樺偍浣嶇疆
guideTask.setRecordSn(recordSn);
- /*娑堟伅鍏ラ槦*/
+ //鐩爣缁忕含搴�
+ guideTask.setTargetPosition(targetPosition);
+ //娑堟伅鍏ラ槦
queueManager.addTaskToQueue(cameraId, guideTask);
-// PriorityBlockingQueue<GuideTask> priorityBlockingQueue = GuidePriorityQueue.cameraQueueMap.get(guideTask.getCameraId());
-// priorityBlockingQueue.add(guideTask);
+ //鎵撳嵃闃熷垪
+ GuidePriorityQueue.printPriorityQueue();
}
/**
- * 鏌ユ壘闄勮繎寮�鍚姤璀﹀紩瀵煎姛鑳藉厜鐢�
+ * 鑾峰彇闄勮繎寮�鍚姤璀﹀紩瀵煎姛鑳藉厜鐢�
*/
private String getNearbyCamera(double[] targetPosition) {
String minDistanceCameraId = "";
@@ -493,68 +530,6 @@
}
}
return minDistanceCameraId;
- }
-
- /**
- * @鎻忚堪 寮曞鏈�杩戠殑澶у厜鐢垫寚鍚戠洰鏍�
- * @鍙傛暟 [cmd]
- * @杩斿洖鍊� boolean
- * @鍒涘缓浜� 鍒樿嫃涔�
- * @鍒涘缓鏃堕棿 2023/6/28 16:34
- * @淇敼浜哄拰鍏跺畠淇℃伅
- */
- private boolean guideCamera(CameraCmd cmd) {
- try {
- String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
- String nearbyCamera = getNearbyCamera(cmd.getTargetPosition());
- if (StringUtils.isNotEmpty(nearbyCamera)) {
- //寮曞鍏夌數
- cmd.setCameraId(nearbyCamera);
- cmd.setChannelNum(ArdTool.getChannelBydayNightTime(dayNightTime));
- boolean guideRes = hikClientService.guideTargetPosition(cmd);
- 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
- * @淇敼浜哄拰鍏跺畠淇℃伅
- */
- private 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());
- }
- return url;
}
}
--
Gitblit v1.9.3