From 7c1e2217d0e4aad7498a5c136710c33cb55d00d0 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 17 七月 2024 15:11:00 +0800
Subject: [PATCH] 三一车辆模型bug修改提交
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 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 7cfafa5..3ffd02d 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
@@ -133,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();
@@ -171,6 +162,27 @@
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());
+ switch (guideTask.getAlarmType())
+ {
+ case "sys_radar_move":data.put("type", "闆疯揪绉诲姩鎶ヨ");break;
+ case "sys_radar_fire":data.put("type", "绾㈠闃茬伀鎶ヨ");break;
+ case "sys_radar_pump":data.put("type", "鎶芥补鏈哄仠鏈烘姤璀�");break;
+ default:data.put("type", "闆疯揪鎶ヨ");break;
+ }
+
+ message.put("70000", data);
+ WebSocketUtils.sendMessageAll(message);
+ startTime1 = currentTime; // 鏇存柊涓婃鍙戦�佹暟鎹殑鏃堕棿鎴�
+ }
+ //endregion
}
if (StringUtils.isNotEmpty(url)) {
switch (guideTask.getAlarmType()) {
--
Gitblit v1.9.3