|
@@ -181,6 +181,7 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
|
|
if(Objects.isNull(scenePlus)){
|
|
if(Objects.isNull(scenePlus)){
|
|
throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
|
|
throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
|
|
}
|
|
}
|
|
|
|
+ ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
Scene scene = sceneService.getBySceneCode(num);
|
|
Scene scene = sceneService.getBySceneCode(num);
|
|
String mapping = scene.getMapping();
|
|
String mapping = scene.getMapping();
|
|
Map<String, Object> result = new HashMap<>();
|
|
Map<String, Object> result = new HashMap<>();
|
|
@@ -189,7 +190,13 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
|
|
.eq(SceneDownloadLog::getSceneNum, num)
|
|
.eq(SceneDownloadLog::getSceneNum, num)
|
|
.orderByDesc(SceneDownloadLog::getId)
|
|
.orderByDesc(SceneDownloadLog::getId)
|
|
.last("limit 1"));
|
|
.last("limit 1"));
|
|
- if(Objects.nonNull(sceneDownloadLog) && sceneDownloadLog.getStatus() == 1){
|
|
|
|
|
|
+
|
|
|
|
+ String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH+"scene.json", num);
|
|
|
|
+ String sceneJson = ossUtil.getFileContent(scenePlusExt.getYunFileBucket(), sceneJsonPath);
|
|
|
|
+ SceneJsonBean sceneJsonBean = JSON.parseObject(sceneJson, SceneJsonBean.class);
|
|
|
|
+ int version = sceneJsonBean.getVersion();
|
|
|
|
+
|
|
|
|
+ if(Objects.nonNull(sceneDownloadLog) && sceneDownloadLog.getStatus() == 1 && version == sceneDownloadLog.getSceneVersion()){
|
|
String url=this.publicUrl+":"+fdkkLaserConfig.getLaserPort()+"/" + mapping +sceneDownloadLog.getDownloadUrl();
|
|
String url=this.publicUrl+":"+fdkkLaserConfig.getLaserPort()+"/" + mapping +sceneDownloadLog.getDownloadUrl();
|
|
result.put("status", 2);
|
|
result.put("status", 2);
|
|
result.put("url",url);
|
|
result.put("url",url);
|