|
|
@@ -63,9 +63,9 @@ public class FdkkService {
|
|
|
public UploadSceneCheckVo uploadSceneCheck(UploadSceneOrigParamVo paramVo) {
|
|
|
try {
|
|
|
JyUser loginUser = jyUserService.getBySysId(StpUtil.getLoginId());
|
|
|
- paramVo.setFilePath(paramVo.getFilePath().replace(manageConfig.getQueryPath(),""));
|
|
|
+ String zipPath = paramVo.getFilePath().replace(manageConfig.getQueryPath(),manageConfig.getQueryPath() + "4dkankan/");
|
|
|
|
|
|
- String content = ZipFileReaderUtil.readUtf8(manageConfig.getQueryPath() + "4dkankan/"+paramVo.getFilePath(), "data.fdage");
|
|
|
+ String content = ZipFileReaderUtil.readUtf8(zipPath, "data.fdage");
|
|
|
JSONObject jsonObject = JSONObject.parseObject(content);
|
|
|
String uuidtime = jsonObject.getString("uuidtime");
|
|
|
List<ScenePlusExt> exts = scenePlusExtService.getLikeDataSource(uuidtime);
|
|
|
@@ -93,7 +93,9 @@ public class FdkkService {
|
|
|
|
|
|
public UploadSceneCheckVo checkUploadSceneOffline(String zipPath) {
|
|
|
try {
|
|
|
- String sceneJsonStr = ZipFileReaderUtil.readUtf8(manageConfig.getQueryPath() + "4dkankan/"+zipPath, "scene.json");
|
|
|
+ zipPath = zipPath.replace(manageConfig.getQueryPath(),manageConfig.getQueryPath() + "4dkankan/");
|
|
|
+
|
|
|
+ String sceneJsonStr = ZipFileReaderUtil.readUtf8(zipPath, "scene.json");
|
|
|
|
|
|
if(StrUtil.isEmpty(sceneJsonStr) || !JSONUtil.isJson(sceneJsonStr)){
|
|
|
throw new BusinessException(ResultCode.UPLOAD_SCENE_ERROR3);
|