|
@@ -549,10 +549,16 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
}
|
|
|
log.info("相机详情:{}",JSONObject.toJSONString(cameraDetail));
|
|
|
// 判断是否是正顺的场景,如果是正顺的场景,则发送到原来的系统进行计算
|
|
|
- if (!ObjectUtils.isEmpty(cameraDetail.getCompanyId())
|
|
|
- && (cameraDetail.getCompanyId().equals(1L) || cameraDetail.getCompanyId().equals(15L))) {
|
|
|
- callV3Service(preParams);
|
|
|
- return ResultData.ok();
|
|
|
+ if (!ObjectUtils.isEmpty(cameraDetail.getCompanyId())) {
|
|
|
+ Company company = companyService.getById(cameraDetail.getCompanyId());
|
|
|
+ if(ObjectUtils.isEmpty(company)){
|
|
|
+ log.error("企业配置有误:" + cameraName);
|
|
|
+ throw new BusinessException(CameraConstant.FAILURE_6003);
|
|
|
+ }
|
|
|
+ if (ObjectUtils.isEmpty(company.getSceneVersion()) && company.getSceneVersion().equals("V3")) {
|
|
|
+ callV3Service(preParams);
|
|
|
+ return ResultData.ok();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// 判断是否是V3的场景
|