Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-11-04 43ce77a85d8297a53dc25430fff10ead57296167

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

@@ -12,6 +12,7 @@
import com.ld.igds.phone35.util.PhoneRespUtil;
import com.ld.igds.sec.dto.SecCameraDto;
import com.ld.igds.sec.manager.SecManager;
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;
@@ -25,12 +26,14 @@
public class Phone35ServiceImpl5605 implements Phone35Service {
    @Autowired
    private SecManager securityManager;

    @Autowired
    private CoreSecCameraService secCameraService;
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5605;
    }

    @SuppressWarnings("unchecked")
    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //转化对象
@@ -42,20 +45,24 @@
        if (StringUtils.isEmpty(param.getId())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
        }
        //参数验证
        if (CameraUtil.PLAY_TYPE_DEFAULT.equals(param.getPlayType())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "系统未配置当前摄像头播放方式，不执行预览");
        }

        SecCameraDto cameraParam = new SecCameraDto();
        cameraParam.setId(param.getId());
        cameraParam.setCompanyId(phone35AuthUser.getCompanyId());
        SecCameraDto camera = securityManager.getPlayAddr(cameraParam);

        //获取设备信息
        SecCameraDto camera = secCameraService.getCameraById(phone35AuthUser.getCompanyId(), param.getId());
        if (camera == null) {
            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);
    }