三一车辆模型bug修改提交

zhangnaisong

2024-07-17 7c1e2217d0e4aad7498a5c136710c33cb55d00d0

 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,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()) {