Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-14 af3b68eeca07a30967754dc1a61b8def9efe188c

 ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java

@@ -20,16 +20,17 @@
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;

/**
 * @ClassName QueueTaskExecutor
 * @Description: 队列任务执行器
 * @Description: 队列任务执行器-----弃用
 * @Author 刘苏义
 * @Date 2023/6/29 21:10
 * @Version 1.0
 */

@Component
@Slf4j(topic = "guideQueue")
public class QueueTaskExecutor {
    @Resource
@@ -42,7 +43,6 @@
    ICameraSdkService cameraSdkService;
    @Resource
    IArdAlarmTubeService ardAlarmTubeService;

    @Resource
    IArdAlarmExternalService ardAlarmExternalService;
    @Resource
@@ -57,9 +57,25 @@
            cmd.setOperator(guideTask.getAlarmType());
            cmd.setExpired(30);
            cmd.setRecordBucketName("record");
            cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId());
            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 = cameraSdkService.guideTargetPosition(cmd);
            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);//上锁
@@ -97,6 +113,7 @@
                                ardAlarmRadarFire.setRecordUrl2(url);
                            }
                            ardAlarmRadarFireService.updateArdAlarmRadarFire(ardAlarmRadarFire);
                            break;
                        case "sys_radar_pump":
                            ArdAlarmRadarPump ardAlarmRadarPump = new ArdAlarmRadarPump();
                            ardAlarmRadarPump.setId(guideTask.getAlarmId());
@@ -126,4 +143,4 @@
            log.info("线程任务异常:" + ex.getMessage());
        }
    }
}
}