|
|
@@ -122,7 +122,7 @@ public class UploadSceneListener {
|
|
|
private void uploadSceneOirg(String num, String sourcePath) throws Exception {
|
|
|
ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
|
|
|
NameFileFilter fileFilter = new NameFileFilter("data.fdage");
|
|
|
- File dataFdageFile = FileUtil.loopFiles(sourcePath, fileFilter).stream().findFirst().filter(v -> !v.getAbsolutePath().contains("/backup/")).get();
|
|
|
+ File dataFdageFile = FileUtil.loopFiles(sourcePath, fileFilter).stream().filter(v -> !v.getAbsolutePath().contains("/backup/")).findFirst().get();
|
|
|
|
|
|
//去读data.fdage
|
|
|
if(dataFdageFile != null && !dataFdageFile.exists()){
|
|
|
@@ -165,7 +165,7 @@ public class UploadSceneListener {
|
|
|
SceneJsonBean sceneJsonBean = JSONObject.parseObject(FileUtil.readUtf8String(sceneJsonFile), SceneJsonBean.class);
|
|
|
String sceneViewDataPath = "/oss/4dkankan/" + String.format(UploadFilePath.VIEW_PATH, num);
|
|
|
FileUtil.mkdir(sceneViewDataPath);
|
|
|
- String cpCmd = "cp -p -r " + sourcePath + "/* " + sceneViewDataPath;
|
|
|
+ String cpCmd = "cp -p -r " + sourcePath + "/env/wwwroot/scene_view_data/" + num +"/* " + sceneViewDataPath;
|
|
|
CmdUtils.callLineSh(cpCmd);
|
|
|
|
|
|
sceneJsonBean.setUploadType("offline");
|
dengsixing