场景关联

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

@@ -1814,7 +1814,6 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         Map<String, String> map = new HashMap<>();
         JSONObject fileJson;
         String uploadFile, uploadFilePath;
-        String img = null;
         String imgEditPath = String.format(UploadFilePath.IMG_EDIT_PATH, num);
         for(int i = 0, len = array.size(); i < len; i++){
             fileJson = array.getJSONObject(i);
@@ -1826,35 +1825,22 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
                 throw new Exception(uploadFilePath + "文件不存在");
             }
 
-            //low文件夹
-            if(fileJson.getIntValue("clazz") == 4){
-                img = "pan/low/" + uploadFile.replace("low/", "");
-                map.put(uploadFilePath, imgEditPath + "pan/low/" + uploadFile.replace("low/", ""));
-                //上传缩略图到panorama
-                map.put(uploadFilePath, imgEditPath + "panorama/" + sid);
+            Integer clazz = fileJson.getIntValue("clazz");
+            if(Objects.isNull(clazz)){
                 continue;
             }
-
-            //tiles文件夹,亚马逊没有裁剪图片api，不需要上传4k图
-            if(fileJson.getIntValue("clazz") == 5){
+            if(clazz == 4 || clazz == 5 || clazz == 7){
                 map.put(uploadFilePath, imgEditPath + "panorama/" + sid + File.separator + uploadFile);
             }
-
-            //tiles文件夹,亚马逊瓦片图
-            if(fileJson.getIntValue("clazz") == 7){
-                map.put(uploadFilePath, imgEditPath + uploadFile);
-            }
         }
 
         //上传全景图
-        map.put(filePath, imgEditPath + "pan/high/" + fileName);
+        map.put(filePath, imgEditPath + "panorama/" + sid + "/high/" + fileName);
 
         uploadToOssUtil.uploadMulFiles(map);
 
         Map<String, String> result = new HashMap<>();
         result.put("type", type);
-        result.put("img", img);
-        result.put("path", "panorama/" + sid);
         return ResultData.ok(result);
     }