增加国标直播接口，完成人工图片与图斑绑定，修改图片获取接口，获取前更新人工图片的图斑绑定

rain

2024-07-02 efb0d6f50d446e56949e23f3f8cb230d719a7b2d

 src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java

@@ -1,5 +1,6 @@
package com.dji.sample.manage.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dji.sample.common.error.LiveErrorEnum;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.mqtt.model.CommonTopicResponse;
@@ -7,7 +8,9 @@
import com.dji.sample.component.mqtt.service.IMessageSenderService;
import com.dji.sample.component.redis.RedisConst;
import com.dji.sample.component.redis.RedisOpsUtils;
import com.dji.sample.manage.dao.IDeviceSetMapper;
import com.dji.sample.manage.model.dto.*;
import com.dji.sample.manage.model.entity.DeviceSetEntity;
import com.dji.sample.manage.model.enums.DeviceDomainEnum;
import com.dji.sample.manage.model.enums.LiveStreamMethodEnum;
import com.dji.sample.manage.model.enums.LiveUrlTypeEnum;
@@ -16,6 +19,8 @@
import com.dji.sample.manage.model.receiver.CapacityDeviceReceiver;
import com.dji.sample.manage.model.receiver.LiveCapacityReceiver;
import com.dji.sample.manage.service.*;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +29,8 @@
import java.lang.reflect.Field;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import static com.dji.sample.component.mqtt.model.TopicConst.*;
@@ -42,6 +49,8 @@

    @Autowired
    private IDeviceService deviceService;
    @Autowired
    private IDeviceSetMapper deviceSetMapper;

    @Autowired
    private IWorkspaceService workspaceService;
@@ -51,7 +60,6 @@

    @Autowired
    private IDeviceRedisService deviceRedisService;

    @Override
    public List<CapacityDeviceDTO> getLiveCapacity(String workspaceId,String sn) {

@@ -117,15 +125,15 @@
        //相机已经在直播中，请勿重复开启直播
        if(receiveReply.getResult() == 513003) {
            LiveDTO live = new LiveDTO();
            live.setUrl(liveParam.getUrl().replace("rtmp", "https").replace("735","700") + ".flv");
//            LiveUrlGB28181DTO gb28181 = urlToGB28181(liveParam.getUrl());
//            live.setUrl(new StringBuilder()
//                    .append("https://wrj.shuixiongit.com/zb/rtp/")
//                    .append(gb28181.getAgentID())
//                    .append("_")
//                    .append(gb28181.getChannel())
//                    .append(".live.flv")
//                    .toString());
//            live.setUrl(liveParam.getUrl().replace("rtmp", "https").replace("735","700") + ".flv");
            LiveUrlGB28181DTO gb28181 = urlToGB28181(liveParam.getUrl());
            live.setUrl(new StringBuilder()
                    .append("https://wrj.shuixiongit.com/zb/rtp/")
                    .append(gb28181.getAgentID())
                    .append("_")
                    .append(gb28181.getChannel())
                    .append(".live.flv")
                    .toString());
            return ResponseResult.success(live);
        }

@@ -142,27 +150,27 @@
//                live.setUrl(liveParam.getUrl().replace("rtmp", "webrtc"));
                live.setUrl(liveParam.getUrl().replace("rtmp", "https").replace("735","700") + ".flv");
                break;
            case GB28181:
                LiveUrlGB28181DTO gb28181 = urlToGB28181(liveParam.getUrl());
                live.setUrl(new StringBuilder()
                        .append("webrtc://")
                        .append(gb28181.getServerIP())
                        .append("/live/")
                        .append(gb28181.getAgentID())
                        .append("@")
                        .append(gb28181.getChannel())
                        .toString());
                break;
//            case GB28181:
//                LiveUrlGB28181DTO gb28181 = urlToGB28181(liveParam.getUrl());
//                live.setUrl(new StringBuilder()
//                        .append("https://wrj.shuixiongit.com/zb/rtp/")
//                        .append("webrtc://")
//                        .append(gb28181.getServerIP())
//                        .append("/live/")
//                        .append(gb28181.getAgentID())
//                        .append("_")
//                        .append("@")
//                        .append(gb28181.getChannel())
//                        .append(".live.flv")
//                        .toString());
//                break;
            case GB28181:
                LiveUrlGB28181DTO gb28181 = urlToGB28181(liveParam.getUrl());
                live.setUrl(new StringBuilder()
                        .append("https://wrj.shuixiongit.com/zb/rtp/")
                        .append(gb28181.getAgentID())
                        .append("_")
                        .append(gb28181.getChannel())
                        .append(".live.flv")
                        .toString());
                break;
            case RTSP:
                String url = receiveReply.getOutput().toString();
                this.resolveUrlUser(url, live);
@@ -172,6 +180,62 @@
        }

        return ResponseResult.success(live);

    }

    @Override
    public ResponseResult liveAddress(String deviceSn,String deviceId) {
       DeviceSetEntity deviceSet= deviceSetMapper.selectOne(new LambdaQueryWrapper<DeviceSetEntity>()
                .eq(DeviceSetEntity::getDeviceSn,deviceSn)
                .eq(DeviceSetEntity::getDeviceId,deviceId)
        );
        String workspaceId=getIdBySn(deviceSn);
        List<CapacityDeviceDTO> dto=getLiveCapacity(workspaceId,deviceSn);
        String vedioId=deviceSn+"/165-0-7/normal-0";
        String url="https://"+deviceSet.getServerIp()+"/zb/rtp/"+deviceSet.getAgentId()+"_"+deviceSet.getChannel()+".live.flv";
        LiveTypeDTO liveParam=new LiveTypeDTO();
        liveParam.setUrl(url);
        liveParam.setUrlType(3);
        liveParam.setVideoId(vedioId);
        liveParam.setVideoQuality(0);
        ResponseResult responseResult = this.checkBeforeLive(liveParam.getVideoId());
        if (ResponseResult.CODE_SUCCESS != responseResult.getCode()) {
            return responseResult;
        }

        DeviceDTO data = (DeviceDTO)responseResult.getData();
        String respTopic = THING_MODEL_PRE + PRODUCT +
                data.getDeviceSn() + SERVICES_SUF;

        //获取返回结果
        ServiceReply receiveReply = this.publishLiveStart(respTopic, liveParam);
        System.out.println(receiveReply.getResult());
        LiveDTO live = new LiveDTO();
        live.setUrl(url);
        //相机已经在直播中，请勿重复开启直播
        if(receiveReply.getResult() == 513003) {
            return ResponseResult.success(live);
        }
        return ResponseResult.success(live);
    }


        public static String getVedioId(String data,String sn) {
            return findDeviceBySn(data, sn);
        }

        public static String findDeviceBySn(String dtoListString, String snToFind) {
            String regex = "CapacityDeviceDTO\\(sn=" + snToFind + ", .*? index=([\\w\\-]+).*? index=([\\w\\-]+).*?\\)";
            Pattern pattern = Pattern.compile(regex);
            Matcher matcher = pattern.matcher(dtoListString);

            if (matcher.find()) {
                String index1 = matcher.group(1);
                String index2 = matcher.group(2);
                return snToFind + "/" + index1 + "/" + index2;
            }

            return null; // 如果未找到匹配的sn，则返回null或者适当的默认值
    }

    @Override
@@ -180,10 +244,8 @@
        if (responseResult.getCode() != 0) {
            return responseResult;
        }

        //thing/product/{gateway_sn}/services
        String respTopic = THING_MODEL_PRE + PRODUCT + responseResult.getData().getDeviceSn() + SERVICES_SUF;

        videoId = videoId.replace("_","/");

        ServiceReply receiveReply = this.publishLiveStop(respTopic, videoId);
@@ -351,6 +413,10 @@
        return messageSender.publishWithReply(ServiceReply.class, topic, response);
    }

    private String getIdBySn(String dockSn){
        DeviceSetEntity entity=deviceSetMapper.selectOne(new LambdaQueryWrapper<DeviceSetEntity>().eq(DeviceSetEntity::getDeviceSn,dockSn));
        return entity.getWorkspaceId();
    }
    /**
     * Send a message to the pilot via mqtt to set quality.
     * @param respTopic