Merge branch 'feature-4.12.3-dsx' into test

src/main/java/com/fdkankan/contro/service/impl/LinkPanServiceImpl.java

@@ -58,7 +58,6 @@ public class LinkPanServiceImpl implements ILinkPanService {
         if ( dataFdageObj.containsKey("points")){
             JSONArray points = dataFdageObj.getJSONArray("points");
             log.info("points:{}", JSON.toJSONString(points));
-            Map<String, String> map = new HashMap<>();
             if(ObjUtil.isNotNull(points)){
                 for (Object point : points) {
                     JSONObject pointObj = (JSONObject) point;
@@ -96,21 +95,18 @@ public class LinkPanServiceImpl implements ILinkPanService {
                                 continue;
                             }
                             if(clazz == 4 || clazz == 5 || clazz == 7){
-                                map.put(uploadFilePath, imgEditPath + "panorama/" + sid + File.separator + uploadFile);
-                                map.put(uploadFilePath, imgViewPath + "panorama/" + sid + File.separator + uploadFile);
+                                fYunFileService.uploadFile(uploadFilePath, imgEditPath + "panorama/" + sid + File.separator + uploadFile);
+                                fYunFileService.uploadFile(uploadFilePath, imgViewPath + "panorama/" + sid + File.separator + uploadFile);
 
                             }
                         }
-                        map.put(filePath, imgEditPath + "panorama/" + sid + "/high/" + pano);
-                        map.put(filePath, imgViewPath + "panorama/" + sid + "/high/" + pano);
-
+                        fYunFileService.uploadFile(filePath, imgEditPath + "panorama/" + sid + "/high/" + pano);
+                        fYunFileService.uploadFile(filePath, imgViewPath + "panorama/" + sid + "/high/" + pano);
 
                         this.addOrUpdateLinPan(num, pano, panoId, sid);
                     }
                 }
 
-                fYunFileService.uploadMulFiles(map);
-
                 log.info("开始links.json文件");
                 links = this.publicLinkSceneData(num);
                 log.info("结束生成links.json文件");