From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml | 16 -
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java | 2
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java | 10
ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml | 60 ++++--
ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideTask.java | 10 -
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java | 11
/dev/null | 146 ----------------
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml | 13
ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideDataDto.java | 2
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml | 11
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 92 ++-------
ard-work/src/main/java/com/ruoyi/alarmpoints/well/domain/ArdAlarmpointsWell.java | 22 +
ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePTZ.java | 21 +
ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePriorityQueue.java | 8
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java | 46 ++--
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 46 +++-
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java | 9
17 files changed, 173 insertions(+), 352 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideDataDto.java b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideDataDto.java
index fa24638..08bb607 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideDataDto.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideDataDto.java
@@ -20,8 +20,6 @@
String alarmId;
String alarmType;
Date receiveTime;
- Integer num;
- Integer recordSn;
double[] targetPosition;
GuidePTZ guidePTZ;
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePTZ.java b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePTZ.java
index 064825f..23d96dd 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePTZ.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePTZ.java
@@ -12,12 +12,21 @@
@Data
@Accessors(chain = true)
public class GuidePTZ {
- /** 寮曞P鍊� */
- private Double P;
+ /** 寮曞P1鍊� */
+ private Double P1;
- /** 寮曞T鍊� */
- private Double T;
+ /** 寮曞T1鍊� */
+ private Double T1;
- /** 寮曞Z鍊� */
- private Double Z;
+ /** 寮曞Z1鍊� */
+ private Double Z1;
+
+ /** 寮曞P2鍊� */
+ private Double P2;
+
+ /** 寮曞T2鍊� */
+ private Double T2;
+
+ /** 寮曞Z2鍊� */
+ private Double Z2;
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePriorityQueue.java b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePriorityQueue.java
index 03e4907..f0a8062 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePriorityQueue.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePriorityQueue.java
@@ -24,9 +24,8 @@
*/
public static Comparator<GuideTask> getComparator() {
Comparator<GuideTask> PriorityDescCom = Comparator.comparingInt(GuideTask::getPriority).reversed();
- Comparator<GuideTask> NumDescCom = Comparator.comparingInt(GuideTask::getNum).reversed();
Comparator<GuideTask> receiveTimeAscCom = Comparator.comparing(GuideTask::getReceiveTime);
- Comparator<GuideTask> Comparator = PriorityDescCom.thenComparing(NumDescCom).thenComparing(receiveTimeAscCom);
+ Comparator<GuideTask> Comparator = PriorityDescCom.thenComparing(receiveTimeAscCom);
return Comparator;
}
@@ -39,9 +38,8 @@
PriorityBlockingQueue<GuideTask> queue = new PriorityBlockingQueue<>(priorityQueue);
while (queue.size() > 0) {
GuideTask task = queue.poll();
- log.info("姝ｅ湪鎺掗槦銆恈ameraId銆�" + task.getCameraId()+"銆恆larmId銆�" + task.getAlarmId() + "銆恟eceiveTime銆�" + task.getReceiveTime()
- + "銆恆larmType銆�" + task.getAlarmType() + "銆恜riority銆�" + task.getPriority() + "銆恘um銆�" + task.getNum()
- + "銆恈han銆�" + task.getChanNum() + "銆恟ecordSn銆�" + task.getRecordSn());
+ log.info("姝ｅ湪鎺掗槦銆恈ameraId銆�" + task.getCameraId() + "銆恆larmId銆�" + task.getAlarmId() + "銆恟eceiveTime銆�" + task.getReceiveTime()
+ + "銆恆larmType銆�" + task.getAlarmType() + "銆恜riority銆�" + task.getPriority() + "銆恈hanNo銆�" + task.getChanNo());
}
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideTask.java b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideTask.java
index 5b65e69..2086b80 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideTask.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideTask.java
@@ -23,7 +23,7 @@
/**
* 鐩告満閫氶亾
*/
- Integer chanNum;
+ Integer chanNo;
/**
* 鎶ヨID
*/
@@ -40,14 +40,6 @@
* 鎺ユ敹鏃堕棿
*/
String receiveTime;
- /**
- * 鎶ヨ娆℃暟
- */
- Integer num;
- /**
- * 褰曞儚瀛樺偍浣嶇疆-杩欓噷鏈夌殑鎶ヨ闇�瑕佸紩瀵�2涓浉鏈猴紝鏁呴渶瑕佹寚瀹氬摢涓浉鏈哄綍鍍忓洖鍐欏埌鍝釜瀛楁
- */
- Integer recordSn;
/**
* 寮曞鐩爣缁忕含搴�
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
index 28d68cd..db7b2d9 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
@@ -1039,8 +1039,6 @@
.setAlarmId(ardAlarmTube.getId())
.setAlarmType("sys_tube_leak")
.setReceiveTime(ardAlarmTube.getCreateTime())
- .setNum(1)
- .setRecordSn(1)
.setTargetPosition(coordinate);
messagesEnqueued(guideDataDto);
}
@@ -1073,13 +1071,17 @@
if (well == null) {
return;
}
- Double guideP = well.getGuideP();
- Double guideT = well.getGuideT();
- Double guideZ = well.getGuideZ();
+
Double longitude = well.getLongitude();
Double latitude = well.getLatitude();
String targetId = ardAlarmRadar.getTargetId();
GuidePTZ guidePTZ = new GuidePTZ();
+ guidePTZ.setP1(well.getGuideP1());
+ guidePTZ.setT1(well.getGuideT1());
+ guidePTZ.setZ1(well.getGuideZ1());
+ guidePTZ.setP2(well.getGuideP2());
+ guidePTZ.setT2(well.getGuideT2());
+ guidePTZ.setZ2(well.getGuideZ2());
switch (ardAlarmRadar.getAlarmType()) {
case "杩愬姩鐩爣妫�娴�":
ArdAlarmRadarMove ardAlarmRadarMove = new ArdAlarmRadarMove();
@@ -1093,10 +1095,6 @@
ardAlarmRadarMove.setLatitude(latitude);
ardAlarmRadarMove.setUpdateTime(radarAlarmData.getAlarmTime());
ardAlarmRadarMove.setRadarId(radarId);
-
- guidePTZ.setP(guideP);
- guidePTZ.setT(guideT);
- guidePTZ.setZ(guideZ);
ardAlarmRadarMove.setGuidePTZ(guidePTZ);
Date alarmTime = ardAlarmRadarMove.getAlarmTime();
//鑾峰彇褰撳墠鍏磋叮鐐瑰綋鍓嶉浄杈剧殑涓婁竴鏉℃暟鎹�
@@ -1150,9 +1148,6 @@
ardAlarmRadarFire.setAlarmType("鐑簮妫�娴�");
ardAlarmRadarFire.setLongitude(longitude);
ardAlarmRadarFire.setLatitude(latitude);
- guidePTZ.setP(guideP);
- guidePTZ.setT(guideT);
- guidePTZ.setZ(guideZ);
ardAlarmRadarFire.setGuidePTZ(guidePTZ);
ardAlarmRadarFire.setRadarId(radarId);
ardAlarmRadarFire.setUpdateTime(radarAlarmData.getAlarmTime());
@@ -1203,9 +1198,6 @@
alarmTime = ardAlarmRadarPump.getAlarmTime();
ardAlarmRadarPump.setLongitude(well.getLongitude());
ardAlarmRadarPump.setLatitude(well.getLatitude());
- guidePTZ.setP(guideP);
- guidePTZ.setT(guideT);
- guidePTZ.setZ(guideZ);
ardAlarmRadarPump.setGuidePTZ(guidePTZ);
//
ArdAlarmRadarPump lastPumpData = ardAlarmRadarPumpMapper.selectArdAlarmRadarLastData(ardAlarmRadarPump.getName());
@@ -1251,9 +1243,16 @@
//澶栬仈闃插尯鍚嶇О灏辨槸鍏磋叮鐐癸紝鏌ュ叴瓒ｇ偣鍧愭爣
String defenseName = ardAlarmExternal.getDefenseName();
ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(defenseName);
+ GuidePTZ guidePTZ = new GuidePTZ();
if (StringUtils.isNotNull(well)) {
ardAlarmExternal.setLongitude(well.getLongitude());
ardAlarmExternal.setLatitude(well.getLatitude());
+ guidePTZ.setP1(well.getGuideP1());
+ guidePTZ.setT1(well.getGuideT1());
+ guidePTZ.setZ1(well.getGuideZ1());
+ guidePTZ.setP2(well.getGuideP2());
+ guidePTZ.setT2(well.getGuideT2());
+ guidePTZ.setZ2(well.getGuideZ2());
}
int aae = ardAlarmExternalMapper.insertArdAlarmExternal(ardAlarmExternal);
if (aae > 0) {
@@ -1263,10 +1262,6 @@
return;
}
double[] coordinate = new double[]{ardAlarmExternal.getLongitude(), ardAlarmExternal.getLatitude()};//寮曞鍧愭爣
- GuidePTZ guidePTZ = new GuidePTZ()
- .setP(well.getGuideP())
- .setT(well.getGuideT())
- .setZ(well.getGuideZ());
String cameraId = getCameraByNear(coordinate);//鏈�杩戠浉鏈篒D
if (StringUtils.isNotEmpty(cameraId)) {
GuideDataDto guideDataDto = new GuideDataDto()
@@ -1274,8 +1269,6 @@
.setAlarmId(ardAlarmExternal.getId())
.setAlarmType("sys_external")
.setReceiveTime(ardAlarmExternal.getCreateTime())
- .setNum(1)
- .setRecordSn(1)
.setTargetPosition(coordinate)
.setGuidePTZ(guidePTZ);
messagesEnqueued(guideDataDto);
@@ -1314,8 +1307,6 @@
.setAlarmId(ardAlarmAccess.getId())
.setAlarmType("sys_external")
.setReceiveTime(ardAlarmAccess.getCreateTime())
- .setNum(1)
- .setRecordSn(1)
.setTargetPosition(coordinate);
messagesEnqueued(guideDataDto);
}
@@ -1379,16 +1370,13 @@
private void messagesEnqueued(GuideDataDto guideDataDto) {
try {
String cameraId = guideDataDto.getCameraId();
- String alarmType = guideDataDto.getAlarmType();
if (!IsEnableGuide(cameraId)) {
log.info("鐩告満:" + cameraId + "鏈紑鍚姤璀﹀紩瀵煎姛鑳�");
return;
}
- SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
GuideTask guideTask = new GuideTask();
- //鐩告満ID
- guideTask.setCameraId(cameraId);
- //鎶ヨ绫诲瀷
+ guideTask.setCameraId(cameraId);//鐩告満ID
+ String alarmType = guideDataDto.getAlarmType();
switch (alarmType) {
case "杩愬姩鐩爣妫�娴�":
alarmType = "sys_radar_move";
@@ -1400,15 +1388,11 @@
alarmType = "sys_radar_pump";
break;
}
- guideTask.setAlarmType(alarmType);
- //閫氶亾(閫氳繃鏃ュ鏃堕棿鐮斿垽)
- String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
- Integer channel = ArdTool.getChannelBydayNightTime(dayNightTime);
- guideTask.setChanNum(channel);
- //鎶ヨID
- guideTask.setAlarmId(guideDataDto.getAlarmId());
- //鎺ユ敹鏃堕棿
- guideTask.setReceiveTime(fmt.format(guideDataDto.getReceiveTime()));
+ guideTask.setAlarmType(alarmType);//鎶ヨ绫诲瀷
+ Integer chanNo = ArdTool.getChannelBydayNightTime(redisCache.getCacheObject("sys_config:dayNightTime"));
+ guideTask.setChanNo(chanNo);//閫氶亾(閫氳繃鏃ュ鏃堕棿鐮斿垽)
+ guideTask.setAlarmId(guideDataDto.getAlarmId()); //鎶ヨID
+ guideTask.setReceiveTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS_MS,guideDataDto.getReceiveTime()));//鎺ユ敹鏃堕棿
//鎶ヨ浼樺厛绾�(閫氳繃浼樺厛绾у瓧鍏�)
String priority = DictUtils.getDictValue("cameras_priority", alarmType);
if (StringUtils.isEmpty(priority)) {
@@ -1416,15 +1400,9 @@
return;
}
guideTask.setPriority(Integer.valueOf(priority));
- //鎶ヨ娆℃暟
- guideTask.setNum(guideDataDto.getNum());
- //褰曞儚瀛樺偍浣嶇疆
- guideTask.setRecordSn(guideDataDto.getRecordSn());
- //鐩爣缁忕含搴�
- guideTask.setTargetPosition(guideDataDto.getTargetPosition());
- //鐩爣PTZ
+ guideTask.setTargetPosition(guideDataDto.getTargetPosition());//鐩爣缁忕含搴�
if (guideDataDto.getGuidePTZ() != null) {
- guideTask.setGuidePTZ(guideDataDto.getGuidePTZ());
+ guideTask.setGuidePTZ(guideDataDto.getGuidePTZ());//鐩爣PTZ
}
//娑堟伅鍏ラ槦
queueHandler.addTaskToQueue(cameraId, guideTask);
@@ -1494,8 +1472,7 @@
//鑾峰彇鐩告満寮曞鍏ラ槦
private void getCameraGuideToQueue(GuideDataDto guideDataDto) {
- int index = guideDataDto.getName().indexOf("(");
- String alarmpointName = guideDataDto.getName().substring(0, index);
+
//鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
ArdCameras cameraWithTower = ardEquipRadarMapper.getCameraByRadar(guideDataDto.getRadarId());
if (StringUtils.isNotNull(cameraWithTower)) {
@@ -1505,21 +1482,6 @@
messagesEnqueued(guideDataDto);
} else {
log.debug("鏈幏鍙栧埌闆疯揪濉斾笂鐨勫厜鐢�,鏃犳硶寮曞");
- }
- //鑾峰彇鎶ヨ鐐瑰叧鑱旂殑澶у厜鐢�
- ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
- if (StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId())) {
- String cameraId = ardAlarmpointsWell.getCameraId();
- if (cameraId.equals(cameraWithTower.getId())) {
- return;
- }
- log.debug("鑾峰彇鍒版姤璀︾偣鍏宠仈鐨勫厜鐢�:" + cameraId);
- //濡傛灉鎶ヨ鐐瑰叧鑱斾簡鍏夌數
- guideDataDto.setCameraId(cameraId);
- guideDataDto.setRecordSn(2);//鍏磋叮鐐瑰厜鐢靛紩瀵煎綍鍍忓瓨鍌ㄧ浜屼釜璺緞
- messagesEnqueued(guideDataDto);
- } else {
- log.debug("鏈幏鍙栧埌鎶ヨ鐐瑰叧鑱旂殑鍏夌數,鏃犳硶寮曞");
}
}
@@ -1538,8 +1500,6 @@
.setAlarmId(ardAlarmRadarMove.getId())
.setAlarmType(ardAlarmRadarMove.getAlarmType())
.setReceiveTime(ardAlarmRadarMove.getCreateTime())
- .setNum(1)
- .setRecordSn(1)
.setTargetPosition(coordinate)
.setGuidePTZ(ardAlarmRadarMove.getGuidePTZ());
getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
@@ -1560,8 +1520,6 @@
.setAlarmId(ardAlarmRadarFire.getId())
.setAlarmType(ardAlarmRadarFire.getAlarmType())
.setReceiveTime(ardAlarmRadarFire.getCreateTime())
- .setNum(1)
- .setRecordSn(1)
.setTargetPosition(coordinate)
.setGuidePTZ(ardAlarmRadarFire.getGuidePTZ());
getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
@@ -1583,8 +1541,6 @@
.setAlarmId(ardAlarmRadarPump.getId())
.setAlarmType(ardAlarmRadarPump.getAlarmType())
.setReceiveTime(ardAlarmRadarPump.getCreateTime())
- .setNum(1)
- .setRecordSn(1)
.setTargetPosition(coordinate)
.setGuidePTZ(ardAlarmRadarPump.getGuidePTZ());
getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
index 7797e6e..be359b1 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
@@ -71,6 +71,7 @@
// newThread.start();
//}
}
+
@Async("guideExecutor")
public void process(String cameraId) {
log.debug("CameraId:銆�" + cameraId + "銆戝紩瀵奸槦鍒楀鐞嗗櫒鍚姩鎴愬姛");
@@ -96,26 +97,32 @@
}
}
}
+
public void processTask(GuideTask guideTask) {
try {
- String url="";
+ String url = "";
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(guideTask.getCameraId());
- cmd.setChanNo(guideTask.getChanNum());
+ cmd.setChanNo(guideTask.getChanNo());
cmd.setTargetPosition(guideTask.getTargetPosition());
cmd.setOperator(guideTask.getAlarmType());
cmd.setExpired(30);
cmd.setRecordBucketName("record");
Map<String, Double> ptzMap = new HashMap<>();
- ptzMap.put("p", guideTask.getGuidePTZ().getP());
- ptzMap.put("t", guideTask.getGuidePTZ().getT());
- ptzMap.put("z", guideTask.getGuidePTZ().getZ());
- cmd.setPtzMap(ptzMap);
- if (guideTask.getRecordSn().equals(1)) {
- cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId() + "_1");
- } else {
- cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId() + "_2");
+ switch (guideTask.getChanNo()) {
+ case 1:
+ ptzMap.put("p", guideTask.getGuidePTZ().getP1());
+ ptzMap.put("t", guideTask.getGuidePTZ().getT1());
+ ptzMap.put("z", guideTask.getGuidePTZ().getZ1());
+ break;
+ case 2:
+ ptzMap.put("p", guideTask.getGuidePTZ().getP2());
+ ptzMap.put("t", guideTask.getGuidePTZ().getT2());
+ ptzMap.put("z", guideTask.getGuidePTZ().getZ2());
+ break;
}
+ cmd.setPtzMap(ptzMap);
+ cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId());
ICameraSdkService cameraSdkService = SpringUtils.getBean(ICameraSdkService.class);
log.debug("寮�濮嬪紩瀵�");
boolean guideRes = false;
@@ -146,7 +153,6 @@
GuideTask firstTask = guideTasks.peek();
if (firstTask.getPriority() > guideTask.getPriority()) {
recordFlag = false;//褰曞儚鍋滄
- break;
}
}
}
@@ -162,33 +168,21 @@
case "sys_radar_move":
ArdAlarmRadarMove ardAlarmRadarMove = new ArdAlarmRadarMove();
ardAlarmRadarMove.setId(guideTask.getAlarmId());
- if (guideTask.getRecordSn().equals(1)) {
- ardAlarmRadarMove.setRecordUrl1(url);
- } else {
- ardAlarmRadarMove.setRecordUrl2(url);
- }
+ ardAlarmRadarMove.setRecordUrl(url);
IArdAlarmRadarMoveService ardAlarmRadarMoveService = SpringUtils.getBean(IArdAlarmRadarMoveService.class);
ardAlarmRadarMoveService.updateArdAlarmRadarMove(ardAlarmRadarMove);
break;
case "sys_radar_fire":
ArdAlarmRadarFire ardAlarmRadarFire = new ArdAlarmRadarFire();
ardAlarmRadarFire.setId(guideTask.getAlarmId());
- if (guideTask.getRecordSn().equals(1)) {
- ardAlarmRadarFire.setRecordUrl1(url);
- } else {
- ardAlarmRadarFire.setRecordUrl2(url);
- }
+ ardAlarmRadarFire.setRecordUrl(url);
IArdAlarmRadarFireService ardAlarmRadarFireService = SpringUtils.getBean(IArdAlarmRadarFireService.class);
ardAlarmRadarFireService.updateArdAlarmRadarFire(ardAlarmRadarFire);
break;
case "sys_radar_pump":
ArdAlarmRadarPump ardAlarmRadarPump = new ArdAlarmRadarPump();
ardAlarmRadarPump.setId(guideTask.getAlarmId());
- if (guideTask.getRecordSn().equals(1)) {
- ardAlarmRadarPump.setRecordUrl1(url);
- } else {
- ardAlarmRadarPump.setRecordUrl2(url);
- }
+ ardAlarmRadarPump.setRecordUrl(url);
IArdAlarmRadarPumpService ardAlarmRadarPumpService = SpringUtils.getBean(IArdAlarmRadarPumpService.class);
ardAlarmRadarPumpService.updateArdAlarmRadarPump(ardAlarmRadarPump);
break;
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueManager.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueManager.java
deleted file mode 100644
index 9d53cc8..0000000
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueManager.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.ruoyi.alarm.global.service.impl;
-
-import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
-import com.ruoyi.alarm.global.domain.GuideTask;
-import com.ruoyi.common.utils.StringUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.PriorityBlockingQueue;
-
-/**
- * @ClassName QueueManager
- * @Description: 闃熷垪绠＄悊-----寮冪敤
- * @Author 鍒樿嫃涔�
- * @Date 2023/6/29 21:09
- * @Version 1.0
- */
-
-@Component
-@Slf4j(topic = "guideQueue")
-public class QueueManager {
-
- // @Autowired
- // private QueueTaskExecutor taskExecutor;-----寮冪敤
- // private Map<String, TaskThread> threadMap = new ConcurrentHashMap<>();
-
- ///*鍐呴儴闈欐�佺被*/
- //private static class TaskThread {
- // private Thread thread;
- // private GuideTask currentTask;
- //
- // public TaskThread(Thread thread, GuideTask currentTask) {
- // this.thread = thread;
- // this.currentTask = currentTask;
- // }
- //
- // public Thread getThread() {
- // return thread;
- // }
- //
- // public GuideTask getCurrentTask() {
- // return currentTask;
- // }
- //
- // public void setCurrentTask(GuideTask task) {
- // this.currentTask = task;
- // }
- //}
-
- /**
- * 寮曞浠诲姟鍏ラ槦
- * 鍒樿嫃涔�
- * 2023/6/30 8:57
- */
- public void addTaskToQueue(String cameraId, GuideTask task) {
- /*閫氳繃鐩告満ID鑾峰彇寮曞闃熷垪锛屽苟灏嗗紩瀵间换鍔″姞鍏ラ槦鍒�*/
- PriorityBlockingQueue<GuideTask> guideTaskQueue = GuidePriorityQueue.cameraQueueMap.get(cameraId);
- if (StringUtils.isNull(guideTaskQueue)) {
- log.info("鐩告満鏈櫥褰�,娌℃湁闃熷垪,鏃犳硶鍏ラ槦寮曞");
- return;
- }
- log.debug("鏂颁换鍔″叆闃�:" + task.getAlarmId());
- guideTaskQueue.add(task);
- /*鑾峰彇璇ョ浉鏈虹殑褰撳墠鎵ц绾跨▼-----寮冪敤*/
- //TaskThread currentTaskThread = threadMap.get(cameraId);
- ////濡傛灉闃熷垪褰撳墠绾跨▼姝ｅ湪杩愯锛岃嫢鍏ラ槦浠诲姟浼樺厛绾уぇ浜庡綋鍓嶄换鍔′紭鍏堢骇锛屽垯缁堟褰撳墠绾跨▼
- //if (currentTaskThread != null){
- // if (task.getPriority() > currentTaskThread.getCurrentTask().getPriority()) {
- // currentTaskThread.getThread().interrupt();
- // }
- // if (!currentTaskThread.getThread().isAlive()) {
- // Thread newThread = createThread(cameraId, guideTaskQueue);
- // threadMap.put(cameraId, new TaskThread(newThread, task));
- // newThread.start();
- // }
- //}
- ////濡傛灉闃熷垪褰撳墠娌℃湁绾跨▼姝ｅ湪杩愯锛屽垯鍚姩鏂扮嚎绋�
- //else {
- // Thread newThread = createThread(cameraId, guideTaskQueue);
- // threadMap.put(cameraId, new TaskThread(newThread, task));
- // newThread.start();
- //}
- }
-
- /**
- * 鍒涘缓绾跨▼ -----寮冪敤
- * 鍒樿嫃涔�
- * 2023/6/30 9:04
- */
- //private Thread createThread(String queueName, PriorityBlockingQueue<GuideTask> queue) {
- //
- // return new Thread(() -> {
- // while (!Thread.currentThread().isInterrupted()) {
- // try {
- // GuideTask task = queue.take();
- // log.debug("鍙栧嚭闃熷垪鏁版嵁:" + task.getAlarmId());
- // taskExecutor.processTask(task);
- // // 鏇存柊绾跨▼鐨勫綋鍓嶄换鍔�
- // TaskThread currentTaskThread = threadMap.get(queueName);
- // if (currentTaskThread != null) {
- // currentTaskThread.setCurrentTask(task);
- // }
- // } catch (InterruptedException e) {
- // log.info("涓柇褰撳墠绾跨▼");
- // //绾跨▼涓柇锛岄��鍑哄惊鐜�
- // Thread.currentThread().interrupt();
- // }
- // }
- // }, queueName);
- //}
-}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java
deleted file mode 100644
index ff9980c..0000000
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.ruoyi.alarm.global.service.impl;
-
-import com.ruoyi.alarm.access.domain.ArdAlarmAccess;
-import com.ruoyi.alarm.access.service.IArdAlarmAccessService;
-import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
-import com.ruoyi.alarm.external.service.IArdAlarmExternalService;
-import com.ruoyi.alarm.global.domain.GuideTask;
-import com.ruoyi.alarm.radar.domain.ArdAlarmRadarFire;
-import com.ruoyi.alarm.radar.domain.ArdAlarmRadarMove;
-import com.ruoyi.alarm.radar.domain.ArdAlarmRadarPump;
-import com.ruoyi.alarm.radar.service.IArdAlarmRadarFireService;
-import com.ruoyi.alarm.radar.service.IArdAlarmRadarMoveService;
-import com.ruoyi.alarm.radar.service.IArdAlarmRadarPumpService;
-import com.ruoyi.alarm.tube.domain.ArdAlarmTube;
-import com.ruoyi.alarm.tube.service.IArdAlarmTubeService;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.device.camera.domain.CameraCmd;
-import com.ruoyi.device.camera.service.ICameraSdkService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @ClassName QueueTaskExecutor
- * @Description: 闃熷垪浠诲姟鎵ц鍣�-----寮冪敤
- * @Author 鍒樿嫃涔�
- * @Date 2023/6/29 21:10
- * @Version 1.0
- */
-
-@Slf4j(topic = "guideQueue")
-public class QueueTaskExecutor {
- @Resource
- IArdAlarmRadarMoveService ardAlarmRadarMoveService;
- @Resource
- IArdAlarmRadarFireService ardAlarmRadarFireService;
- @Resource
- IArdAlarmRadarPumpService ardAlarmRadarPumpService;
- @Resource
- ICameraSdkService cameraSdkService;
- @Resource
- IArdAlarmTubeService ardAlarmTubeService;
- @Resource
- IArdAlarmExternalService ardAlarmExternalService;
- @Resource
- IArdAlarmAccessService ardAlarmAccessService;
-
- public void processTask(GuideTask guideTask) {
- try {
- CameraCmd cmd = new CameraCmd();
- cmd.setCameraId(guideTask.getCameraId());
- cmd.setChanNo(guideTask.getChanNum());
- cmd.setTargetPosition(guideTask.getTargetPosition());
- cmd.setOperator(guideTask.getAlarmType());
- cmd.setExpired(30);
- cmd.setRecordBucketName("record");
- Map<String, Double> ptzMap = new HashMap<>();
- ptzMap.put("p", guideTask.getGuidePTZ().getP());
- ptzMap.put("t", guideTask.getGuidePTZ().getT());
- ptzMap.put("z", guideTask.getGuidePTZ().getZ());
- cmd.setPtzMap(ptzMap);
- if (guideTask.getRecordSn().equals(1)) {
- cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId() + "_1");
- } else {
- cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId() + "_2");
- }
-
- log.debug("寮�濮嬪紩瀵�");
- boolean guideRes = false;
- if (cmd.getPtzMap().get("p") != null) {
- //p鍊煎瓨鍦� 浼樺厛寮曞ptz
- guideRes = cameraSdkService.setPtz(cmd);
- } else {
- guideRes = cameraSdkService.guideTargetPosition(cmd);
- }
- if (guideRes) {
- log.debug("寮曞鎴愬姛");
- cameraSdkService.controlLock(cmd);//涓婇攣
- cameraSdkService.recordStart(cmd);//寮�濮嬪綍鍍�
- try {
- Thread.sleep(30000);
- } catch (InterruptedException e) {
- log.info("褰撳墠浠诲姟ID" + guideTask.getAlarmId() + "绾跨▼琚粓姝�");
- }
- String url = cameraSdkService.recordStopToMinio(cmd);//鍋滄褰曞儚杩斿洖url
- if (StringUtils.isNotEmpty(url)) {
- switch (guideTask.getAlarmType()) {
- case "sys_tube_leak":
- ArdAlarmTube ardAlarmTube = new ArdAlarmTube();
- ardAlarmTube.setId(guideTask.getAlarmId());
- ardAlarmTube.setRecordUrl(url);
- ardAlarmTubeService.updateArdAlarmTube(ardAlarmTube);
- break;
- case "sys_radar_move":
- ArdAlarmRadarMove ardAlarmRadarMove = new ArdAlarmRadarMove();
- ardAlarmRadarMove.setId(guideTask.getAlarmId());
- if (guideTask.getRecordSn().equals(1)) {
- ardAlarmRadarMove.setRecordUrl1(url);
- } else {
- ardAlarmRadarMove.setRecordUrl2(url);
- }
- ardAlarmRadarMoveService.updateArdAlarmRadarMove(ardAlarmRadarMove);
- break;
- case "sys_radar_fire":
- ArdAlarmRadarFire ardAlarmRadarFire = new ArdAlarmRadarFire();
- ardAlarmRadarFire.setId(guideTask.getAlarmId());
- if (guideTask.getRecordSn().equals(1)) {
- ardAlarmRadarFire.setRecordUrl1(url);
- } else {
- ardAlarmRadarFire.setRecordUrl2(url);
- }
- ardAlarmRadarFireService.updateArdAlarmRadarFire(ardAlarmRadarFire);
- break;
- case "sys_radar_pump":
- ArdAlarmRadarPump ardAlarmRadarPump = new ArdAlarmRadarPump();
- ardAlarmRadarPump.setId(guideTask.getAlarmId());
- if (guideTask.getRecordSn().equals(1)) {
- ardAlarmRadarPump.setRecordUrl1(url);
- } else {
- ardAlarmRadarPump.setRecordUrl2(url);
- }
- ardAlarmRadarPumpService.updateArdAlarmRadarPump(ardAlarmRadarPump);
- break;
- case "sys_external":
- ArdAlarmExternal ardAlarmExternal = new ArdAlarmExternal();
- ardAlarmExternal.setId(guideTask.getAlarmId());
- ardAlarmExternal.setRecordUrl(url);
- ardAlarmExternalService.updateArdAlarmExternal(ardAlarmExternal);
- break;
- case "sys_access_control":
- ArdAlarmAccess ardAlarmAccess = new ArdAlarmAccess();
- ardAlarmAccess.setId(guideTask.getAlarmId());
- ardAlarmAccess.setRecordUrl(url);
- ardAlarmAccessService.updateArdAlarmAccess(ardAlarmAccess);
- break;
- }
- }
- }
- } catch (Exception ex) {
- log.info("绾跨▼浠诲姟寮傚父:" + ex.getMessage());
- }
- }
-}
\ No newline at end of file
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java
index a3bac6a..1b1c22c 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java
@@ -48,12 +48,9 @@
@Excel(name = "绾害")
private Double latitude;
- /** 寮曞褰曞儚2 */
- @Excel(name = "寮曞褰曞儚2")
- private String recordUrl2;
- /** 寮曞褰曞儚1 */
- @Excel(name = "寮曞褰曞儚1")
- private String recordUrl1;
+ /** 寮曞褰曞儚 */
+ @Excel(name = "寮曞褰曞儚")
+ private String recordUrl;
/** 鏌ョ湅鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鏌ョ湅鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java
index e8eac9d..871d1d6 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java
@@ -48,12 +48,10 @@
@Excel(name = "绾害")
private Double latitude;
- /** 寮曞褰曞儚1 */
- @Excel(name = "寮曞褰曞儚1")
- private String recordUrl1;
- /** 寮曞褰曞儚2 */
- @Excel(name = "寮曞褰曞儚2")
- private String recordUrl2;
+ /** 寮曞褰曞儚 */
+ @Excel(name = "寮曞褰曞儚")
+ private String recordUrl;
+
/** 鏌ョ湅鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鏌ョ湅鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java
index 82af9b6..07a03c0 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java
@@ -62,15 +62,10 @@
@Excel(name = "绾害")
private Double latitude;
/**
- * 寮曞褰曞儚1
+ * 寮曞褰曞儚
*/
- @Excel(name = "寮曞褰曞儚1")
- private String recordUrl1;
- /**
- * 寮曞褰曞儚2
- */
- @Excel(name = "寮曞褰曞儚2")
- private String recordUrl2;
+ @Excel(name = "寮曞褰曞儚")
+ private String recordUrl;
/**
* 鏌ョ湅鏃堕棿
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/domain/ArdAlarmpointsWell.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/domain/ArdAlarmpointsWell.java
index 46dc005..a734150 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/domain/ArdAlarmpointsWell.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/domain/ArdAlarmpointsWell.java
@@ -98,17 +98,23 @@
/** 鐢ㄦ埛id */
private String userId;
- /** 鍏宠仈鐩告満ID */
- private String cameraId;
+ /** 寮曞P1鍊� */
+ private Double guideP1;
- /** 寮曞P鍊� */
- private Double guideP;
+ /** 寮曞T1鍊� */
+ private Double guideT1;
- /** 寮曞T鍊� */
- private Double guideT;
+ /** 寮曞Z1鍊� */
+ private Double guideZ1;
- /** 寮曞Z鍊� */
- private Double guideZ;
+ /** 寮曞P2鍊� */
+ private Double guideP2;
+
+ /** 寮曞T2鍊� */
+ private Double guideT2;
+
+ /** 寮曞Z2鍊� */
+ private Double guideZ2;
@TableField(exist = false)
private String type;
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
index fa639b2..8f45372 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
@@ -435,11 +435,11 @@
String wellId = step.getWellId();
if (!StringUtils.isNull(wellId)) {
/*鑾峰彇浜曞潗鏍�*/
- ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);
+ ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);
double[] targetPositon = new double[3];
- targetPositon[0] = ardAlarmpointsWell.getLongitude();
- targetPositon[1] = ardAlarmpointsWell.getLatitude();
- targetPositon[2] = ardAlarmpointsWell.getAltitude();
+ targetPositon[0] = well.getLongitude();
+ targetPositon[1] = well.getLatitude();
+ targetPositon[2] = well.getAltitude();
/*鑾峰彇鐩告満鍧愭爣*/
ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId);
if (StringUtils.isNull(cameras)) {
@@ -458,9 +458,18 @@
cmd.setOperator("sys_patrol_inspect");
cmd.setExpired(step.getRecordingTime() * 60);
Map<String, Double> ptzMap = new HashMap<>();
- ptzMap.put("p", ardAlarmpointsWell.getGuideP());
- ptzMap.put("t", ardAlarmpointsWell.getGuideT());
- ptzMap.put("z", ardAlarmpointsWell.getGuideZ());
+ switch (channel) {
+ case 1:
+ ptzMap.put("p", well.getGuideP1());
+ ptzMap.put("t", well.getGuideT1());
+ ptzMap.put("z", well.getGuideZ1());
+ break;
+ case 2:
+ ptzMap.put("p", well.getGuideP2());
+ ptzMap.put("t", well.getGuideT2());
+ ptzMap.put("z", well.getGuideZ2());
+ break;
+ }
cmd.setPtzMap(ptzMap);
boolean setTargetPosition;
if (cmd.getPtzMap().get("p") != null) {
@@ -502,11 +511,11 @@
String wellId = step.getWellId();
if (!StringUtils.isNull(wellId)) {
/*鑾峰彇浜曞潗鏍�*/
- ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);
+ ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);
double[] targetPositon = new double[3];
- targetPositon[0] = ardAlarmpointsWell.getLongitude();
- targetPositon[1] = ardAlarmpointsWell.getLatitude();
- targetPositon[2] = ardAlarmpointsWell.getAltitude();
+ targetPositon[0] = well.getLongitude();
+ targetPositon[1] = well.getLatitude();
+ targetPositon[2] = well.getAltitude();
/*鑾峰彇鐩告満鍧愭爣*/
ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId);
if (StringUtils.isNull(cameras)) {
@@ -525,9 +534,18 @@
cmd.setOperator("sys_patrol_inspect");
cmd.setExpired(step.getRecordingTime() * 60);
Map<String, Double> ptzMap = new HashMap<>();
- ptzMap.put("p", ardAlarmpointsWell.getGuideP());
- ptzMap.put("t", ardAlarmpointsWell.getGuideT());
- ptzMap.put("z", ardAlarmpointsWell.getGuideZ());
+ switch (channel) {
+ case 1:
+ ptzMap.put("p", well.getGuideP1());
+ ptzMap.put("t", well.getGuideT1());
+ ptzMap.put("z", well.getGuideZ1());
+ break;
+ case 2:
+ ptzMap.put("p", well.getGuideP2());
+ ptzMap.put("t", well.getGuideT2());
+ ptzMap.put("z", well.getGuideZ2());
+ break;
+ }
cmd.setPtzMap(ptzMap);
boolean setTargetPosition;
if (cmd.getPtzMap().get("p") != null) {
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml
index 95ade6e..1a28515 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml
@@ -12,7 +12,7 @@
<result property="alarmTime" column="alarm_time" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
- <result property="recordUrl1" column="record_url1" />
+ <result property="recordUrl" column="record_url" />
<result property="viewTime" column="view_time" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@@ -22,7 +22,7 @@
</resultMap>
<sql id="selectArdAlarmRadarFireVo">
- select id, name, target_id, alarm_type, alarm_time, longitude, latitude, record_url1, view_time, create_by, create_time, user_id, dept_id, guide_time from ard_alarm_radar_fire
+ select id, name, target_id, alarm_type, alarm_time, longitude, latitude, record_url, view_time, create_by, create_time, user_id, dept_id, guide_time from ard_alarm_radar_fire
</sql>
<select id="selectArdAlarmRadarFireList" parameterType="ArdAlarmRadarFire" resultMap="ArdAlarmRadarFireResult">
@@ -34,7 +34,7 @@
<if test="alarmTime != null "> and alarm_time = #{alarmTime}</if>
<if test="longitude != null "> and longitude = #{longitude}</if>
<if test="latitude != null "> and latitude = #{latitude}</if>
- <if test="recordUrl1 != null and recordUrl1 != ''"> and record_url1 = #{recordUrl1}</if>
+ <if test="recordUrl != null and recordUrl != ''"> and record_url = #{recordUrl}</if>
<if test="viewTime != null "> and view_time = #{viewTime}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
@@ -64,7 +64,7 @@
<if test="alarmTime != null">alarm_time,</if>
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
- <if test="recordUrl1 != null">record_url1,</if>
+ <if test="recordUrl != null">record_url,</if>
<if test="viewTime != null">view_time,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
@@ -81,7 +81,7 @@
<if test="alarmTime != null">#{alarmTime},</if>
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
- <if test="recordUrl1 != null">#{recordUrl1},</if>
+ <if test="recordUrl != null">#{recordUrl},</if>
<if test="viewTime != null">#{viewTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@@ -101,8 +101,7 @@
<if test="alarmTime != null">alarm_time = #{alarmTime},</if>
<if test="longitude != null">longitude = #{longitude},</if>
<if test="latitude != null">latitude = #{latitude},</if>
- <if test="recordUrl1 != null">record_url1 = #{recordUrl1},</if>
- <if test="recordUrl2 != null">record_url2 = #{recordUrl2},</if>
+ <if test="recordUrl != null">record_url = #{recordUrl},</if>
<if test="viewTime != null">view_time = #{viewTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
index 3ec6951..1fe49c8 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
@@ -12,8 +12,7 @@
<result property="alarmTime" column="alarm_time" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
- <result property="recordUrl1" column="record_url1" />
- <result property="recordUrl2" column="record_url2" />
+ <result property="recordUrl" column="record_url" />
<result property="viewTime" column="view_time" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@@ -23,7 +22,7 @@
</resultMap>
<sql id="selectArdAlarmRadarMoveVo">
- select id, name, target_id, alarm_type, alarm_time, longitude, latitude, record_url1,record_url2, view_time, create_by, create_time, user_id, dept_id, guide_time from ard_alarm_radar_move
+ select id, name, target_id, alarm_type, alarm_time, longitude, latitude, record_url, view_time, create_by, create_time, user_id, dept_id, guide_time from ard_alarm_radar_move
</sql>
<select id="selectArdAlarmRadarMoveList" parameterType="ArdAlarmRadarMove" resultMap="ArdAlarmRadarMoveResult">
@@ -35,7 +34,7 @@
<if test="alarmTime != null "> and alarm_time = #{alarmTime}</if>
<if test="longitude != null "> and longitude = #{longitude}</if>
<if test="latitude != null "> and latitude = #{latitude}</if>
- <if test="recordUrl1 != null and recordUrl1 != ''"> and record_url1 = #{recordUrl1}</if>
+ <if test="recordUrl != null and recordUrl != ''"> and record_url = #{recordUrl}</if>
<if test="viewTime != null "> and view_time = #{viewTime}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
@@ -65,8 +64,7 @@
<if test="alarmTime != null">alarm_time,</if>
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
- <if test="recordUrl1 != null">record_url1,</if>
- <if test="recordUrl2 != null">record_url2,</if>
+ <if test="recordUrl != null">record_url,</if>
<if test="viewTime != null">view_time,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
@@ -83,8 +81,7 @@
<if test="alarmTime != null">#{alarmTime},</if>
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
- <if test="recordUrl1 != null">#{recordUrl1},</if>
- <if test="recordUrl2 != null">#{recordUrl2},</if>
+ <if test="recordUrl != null">#{recordUrl},</if>
<if test="viewTime != null">#{viewTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@@ -104,8 +101,7 @@
<if test="alarmTime != null">alarm_time = #{alarmTime},</if>
<if test="longitude != null">longitude = #{longitude},</if>
<if test="latitude != null">latitude = #{latitude},</if>
- <if test="recordUrl1 != null">record_url1 = #{recordUrl1},</if>
- <if test="recordUrl2 != null">record_url2 = #{recordUrl2},</if>
+ <if test="recordUrl != null">record_url = #{recordUrl},</if>
<if test="viewTime != null">view_time = #{viewTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml
index d453275..10c5e89 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml
@@ -12,7 +12,7 @@
<result property="alarmTime" column="alarm_time" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
- <result property="recordUrl1" column="record_url1" />
+ <result property="recordUrl" column="record_url" />
<result property="viewTime" column="view_time" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@@ -34,7 +34,7 @@
<if test="alarmTime != null "> and alarm_time = #{alarmTime}</if>
<if test="longitude != null "> and longitude = #{longitude}</if>
<if test="latitude != null "> and latitude = #{latitude}</if>
- <if test="recordUrl1 != null and recordUrl1 != ''"> and record_url1 = #{recordUrl1}</if>
+ <if test="recordUrl != null and recordUrl != ''"> and record_url = #{recordUrl}</if>
<if test="viewTime != null "> and view_time = #{viewTime}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
@@ -64,7 +64,7 @@
<if test="alarmTime != null">alarm_time,</if>
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
- <if test="recordUrl1 != null">record_url1,</if>
+ <if test="recordUrl != null">record_url,</if>
<if test="viewTime != null">view_time,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
@@ -81,7 +81,7 @@
<if test="alarmTime != null">#{alarmTime},</if>
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
- <if test="recordUrl1 != null">#{recordUrl1},</if>
+ <if test="recordUrl != null">#{recordUrl},</if>
<if test="viewTime != null">#{viewTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@@ -101,8 +101,7 @@
<if test="alarmTime != null">alarm_time = #{alarmTime},</if>
<if test="longitude != null">longitude = #{longitude},</if>
<if test="latitude != null">latitude = #{latitude},</if>
- <if test="recordUrl1 != null">record_url1 = #{recordUrl1},</if>
- <if test="recordUrl2 != null">record_url2 = #{recordUrl2},</if>
+ <if test="recordUrl != null">record_url = #{recordUrl},</if>
<if test="viewTime != null">view_time = #{viewTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
diff --git a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
index 7b997d0..e6247af 100644
--- a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
@@ -28,10 +28,12 @@
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
- <result property="cameraId" column="camera_id"/>
- <result property="guideP" column="guide_p"/>
- <result property="guideT" column="guide_t"/>
- <result property="guideZ" column="guide_z"/>
+ <result property="guideP1" column="guide_p1"/>
+ <result property="guideT1" column="guide_t1"/>
+ <result property="guideZ1" column="guide_z1"/>
+ <result property="guideP2" column="guide_p2"/>
+ <result property="guideT2" column="guide_t2"/>
+ <result property="guideZ2" column="guide_z2"/>
</resultMap>
<resultMap type="ArdAlarmpointsWell" id="wellResult">
@@ -64,10 +66,12 @@
c.create_time,
c.update_by,
c.update_time,
- c.camera_id,
- c.guide_p,
- c.guide_t,
- c.guide_z
+ c.guide_p1,
+ c.guide_t1,
+ c.guide_z1,
+ c.guide_p2,
+ c.guide_t2,
+ c.guide_z2
from ard_alarmpoints_well c
left join sys_dept d on d.dept_id = c.dept_id
left join sys_user u on u.user_id = c.user_id
@@ -132,10 +136,12 @@
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
- <if test="cameraId != null">camera_id,</if>
- <if test="guideP != null">guide_p,</if>
- <if test="guideT != null">guide_t,</if>
- <if test="guideZ != null">guide_z,</if>
+ <if test="guideP1 != null">guide_p1,</if>
+ <if test="guideT1 != null">guide_t1,</if>
+ <if test="guideZ1 != null">guide_z1,</if>
+ <if test="guideP2 != null">guide_p2,</if>
+ <if test="guideT2 != null">guide_t2,</if>
+ <if test="guideZ2 != null">guide_z2,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -161,10 +167,12 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
- <if test="cameraId != null">#{cameraId},</if>
- <if test="guideP != null">#{guideP},</if>
- <if test="guideT != null">#{guideT},</if>
- <if test="guideZ != null">#{guideZ},</if>
+ <if test="guideP1 != null">#{guideP1},</if>
+ <if test="guideT1 != null">#{guideT1},</if>
+ <if test="guideZ1 != null">#{guideZ1},</if>
+ <if test="guideP2 != null">#{guideP2},</if>
+ <if test="guideT2 != null">#{guideT2},</if>
+ <if test="guideZ2 != null">#{guideZ2},</if>
</trim>
</insert>
@@ -193,10 +201,12 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="cameraId != null">camera_id = #{cameraId},</if>
- <if test="guideP != null">guide_p = #{guideP},</if>
- <if test="guideT != null">guide_t = #{guideT},</if>
- <if test="guideZ != null">guide_z = #{guideZ},</if>
+ <if test="guideP1 != null">guide_p1 = #{guideP1},</if>
+ <if test="guideT1 != null">guide_t1 = #{guideT1},</if>
+ <if test="guideZ1 != null">guide_z1 = #{guideZ1},</if>
+ <if test="guideP2 != null">guide_p2 = #{guideP2},</if>
+ <if test="guideT2 != null">guide_t2 = #{guideT2},</if>
+ <if test="guideZ2 != null">guide_z2 = #{guideZ2},</if>
</trim>
where id = #{id}
</update>
@@ -225,10 +235,12 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="cameraId != null">camera_id = #{cameraId},</if>
- <if test="guideP != null">guide_p = #{guideP},</if>
- <if test="guideT != null">guide_t = #{guideT},</if>
- <if test="guideZ != null">guide_z = #{guideZ},</if>
+ <if test="guideP1 != null">guide_p1 = #{guideP1},</if>
+ <if test="guideT1 != null">guide_t1 = #{guideT1},</if>
+ <if test="guideZ1 != null">guide_z1 = #{guideZ1},</if>
+ <if test="guideP2 != null">guide_p2 = #{guideP2},</if>
+ <if test="guideT2 != null">guide_t2 = #{guideT2},</if>
+ <if test="guideZ2 != null">guide_z2 = #{guideZ2},</if>
</trim>
where well_id = #{wellId}
</update>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 1b54cd8..d777ac4 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -29,7 +29,7 @@
public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
- public static String YYYY_MM_DD_HH_MM_SS_MS = "yyyy-MM-dd HH:mm:ss.fff";
+ public static String YYYY_MM_DD_HH_MM_SS_MS = "yyyy-MM-dd HH:mm:ss.SSS";
public static String HH_MM_SS = "HH:mm:ss";
private static String[] parsePatterns = {
--
Gitblit v1.9.3