|
@@ -360,6 +360,12 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
SceneInfoVO sceneInfoVO = new SceneInfoVO();
|
|
|
BeanUtil.copyProperties(sceneEditInfoExt, sceneInfoVO);
|
|
|
BeanUtil.copyProperties(sceneEditInfo, sceneInfoVO);
|
|
|
+ if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
|
|
|
+ sceneInfoVO.setFloorPlanAngle(0);
|
|
|
+ }
|
|
|
+ if(Objects.isNull(sceneInfoVO.getFloorPlanCompass())){
|
|
|
+ sceneInfoVO.setFloorPlanCompass(0);
|
|
|
+ }
|
|
|
sceneInfoVO.setControls(BeanUtil.copyProperties(sceneEditControls, SceneEditControlsVO.class));
|
|
|
sceneInfoVO.setNum(num);
|
|
|
//生成sceneJson
|
|
@@ -429,6 +435,12 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
sceneInfoVO = JSON.parseObject(sceneJson, SceneInfoVO.class);
|
|
|
this.setExtData(sceneInfoVO, scenePro.getCameraId());
|
|
|
sceneInfoVO.setScenePassword(null);
|
|
|
+ if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
|
|
|
+ sceneInfoVO.setFloorPlanAngle(0);
|
|
|
+ }
|
|
|
+ if(Objects.isNull(sceneInfoVO.getFloorPlanCompass())){
|
|
|
+ sceneInfoVO.setFloorPlanCompass(0);
|
|
|
+ }
|
|
|
return sceneInfoVO;
|
|
|
}
|
|
|
|
|
@@ -440,6 +452,12 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
sceneInfoVO = JSON.parseObject(objectContent, SceneInfoVO.class);
|
|
|
this.setExtData(sceneInfoVO, scenePro.getCameraId());
|
|
|
sceneInfoVO.setScenePassword(null);
|
|
|
+ if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
|
|
|
+ sceneInfoVO.setFloorPlanAngle(0);
|
|
|
+ }
|
|
|
+ if(Objects.isNull(sceneInfoVO.getFloorPlanCompass())){
|
|
|
+ sceneInfoVO.setFloorPlanCompass(0);
|
|
|
+ }
|
|
|
redisUtil.set(key, JSON.toJSONString(sceneInfoVO));
|
|
|
|
|
|
return sceneInfoVO;
|
|
@@ -962,7 +980,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
|
|
|
@Override
|
|
|
public DownloadVO downloadBallScreenVideo(BallScreenVideoParamVO param) {
|
|
|
- String videoPath = String.format(UploadFilePath.USER_EDIT_PATH, param.getNum()) + param.getFileName();
|
|
|
+ String videoPath = String.format(UploadFilePath.VIDEOS_VIEW_PATH, param.getNum()) + param.getFileName();
|
|
|
String url = ossUrlPrefix + videoPath + "?t=" + System.currentTimeMillis();
|
|
|
return DownloadVO.builder()
|
|
|
.fileName(param.getFileName())
|