From dae6e068207ad1bff32dafd8c71f12d8a2a59aa2 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期一, 15 四月 2024 16:21:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) 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 484f0b7..0c705c4 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 @@ -5,6 +5,7 @@ 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.GuidePoint; import com.ruoyi.alarm.global.domain.GuidePriorityQueue; import com.ruoyi.alarm.global.domain.GuideTask; import com.ruoyi.alarm.radar.domain.ArdAlarmRadarFire; @@ -119,7 +120,8 @@ cmd.setPtzMap(ptzMap); } cmd.setRecordBucketName("record"); - cmd.setTargetPosition(guideTask.getTargetPosition()); + GuidePoint targetPosition = guideTask.getTargetPosition(); + cmd.setTargetPosition(new double[]{targetPosition.getLongitude(),targetPosition.getLatitude()}); cmd.setRecordObjectName("alarmGuide/" + DateUtils.getDateYYYYMMDD() + "/" + guideTask.getAlarmType() + "/" + guideTask.getAlarmId()); ICameraSdkService cameraSdkService = SpringUtils.getBean(ICameraSdkService.class); log.debug("寮�濮嬪紩瀵�"); @@ -131,25 +133,16 @@ guideRes = true; } } else { - guideRes = cameraSdkService.guideTargetPosition(cmd); + AjaxResult result = cameraSdkService.guideTargetPosition(cmd); + guideRes = result.get("code").equals(200); } if (guideRes) { log.debug("寮曞鎴愬姛"); - //region 閫氱煡鍓嶇 - Map<String, Object> message = new HashMap<>(); - Map<String, String> data = new HashMap<>(); - data.put("cameraId", cmd.getCameraId()); - data.put("chanNo", cmd.getChanNo().toString()); - data.put("alarmType", cmd.getOperator()); - data.put("alarmId", guideTask.getAlarmId()); - data.put("wellId", guideTask.getWellId()); - message.put("70000", data); - WebSocketUtils.sendMessageAll(message); - //endregion cameraSdkService.controlLock(cmd);//涓婇攣 cameraSdkService.recordStart(cmd);//寮�濮嬪綍鍍� recordFlag = true; Instant startTime = Instant.now(); + Instant startTime1 = startTime; while (recordFlag) { //鍒ゆ柇鏃堕棿 Instant currentTime = Instant.now(); @@ -169,6 +162,19 @@ recordFlag = false;//褰曞儚鍋滄 } } + //region 閫氱煡鍓嶇 + long seconds = Duration.between(startTime1, currentTime).getSeconds(); + // 鍒ゆ柇褰撳墠鏃堕棿涓庝笂娆″彂閫佹暟鎹殑鏃堕棿闂撮殧鏄惁瓒呰繃2绉� + if (seconds == 2) { + Map<String, Object> message = new HashMap<>(); + Map<String, String> data = new HashMap<>(); + data.put("cameraId", cmd.getCameraId()); + data.put("wellId", guideTask.getWellId()); + message.put("70000", data); + WebSocketUtils.sendMessageAll(message); + startTime1 = currentTime; // 鏇存柊涓婃鍙戦�佹暟鎹殑鏃堕棿鎴� + } + //endregion } if (StringUtils.isNotEmpty(url)) { switch (guideTask.getAlarmType()) { -- Gitblit v1.9.3