|
@@ -433,6 +433,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
SceneEditControls sceneEditControls, ScenePlus scenePlus, ScenePlusExt scenePlusExt, boolean arrearCap) throws Exception{
|
|
SceneEditControls sceneEditControls, ScenePlus scenePlus, ScenePlusExt scenePlusExt, boolean arrearCap) throws Exception{
|
|
String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
|
|
String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
|
|
|
|
|
|
|
|
+ //清除redis缓存
|
|
|
|
+ redisUtil.del(String.format(RedisKey.SCENE_JSON, num));
|
|
|
|
+
|
|
String sceneJsonKey = dataViewPath + "scene.json";
|
|
String sceneJsonKey = dataViewPath + "scene.json";
|
|
boolean exist = fYunFileService.fileExist(sceneJsonKey);
|
|
boolean exist = fYunFileService.fileExist(sceneJsonKey);
|
|
//如果云端没有scene.json文件,生成一份
|
|
//如果云端没有scene.json文件,生成一份
|
|
@@ -728,22 +731,26 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
SceneSource sceneSource = SceneSource.get(scenePlus.getSceneSource());
|
|
SceneSource sceneSource = SceneSource.get(scenePlus.getSceneSource());
|
|
switch (sceneSource){
|
|
switch (sceneSource){
|
|
case BM:
|
|
case BM:
|
|
- scenePlusExt.setSceneResolution(SceneResolution.TILES_2K.code());
|
|
|
|
|
|
+ scenePlusExt.setSceneResolution(SceneResolution.two_K.code());
|
|
scenePlusExt.setSceneFrom(SceneFrom.PRO.code());
|
|
scenePlusExt.setSceneFrom(SceneFrom.PRO.code());
|
|
break;
|
|
break;
|
|
case SM:
|
|
case SM:
|
|
- scenePlusExt.setSceneResolution(SceneResolution.TILES_1K.code());
|
|
|
|
|
|
+ scenePlusExt.setSceneResolution(SceneResolution.one_k.code());
|
|
scenePlusExt.setSceneFrom(SceneFrom.LITE.code());
|
|
scenePlusExt.setSceneFrom(SceneFrom.LITE.code());
|
|
break;
|
|
break;
|
|
case ZT:
|
|
case ZT:
|
|
- scenePlusExt.setSceneResolution(SceneResolution.TILES_4K.code());
|
|
|
|
|
|
+ scenePlusExt.setSceneResolution(SceneResolution.four_K.code());
|
|
scenePlusExt.setSceneFrom(SceneFrom.MINION.code());
|
|
scenePlusExt.setSceneFrom(SceneFrom.MINION.code());
|
|
break;
|
|
break;
|
|
case JG:
|
|
case JG:
|
|
- scenePlusExt.setSceneResolution(SceneResolution.TILES_4K.code());
|
|
|
|
|
|
+ scenePlusExt.setSceneResolution(SceneResolution.four_K.code());
|
|
scenePlusExt.setSceneFrom(SceneFrom.LASER.code());
|
|
scenePlusExt.setSceneFrom(SceneFrom.LASER.code());
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ String sceneKind = scenePlusExt.getSceneScheme() == 3 ? SceneKind.FACE.code():SceneKind.TILES.code();
|
|
|
|
+ scenePlusExt.setSceneKind(sceneKind);
|
|
|
|
+
|
|
scenePlusExtService.updateById(scenePlusExt);
|
|
scenePlusExtService.updateById(scenePlusExt);
|
|
|
|
|
|
|
|
|