|
@@ -107,7 +107,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|
* 服务实现类
|
|
* 服务实现类
|
|
* </p>
|
|
* </p>
|
|
*
|
|
*
|
|
- * @author
|
|
|
|
|
|
+ * @author
|
|
* @since 2022-01-18
|
|
* @since 2022-01-18
|
|
*/
|
|
*/
|
|
@Slf4j
|
|
@Slf4j
|
|
@@ -606,21 +606,17 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
private SceneInfoVO getSceneInfo4View(String num) throws Exception{
|
|
private SceneInfoVO getSceneInfo4View(String num) throws Exception{
|
|
|
|
|
|
//校验场景是否为空、封存、计算中
|
|
//校验场景是否为空、封存、计算中
|
|
- ScenePlus scenePlus = scenePlusService.checkSceneAvail(num);
|
|
|
|
- ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
|
|
-
|
|
|
|
- //访问量+1
|
|
|
|
- scenePlusService.updateViewCount(num);
|
|
|
|
|
|
+// ScenePlus scenePlus = scenePlusService.checkSceneAvail(num);
|
|
|
|
+// ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
|
|
+//
|
|
|
|
+// //访问量+1
|
|
|
|
+// scenePlusService.updateViewCount(num);
|
|
|
|
|
|
- String key = String.format(RedisKey.SCENE_JSON, num);
|
|
|
|
- String sceneJson = redisUtil.get(key);
|
|
|
|
|
|
+// String key = String.format(RedisKey.SCENE_JSON, num);
|
|
SceneInfoVO sceneInfoVO = null;
|
|
SceneInfoVO sceneInfoVO = null;
|
|
- //先查询redis
|
|
|
|
- if(StrUtil.isEmpty(sceneJson)) {
|
|
|
|
- String objectName = String.format(ConstantFilePath.SCENE_VIEW_DATA_DATA_SCENEJSON, num);
|
|
|
|
- sceneJson = fYunFileService.getFileContent(scenePlusExt.getYunFileBucket(), objectName);
|
|
|
|
- redisUtil.set(key, sceneJson);
|
|
|
|
- }
|
|
|
|
|
|
+ String objectName = String.format(ConstantFilePath.SCENE_VIEW_DATA_DATA_SCENEJSON, num);
|
|
|
|
+ String sceneJson = fYunFileService.getFileContent(objectName);
|
|
|
|
+// redisUtil.set(key, sceneJson);
|
|
sceneInfoVO = JSON.parseObject(sceneJson, SceneInfoVO.class);
|
|
sceneInfoVO = JSON.parseObject(sceneJson, SceneInfoVO.class);
|
|
sceneInfoVO.setScenePassword(null);
|
|
sceneInfoVO.setScenePassword(null);
|
|
if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
|
|
if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
|