|
@@ -243,7 +243,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
JSONObject videosJson = this.getVideosJson(path, videoVersion, sceneCode, cameraType);
|
|
JSONObject videosJson = this.getVideosJson(path, videoVersion, sceneCode, cameraType);
|
|
|
|
|
|
//写入数据库
|
|
//写入数据库
|
|
- ScenePlus scenePlus = this.updateDbPlus(sceneCode, space, payStatus, videosJson.toJSONString(), computeTime, fileId);
|
|
|
|
|
|
+ ScenePlus scenePlus = this.updateDbPlus(sceneCode, space, payStatus, videosJson.toJSONString(), computeTime, fileId,fdageData.containsKey("exportMeshObj") && fdageData.getIntValue("exportMeshObj") == 1);
|
|
ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
|
|
|
|
//变更容量,arrearCap为true时,代表容量不足
|
|
//变更容量,arrearCap为true时,代表容量不足
|
|
@@ -690,7 +690,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
.set(ScenePlusExt::getAlgorithmTime, Calendar.getInstance().getTime()));
|
|
.set(ScenePlusExt::getAlgorithmTime, Calendar.getInstance().getTime()));
|
|
}
|
|
}
|
|
|
|
|
|
- private ScenePlus updateDbPlus(String num, Long space, Integer payStatus, String videosJson, Long computeTime, String fileId) throws Exception{
|
|
|
|
|
|
+ private ScenePlus updateDbPlus(String num, Long space, Integer payStatus, String videosJson, Long computeTime, String fileId,boolean isObj){
|
|
ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
|
|
ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
|
|
ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
List<ScenePlus> list = scenePlusService.list(
|
|
List<ScenePlus> list = scenePlusService.list(
|
|
@@ -709,10 +709,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
.set(ScenePlus::getPayStatus, payStatus));
|
|
.set(ScenePlus::getPayStatus, payStatus));
|
|
|
|
|
|
scenePlusExtService.update(new LambdaUpdateWrapper<ScenePlusExt>()
|
|
scenePlusExtService.update(new LambdaUpdateWrapper<ScenePlusExt>()
|
|
- .in(ScenePlusExt::getPlusId, scenePlusIds)
|
|
|
|
- .set(ScenePlusExt::getSpace, space)
|
|
|
|
- .set(ScenePlusExt::getComputeTime, computeTime)
|
|
|
|
- .set(ScenePlusExt::getVideos, videosJson));
|
|
|
|
|
|
+ .in(ScenePlusExt::getPlusId, scenePlusIds)
|
|
|
|
+ .set(ScenePlusExt::getSpace, space)
|
|
|
|
+ .set(ScenePlusExt::getComputeTime, computeTime)
|
|
|
|
+ .set(ScenePlusExt::getVideos, videosJson).set(ScenePlusExt::getIsObj, isObj ? 1 : 0));
|
|
|
|
|
|
SceneFileBuild sceneFileBuild = sceneFileBuildService.findByFileId(fileId);
|
|
SceneFileBuild sceneFileBuild = sceneFileBuildService.findByFileId(fileId);
|
|
if(sceneFileBuild != null){
|
|
if(sceneFileBuild != null){
|