|
|
@@ -75,6 +75,9 @@ public class SceneEditServiceImpl implements ISceneEditService {
|
|
|
@Value("${4dkk.manageService.api.getServiceUpTip}")
|
|
|
private String getServiceUpTipApi;
|
|
|
|
|
|
+ @Value("#{'${demo.scene.num:}'.split(',')}")
|
|
|
+ private List<String> demoSceneNums;
|
|
|
+
|
|
|
@Autowired
|
|
|
ISceneProService sceneProService;
|
|
|
@Autowired
|
|
|
@@ -111,6 +114,20 @@ public class SceneEditServiceImpl implements ISceneEditService {
|
|
|
@Override
|
|
|
public SceneAuthVO getAuth(String num, SSOUser ssoUser){
|
|
|
|
|
|
+ SceneAuthVO sceneAuthVO = new SceneAuthVO();
|
|
|
+ List<SceneResource> exclude = new ArrayList<>();
|
|
|
+ SceneResource excludeEntity = new SceneResource();
|
|
|
+ excludeEntity.setKeyWord("data");
|
|
|
+ exclude.add(excludeEntity);
|
|
|
+ sceneAuthVO.setExclude(exclude);
|
|
|
+ sceneAuthVO.setInclude(new ArrayList<>());
|
|
|
+ sceneAuthVO.setCompany(null);
|
|
|
+
|
|
|
+ //法国宣传页场景,无token打开编辑页
|
|
|
+ if(CollUtil.isNotEmpty(demoSceneNums) && demoSceneNums.contains(num)){
|
|
|
+ return sceneAuthVO;
|
|
|
+ }
|
|
|
+
|
|
|
// 解密获得username,用于和数据库进行对比
|
|
|
String username = ssoUser.getUserName();
|
|
|
|
|
|
@@ -120,17 +137,7 @@ public class SceneEditServiceImpl implements ISceneEditService {
|
|
|
}
|
|
|
ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
|
|
|
|
- SceneAuthVO sceneAuthVO = new SceneAuthVO();
|
|
|
-
|
|
|
- List<SceneResource> exclude = new ArrayList<>();
|
|
|
- SceneResource excludeEntity = new SceneResource();
|
|
|
- excludeEntity.setKeyWord("data");
|
|
|
- exclude.add(excludeEntity);
|
|
|
-
|
|
|
Camera camera = cameraService.findByChildName(username);
|
|
|
- sceneAuthVO.setExclude(exclude);
|
|
|
- sceneAuthVO.setInclude(new ArrayList<>());
|
|
|
- sceneAuthVO.setCompany(null);
|
|
|
|
|
|
//判断data.json是否存在,如果存在,则证明计算在未被定时任务删除前上传过oss
|
|
|
boolean exist = fYunFileService.fileExist(String.format(UploadFilePath.scene_result_data_path, num).concat("data.json"));
|