bug修复

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -56,6 +56,7 @@ import com.google.common.collect.Lists;
 import com.google.errorprone.annotations.Var;
 import java.io.File;
 import java.io.FileInputStream;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -737,8 +738,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             .getScenePlusExtByPlusId(scenePlus.getId());
 
         //原始计算根目录
-//      String path = "F:\\test";
-        String path = scenePlusExt.getDataSource();
+      String path = "F:\\test";
+//        String path = scenePlusExt.getDataSource();
         //全景图计算根目录
         String target = path + "_images";
         //解压缩文件存放目录
@@ -766,6 +767,13 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             FileUtil.delFile(zipTargetFilePath);
         }
 
+        //判断文件夹目录结构，图片必须放在压缩包根目录下，不支持空文件夹或其他格式文件上传
+        File[] files = new File(targetImagesPath).listFiles();
+        Arrays.stream(files).forEach(item->{
+            if(item.isDirectory()){
+                throw new BusinessException(ErrorCode.FAILURE_CODE_7018);
+            }
+        });
 
         //获取解压后的文件列表
         List<String> uploadFileList = FileUtil.getFileList(targetImagesPath);