|
@@ -561,28 +561,6 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
**/
|
|
|
private SceneInfoVO getSceneInfo4View(String num) throws Exception{
|
|
|
|
|
|
- // TODO: 2022/5/19 请求v3的接口,获取场景的状态 待v3停机后要换成v4d的逻辑-------------------------start
|
|
|
- String url = fkankanMiniHost + URL_GET_SCENEPRO_BY_NUM + num + "&addViewCount=yes";
|
|
|
- Result<SceneProV3> result = fdkankanMiniClient
|
|
|
- .getSceneProByNum(url, new FdkkMiniReqSuccessCallback(),
|
|
|
- new FdkkMiniReqErrorCallback());
|
|
|
- SceneProV3 sceneProV3 = result.getData();
|
|
|
- if(sceneProV3 == null || sceneProV3.getId() == null){
|
|
|
- throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
|
|
|
- }
|
|
|
- if(sceneProV3.getRecStatus().equals("I")){
|
|
|
- throw new BusinessException(ErrorCode.FAILURE_CODE_5009);
|
|
|
- }
|
|
|
- if(SceneStatus.SUCCESS.code() != sceneProV3.getStatus()
|
|
|
- && SceneStatus.NO_DISPLAY.code() != sceneProV3.getStatus()){
|
|
|
- throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
|
|
|
- }
|
|
|
- if(PayStatus.PAY.code() != sceneProV3.getPayStatus()){
|
|
|
- throw new BusinessException(ErrorCode.FAILURE_CODE_5034);
|
|
|
- }
|
|
|
- // TODO: 2022/5/19 请求v3的接口,获取场景的状态 待v3停机后要换成v4d的逻辑-------------------------send
|
|
|
-
|
|
|
-// ScenePro scenePro = sceneProService.findBySceneNum(num);
|
|
|
ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
|
|
|
if(Objects.isNull(scenePlus)){
|
|
|
throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
|
|
@@ -594,10 +572,6 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
//先查询redis
|
|
|
if(StrUtil.isNotEmpty(sceneJson)) {
|
|
|
sceneInfoVO = JSON.parseObject(sceneJson, SceneInfoVO.class);
|
|
|
- // TODO: 2022/4/24 v3版本停机要切换---------------------------start
|
|
|
-// this.setExtData(sceneInfoVO, scenePlus.getCameraId());
|
|
|
- this.setExtDataFromV3(sceneInfoVO, scenePlus.getCameraId());
|
|
|
- // TODO: 2022/4/24 v3版本停机要切换---------------------------end
|
|
|
sceneInfoVO.setScenePassword(null);
|
|
|
if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
|
|
|
sceneInfoVO.setFloorPlanAngle(0f);
|
|
@@ -614,10 +588,6 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
if(StrUtil.isEmpty(objectContent))
|
|
|
return null;
|
|
|
sceneInfoVO = JSON.parseObject(objectContent, SceneInfoVO.class);
|
|
|
- // TODO: 2022/4/24 v3版本停机要切换---------------------------start
|
|
|
-// this.setExtData(sceneInfoVO, scenePlus.getCameraId());
|
|
|
- this.setExtDataFromV3(sceneInfoVO, scenePlus.getCameraId());
|
|
|
- // TODO: 2022/4/24 v3版本停机要切换---------------------------end
|
|
|
if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
|
|
|
sceneInfoVO.setFloorPlanAngle(0f);
|
|
|
}
|