Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-11-04 43ce77a85d8297a53dc25430fff10ead57296167

 igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java

@@ -12,6 +12,7 @@
import com.ld.igds.phone.service.PhoneService;
import com.ld.igds.phone.util.PhoneRespUtil;
import com.ld.igds.sec.dto.SecCameraDto;
import com.ld.igds.sec.service.CoreSecCameraService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,6 +27,8 @@

    @Autowired
    private SecManager securityManager;
    @Autowired
    private CoreSecCameraService secCameraService;

    @Override
    public String getInterfaceId() {
@@ -43,19 +46,23 @@
        if(param == null || StringUtils.isEmpty(param.getCameraId()) || StringUtils.isEmpty(param.getPlayType())){
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"参数异常，请重试！");
        }
        // 根据id获取设备信息
//        SecCameraDto camera = securityManager.getCameraById(authUser.getCompanyId(), param.getCameraId(), true);
        SecCameraDto cameraParam = new SecCameraDto();
        cameraParam.setId(param.getCameraId());
        cameraParam.setCompanyId(authUser.getCompanyId());
        SecCameraDto camera = securityManager.getPlayAddr(cameraParam);

        if (camera == null) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"未查询到相关设备！");
        if (CameraUtil.PLAY_TYPE_DEFAULT.equals(param.getPlayType())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"系统未配置当前摄像头播放方式，不执行预览");
        }

        if (CameraUtil.PLAY_TYPE_DEFAULT.equals(camera.getPlayType())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"系统未配置当前摄像头播放方式，不执行预览");
        //获取设备信息
        SecCameraDto camera = secCameraService.getCameraById(authUser.getCompanyId(), param.getCameraId());
        if(null == camera){
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"未查询到相关设备！");
        }
        if(StringUtils.isNotEmpty(camera.getPhoneAddr())){
            camera.setPlayAddr(camera.getPhoneAddr());
            return PhoneRespUtil.success(camera, req);
        }

        camera = securityManager.getPlayAddr(camera);
        if (camera == null) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"未查询到相关设备！");
        }

        return PhoneRespUtil.success(camera, req);