ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
@@ -91,6 +91,7 @@
            }
        }
    }
    //异步处理任务
    public void processTask(GuideTask guideTask) {
        try {
@@ -103,24 +104,46 @@
            cmd.setChanNo(guideTask.getChanNo());
            cmd.setOperator(guideTask.getAlarmType());
            cmd.setExpired(30);
            Map<String, Double> ptzMap=new HashMap<>();
            if(guideTask.getTargetPTZ()!=null) {
                if (guideTask.getChanNo() == 1) {
                    ptzMap.put("p", guideTask.getTargetPTZ().getP1());
                    ptzMap.put("t", guideTask.getTargetPTZ().getT1());
                    ptzMap.put("z", guideTask.getTargetPTZ().getZ1());
                }
                if (guideTask.getChanNo() == 2) {
                    ptzMap.put("p", guideTask.getTargetPTZ().getP2());
                    ptzMap.put("t", guideTask.getTargetPTZ().getT2());
                    ptzMap.put("z", guideTask.getTargetPTZ().getZ2());
                }
                cmd.setPtzMap(ptzMap);
            }
            cmd.setRecordBucketName("record");
            cmd.setTargetPosition(guideTask.getTargetPosition());
            cmd.setRecordObjectName("alarmGuide/"+ DateUtils.getDateYYYYMMDD()+"/"+guideTask.getAlarmType()+"/"+guideTask.getAlarmId());
            cmd.setRecordObjectName("alarmGuide/" + DateUtils.getDateYYYYMMDD() + "/" + guideTask.getAlarmType() + "/" + guideTask.getAlarmId());
            ICameraSdkService cameraSdkService = SpringUtils.getBean(ICameraSdkService.class);
            log.debug("开始引导");
            boolean recordFlag = false;
            boolean guideRes = cameraSdkService.guideTargetPosition(cmd);
            boolean guideRes = false;
            if (guideTask.getIsGuidePTZ()) {
                AjaxResult result = cameraSdkService.setPtz(cmd);
                if (result.get("code").equals(200)) {
                    guideRes = true;
                }
            } else {
                guideRes = cameraSdkService.guideTargetPosition(cmd);
            }
            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());
                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);
                data.put("wellId", guideTask.getWellId());
                message.put("70000", data);
                WebSocketUtils.sendMessageAll(message);
                //endregion
                cameraSdkService.controlLock(cmd);//上锁