From d70903ea176f6856636ef57dffac73feaae56bac Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 04 七月 2023 17:22:23 +0800
Subject: [PATCH] 推送ptz获取相机方式更改为从redis中获取
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 146 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 112 insertions(+), 34 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 6097259..f84040c 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
@@ -29,23 +29,20 @@
import com.ruoyi.utils.tools.GisTool;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
-import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
-import com.ruoyi.device.hiksdk.common.GlobalVariable;
-import com.ruoyi.device.hiksdk.service.IHikClientService;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.utils.tube.GeoPoint;
import com.ruoyi.utils.tube.TubeTools;
+import lombok.AllArgsConstructor;
+import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.PriorityBlockingQueue;
import java.util.stream.Collectors;
-
/**
* @Description: 鍏ㄥ眬鎶ヨ涓氬姟
@@ -77,8 +74,6 @@
@Resource
private ArdCamerasMapper ardCamerasMapper;
@Resource
- private IHikClientService hikClientService;
- @Resource
private RedisCache redisCache;
@Resource
private QueueManager queueManager;
@@ -105,6 +100,8 @@
countMap.put("1003", count1003);
int count1004 = ardAlarmRadarMapper.selectCountByAlarmTime(refreshTime, "鐑簮妫�娴�");
countMap.put("1004", count1004);
+ int count1007 = ardAlarmRadarMapper.selectCountByAlarmTime(refreshTime, "闆疯揪鎶芥补鏈哄仠鏈�");
+ countMap.put("1007", count1007);
int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
countMap.put("1014", count1014);
map.put("20000", countMap);
@@ -137,8 +134,7 @@
.setCount(ardAlarmStealelec.getCount())
.setTotal(ardAlarmStealelec.getTotal());
return globalAlarmData;
- })
- .collect(Collectors.toList());
+ }).collect(Collectors.toList());
case 1002:
List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectListAllByCommand(refreshTime);
return ardAlarmCameras.stream()
@@ -152,8 +148,7 @@
.setCount(ardAlarmCamera.getCount())
.setTotal(ardAlarmCamera.getTotal());
return globalAlarmData;
- })
- .collect(Collectors.toList());
+ }).collect(Collectors.toList());
case 1003:
List<ArdAlarmRadar> ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "杩愬姩鐩爣妫�娴�");
return ardAlarmRadars.stream()
@@ -167,8 +162,7 @@
.setCount(ardAlarmRadar.getCount())
.setTotal(ardAlarmRadar.getTotal());
return globalAlarmData;
- })
- .collect(Collectors.toList());
+ }).collect(Collectors.toList());
case 1004:
ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "鐑簮妫�娴�");
return ardAlarmRadars.stream()
@@ -182,8 +176,21 @@
.setCount(ardAlarmRadar.getCount())
.setTotal(ardAlarmRadar.getTotal());
return globalAlarmData;
- })
- .collect(Collectors.toList());
+ }).collect(Collectors.toList());
+ case 1007:
+ 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 1014:
List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
return ardAlarmTubes.stream()
@@ -198,8 +205,7 @@
.setCount(ardAlarmTube.getCount())
.setTotal(ardAlarmTube.getTotal());
return globalAlarmData;
- })
- .collect(Collectors.toList());
+ }).collect(Collectors.toList());
default:
return null;
}
@@ -224,38 +230,40 @@
aas.setParams(params);
aas.setPageNum(pageNum);
aas.setPageSize(pageSize);
- List<ArdAlarmStealelec> ardAlarmStealelecs = ardAlarmStealelecMapper.selectArdAlarmStealelecList(aas);
- return ardAlarmStealelecs;
+ return ardAlarmStealelecMapper.selectArdAlarmStealelecList(aas);
case 1002:
ArdAlarmCamera aac = new ArdAlarmCamera();
aac.setParams(params);
aac.setPageNum(pageNum);
aac.setPageSize(pageSize);
- List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectArdAlarmCameraList(aac);
- return ardAlarmCameras;
+ return ardAlarmCameraMapper.selectArdAlarmCameraList(aac);
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;
+ return ardAlarmRadarMapper.selectArdAlarmRadarList(aar);
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;
+ return ardAlarmRadarMapper.selectArdAlarmRadarList(aarr);
+ case 1007:
+ ArdAlarmRadar aarrr = new ArdAlarmRadar();
+ aarrr.setParams(params);
+ aarrr.setPageNum(pageNum);
+ aarrr.setPageSize(pageSize);
+ aarrr.setAlarmType("闆疯揪鎶芥补鏈哄仠鏈�");
+ return ardAlarmRadarMapper.selectArdAlarmRadarList(aarrr);
case 1014:
ArdAlarmTube aat = new ArdAlarmTube();
aat.setParams(params);
aat.setPageNum(pageNum);
aat.setPageSize(pageSize);
- List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectArdAlarmTubeList(aat);
- return ardAlarmTubes;
+ return ardAlarmTubeMapper.selectArdAlarmTubeList(aat);
}
return null;
}
@@ -277,15 +285,26 @@
if (StringUtils.isNotNull(ardAlarmStealelec)) {
String describe = ardAlarmStealelec.getDescribe();
String startTime = fmt.format(ardAlarmStealelec.getStartTime());
- int i = ardAlarmStealelecMapper.updateViewTimeByDescribe(describe, startTime, DateUtils.getTime());
+ ardAlarmStealelecMapper.updateViewTimeByDescribe(describe, startTime, DateUtils.getTime());
return ardAlarmStealelec;
+ }
+ case 1003:
+ case 1004:
+ case 1007:
+ ArdAlarmRadar ardAlarmRadar = ardAlarmRadarMapper.selectArdAlarmRadarById(condition.getId());
+ if (StringUtils.isNotNull(ardAlarmRadar)) {
+ String name = ardAlarmRadar.getName();
+ String alarmType=ardAlarmRadar.getAlarmType();
+ String alarmTime=fmt.format(ardAlarmRadar.getAlarmTime());
+ ardAlarmRadarMapper.updateViewTimeByCondition(name,alarmType, alarmTime,DateUtils.getTime());
+ return ardAlarmRadar;
}
case 1014:
ArdAlarmTube ardAlarmTube = ardAlarmTubeMapper.selectArdAlarmTubeById(condition.getId());
if (StringUtils.isNotNull(ardAlarmTube)) {
String tubeId = ardAlarmTube.getTubeId();
String alarmTime = fmt.format(ardAlarmTube.getAlarmTime());
- int i = ardAlarmTubeMapper.updateViewTimeByTubeId(tubeId, alarmTime, DateUtils.getTime());
+ ardAlarmTubeMapper.updateViewTimeByTubeId(tubeId, alarmTime, DateUtils.getTime());
return ardAlarmTube;
}
default:
@@ -343,7 +362,13 @@
int aat = ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
if (aat > 0) {
log.debug("tube鍏ュ簱鎴愬姛锛�" + ardAlarmTube);
- double[] coordinate=new double[]{ardAlarmTube.getLongitude(),ardAlarmTube.getLatitude()};
+ 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);
@@ -373,7 +398,7 @@
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 "杩愬姩鐩爣妫�娴�":
@@ -382,7 +407,20 @@
case "鐑簮妫�娴�":
alarmType = "sys_radar_fire";
break;
+ case "闆疯揪鎶芥补鏈哄仠鏈�":
+ alarmType = "sys_radar_pumpshutdown";
+ ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
+ if(StringUtils.isNotNull(ardAlarmpointsWell)) {
+ ardAlarmRadar.setLongitude(ardAlarmpointsWell.getLongitude());
+ ardAlarmRadar.setLatitude(ardAlarmpointsWell.getLatitude());
+ }
+ break;
}
+ if(StringUtils.isNull(ardAlarmRadar.getLongitude())||StringUtils.isNull(ardAlarmRadar.getLatitude()))
+ {
+ continue;
+ }
+ double[] coordinate=new double[]{ardAlarmRadar.getLongitude(),ardAlarmRadar.getLatitude()};//鎶ヨ鍧愭爣
//鍒ゆ柇褰撳墠鎶ヨ鐐�5鍒嗛挓鍐呮槸鍚﹀凡寮曞
ardAlarmRadar.setGuideFlag(1);
ArdAlarmRadar AlarmRadar = ardAlarmRadarMapper.getArdAlarmRadarWithGuide(ardAlarmRadar);
@@ -400,8 +438,11 @@
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);
@@ -414,7 +455,6 @@
if (count >= 3) {
ardAlarmRadar.setGuideFlag(1);
ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
-
//鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
@@ -427,6 +467,10 @@
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(), count,2,coordinate);
@@ -440,7 +484,6 @@
//endregion
break;
}
- GuidePriorityQueue.printPriorityQueue();//鎵撳嵃闃熷垪
} catch (Exception ex) {
log.error("鎺ユ敹鎶ヨ寮傚父:" + ex.getMessage());
}
@@ -482,6 +525,8 @@
guideTask.setTargetPosition(targetPosition);
//娑堟伅鍏ラ槦
queueManager.addTaskToQueue(cameraId, guideTask);
+ //鎵撳嵃闃熷垪
+ GuidePriorityQueue.printPriorityQueue();
}
/**
@@ -518,4 +563,37 @@
return minDistanceCameraId;
}
+ public static void main(String[] args) {
+ Comparator<Obj> PriorityDescCom = Comparator.comparingInt(Obj::getPriority).reversed();
+ Comparator<Obj> NumDescCom = Comparator.comparingInt(Obj::getNum).reversed();
+ Comparator<Obj> receiveTimeAscCom = Comparator.comparing(Obj::getAlarmTime);
+ Comparator<Obj> comparator = PriorityDescCom.thenComparing(NumDescCom).thenComparing(receiveTimeAscCom);
+
+ PriorityBlockingQueue<Obj> priorityQueue = new PriorityBlockingQueue<>(1000,comparator);
+
+ priorityQueue.add(new Obj(999,1,"2023-07-01 16:00:01"));
+ priorityQueue.add(new Obj(999,2,"2023-07-01 16:00:01"));
+ priorityQueue.add(new Obj(999,3,"2023-07-01 16:00:01"));
+
+ List<Obj> elements = new ArrayList<>(priorityQueue);
+ elements.sort(priorityQueue.comparator()); // 浣跨敤闃熷垪鐨勬瘮杈冨櫒杩涜鎺掑簭
+ for (Obj task : elements) {
+ log.info("姝ｅ湪鎺掗槦銆恜riority銆�" + task.getPriority()+"銆恘um銆�" + task.getNum() + "銆恆larmTime銆�" + task.getAlarmTime());
+ }
+ log.info("===================================================================");
+ priorityQueue.add(new Obj(999,5,"2023-07-01 16:00:01"));
+ PriorityBlockingQueue queue = new PriorityBlockingQueue<>(priorityQueue);
+ while (priorityQueue.size() > 0) {
+ Obj task = priorityQueue.poll();
+ log.info("姝ｅ湪鎺掗槦銆恜riority銆�" + task.getPriority()+"銆恘um銆�" + task.getNum() + "銆恆larmTime銆�" + task.getAlarmTime());
+ }
+ }
+ @Data
+ @AllArgsConstructor
+ static class Obj
+ {
+ Integer priority;
+ Integer num;
+ String alarmTime;
+ }
}
--
Gitblit v1.9.3