更新webrtc-streamer版本 为了避免通道数和通道号混淆修改sdk请求参数channelNum为chanNo sdk接口增加聚焦值获取

‘liusuyi’

2023-09-07 07cac52e0b64a78361ce4a353604c94bd1186a6c

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

@@ -6,6 +6,12 @@
import com.ruoyi.alarm.external.service.IArdAlarmExternalService;
import com.ruoyi.alarm.global.domain.GuideTask;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadar;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarFire;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarMove;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarPump;
import com.ruoyi.alarm.radar.service.IArdAlarmRadarFireService;
import com.ruoyi.alarm.radar.service.IArdAlarmRadarMoveService;
import com.ruoyi.alarm.radar.service.IArdAlarmRadarPumpService;
import com.ruoyi.alarm.radar.service.IArdAlarmRadarService;
import com.ruoyi.alarm.tube.domain.ArdAlarmTube;
import com.ruoyi.alarm.tube.service.IArdAlarmTubeService;
@@ -29,11 +35,16 @@
@Slf4j(topic = "guideQueue")
public class QueueTaskExecutor {
    @Resource
    IArdAlarmRadarMoveService ardAlarmRadarMoveService;
    @Resource
    IArdAlarmRadarFireService ardAlarmRadarFireService;
    @Resource
    IArdAlarmRadarPumpService ardAlarmRadarPumpService;
    @Resource
    IHikClientService hikClientService;
    @Resource
    IArdAlarmTubeService ardAlarmTubeService;
    @Resource
    IArdAlarmRadarService ardAlarmRadarService;

    @Resource
    IArdAlarmExternalService ardAlarmExternalService;
    @Resource
@@ -42,7 +53,7 @@
        try {
            CameraCmd cmd = new CameraCmd();
            cmd.setCameraId(guideTask.getCameraId());
            cmd.setChannelNum(guideTask.getChanNum());
            cmd.setChanNo(guideTask.getChanNum());
            cmd.setTargetPosition(guideTask.getTargetPosition());
            cmd.setOperator(guideTask.getAlarmType());
            cmd.setExpired(30);
@@ -69,16 +80,33 @@
                            ardAlarmTubeService.updateArdAlarmTube(ardAlarmTube);
                            break;
                        case "sys_radar_move":
                        case "sys_radar_fire":
                        case "sys_radar_pumpshutdown":
                            ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
                            ardAlarmRadar.setId(guideTask.getAlarmId());
                            ArdAlarmRadarMove ardAlarmRadarMove = new ArdAlarmRadarMove();
                            ardAlarmRadarMove.setId(guideTask.getAlarmId());
                            if (guideTask.getRecordSn().equals(1)) {
                                ardAlarmRadar.setRecordUrl1(url);
                                ardAlarmRadarMove.setRecordUrl1(url);
                            } else {
                                ardAlarmRadar.setRecordUrl2(url);
                                ardAlarmRadarMove.setRecordUrl2(url);
                            }
                            ardAlarmRadarService.updateArdAlarmRadar(ardAlarmRadar);
                            ardAlarmRadarMoveService.updateArdAlarmRadarMove(ardAlarmRadarMove);
                            break;
                        case "sys_radar_fire":
                            ArdAlarmRadarFire ardAlarmRadarFire = new ArdAlarmRadarFire();
                            ardAlarmRadarFire.setId(guideTask.getAlarmId());
                            if (guideTask.getRecordSn().equals(1)) {
                                ardAlarmRadarFire.setRecordUrl1(url);
                            } else {
                                ardAlarmRadarFire.setRecordUrl2(url);
                            }
                            ardAlarmRadarFireService.updateArdAlarmRadarFire(ardAlarmRadarFire);
                        case "sys_radar_pump":
                            ArdAlarmRadarPump ardAlarmRadarPump = new ArdAlarmRadarPump();
                            ardAlarmRadarPump.setId(guideTask.getAlarmId());
                            if (guideTask.getRecordSn().equals(1)) {
                                ardAlarmRadarPump.setRecordUrl1(url);
                            } else {
                                ardAlarmRadarPump.setRecordUrl2(url);
                            }
                            ardAlarmRadarPumpService.updateArdAlarmRadarPump(ardAlarmRadarPump);
                            break;
                        case "sys_external":
                            ArdAlarmExternal ardAlarmExternal = new ArdAlarmExternal();