|
@@ -465,6 +465,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
}
|
|
|
}
|
|
|
mqMessage.getExt().put("deleteExtras", true);
|
|
|
+ mqMessage.getExt().put("keepTitle", 0);
|
|
|
if(jsonObject.getIntValue("location") == 7){
|
|
|
//发送到全景看看进行初始化
|
|
|
intermitSceneService.sendMq(scenePlusVO.getNum(), jsonObject, CommonSuccessStatus.WAITING.code());
|
|
@@ -474,8 +475,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
if(cameraType == 13 && Objects.nonNull(cameraDetail.getCompanyId()) && cameraDetail.getCompanyId() == 26){
|
|
|
wbService.sendMq(sceneNum, CommonSuccessStatus.WAITING.code());
|
|
|
}
|
|
|
-// String test = null;
|
|
|
-// test.equals("123");
|
|
|
rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);
|
|
|
}
|
|
|
|
|
@@ -930,9 +929,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
} else {
|
|
|
scenePlusExt.setShootCount(sceneShootCount);
|
|
|
}
|
|
|
- if (sceneName != null) {
|
|
|
- scenePlus.setTitle(sceneName);
|
|
|
- }
|
|
|
if (sceneDec != null) {
|
|
|
scenePlus.setDescription("<p>" + new String(sceneDec.getBytes("UTF-8")) + "</p>");
|
|
|
}
|
|
@@ -957,6 +953,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
SceneEditInfoExt sceneEditInfoExt = new SceneEditInfoExt();
|
|
|
SceneEditControls sceneEditControls = new SceneEditControls();
|
|
|
if(type == 0){
|
|
|
+ if (sceneName != null) {
|
|
|
+ scenePlus.setTitle(sceneName);
|
|
|
+ }
|
|
|
scenePlus.setSceneStatus(SceneStatus.wait.code());
|
|
|
scenePlusService.save(scenePlus);
|
|
|
scenePlusExt.setPlusId(scenePlus.getId());
|
|
@@ -1312,6 +1311,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
if (force) {
|
|
|
message.setRebuild("1");
|
|
|
}
|
|
|
+ message.getExt().put("keepTitle", 1);
|
|
|
|
|
|
String ossOrignPath = commonService.getOssOrignPath(path);
|
|
|
String ossPath = fYunFileService.getFileContent(ossOrignPath + "custom.txt");
|