|
|
@@ -82,6 +82,7 @@ public class BuildSxTestServiceImpl implements IBuildSceneService {
|
|
|
@Override
|
|
|
public void buildScenePre(BuildSceneCallMessage message) throws Exception{
|
|
|
String num = message.getSceneNum();
|
|
|
+ ScenePlus scenePlusByNum = scenePlusService.getScenePlusByNum(num);
|
|
|
Map<String, Object> ext = message.getExt();
|
|
|
String qjkkNum = (String)ext.get("qjkkNum");
|
|
|
try {
|
|
|
@@ -114,7 +115,6 @@ public class BuildSxTestServiceImpl implements IBuildSceneService {
|
|
|
// this.downLoadSource(message, message.getPath());
|
|
|
|
|
|
//下载深巡的pose文件夹，并重命名为extras
|
|
|
- ScenePlus scenePlusByNum = scenePlusService.getScenePlusByNum(num);
|
|
|
Integer relocationMaxindex = scenePlusByNum.getRelocationMaxindex();
|
|
|
if(relocationMaxindex == null){
|
|
|
relocationMaxindex = -1;
|
|
|
@@ -127,7 +127,7 @@ public class BuildSxTestServiceImpl implements IBuildSceneService {
|
|
|
query.put("query", queryList);
|
|
|
for (String key : imgKeyList) {
|
|
|
String fileName = (++relocationMaxindex) + "." + FileUtil.extName(key);
|
|
|
- fYunFileService.downloadFile(key, extrasPath + "images/query/" + (relocationMaxindex++) + "." + FileUtil.extName(key));
|
|
|
+ fYunFileService.downloadFile(key, extrasPath + "images/query/" + fileName);
|
|
|
JSONObject fileNameObj = new JSONObject();
|
|
|
fileNameObj.put("filename", fileName);
|
|
|
queryList.add(fileNameObj);
|
|
|
@@ -149,6 +149,8 @@ public class BuildSxTestServiceImpl implements IBuildSceneService {
|
|
|
|
|
|
}catch (Exception e){
|
|
|
log.error("场景计算前置处理出错,num"+num, e);
|
|
|
+ scenePlusByNum.setSceneStatus(SceneStatus.FAILD.code());
|
|
|
+ scenePlusService.updateById(scenePlusByNum);
|
|
|
buildSceneDTService.handBaseFail("深巡场景重定向资源准备异常！", message.getPath(), message.getSceneNum(), "计算控制服务器");
|
|
|
throw e;
|
|
|
}
|
dengsixing