场景升级，增加迁移楼层户型图逻辑

src/main/java/com/fdkankan/repair/controller/SceneRepairController.java

@@ -4,7 +4,9 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.response.ResultData;
+import com.fdkankan.common.util.FileUtil;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.constant.RedisKey;
@@ -22,7 +24,10 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicInteger;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,7 +78,20 @@ public class SceneRepairController {
     private int maxThread;
 
     @GetMapping("/test")
-    public ResultData test(){
+    public ResultData test(String num) throws Exception{
+        //户型图上传
+        String  userEditPath = UploadFilePath.USER_EDIT_PATH + "floor-cad-%s.%s";
+        String  userViewPath = UploadFilePath.USER_VIEW_PATH + "floor-cad-%s.%s";
+        String floorCadPath = "/mnt/data/06f6aa555/851814909602693120/4898cab06133_202106081015476130" + "/results/floorplan_cad";
+        List<String> floorCadList = FileUtil.getFileList(floorCadPath);
+        if(CollUtil.isNotEmpty(floorCadList)){
+            floorCadList.stream().forEach(str->{
+                String[] arr = str.split("floor");
+                String[] arr2 = arr[1].split(".");
+                uploadToOssUtil.upload(str, String.format(userEditPath, num, arr2[0], arr2[1]));
+                uploadToOssUtil.upload(str, String.format(userViewPath, num, arr2[0], arr2[1]));
+            });
+        }
         //17264
         return ResultData.ok();
     }

src/main/java/com/fdkankan/repair/service/impl/SceneUpgradeToV4Service.java

@@ -345,6 +345,20 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
 //            }
             uploadToOssUtil.uploadMulFiles(map);
 
+            //户型图上传
+            String  userEditPath = UploadFilePath.USER_EDIT_PATH + "floor-cad-%s.%s";
+            String  userViewPath = UploadFilePath.USER_VIEW_PATH + "floor-cad-%s.%s";
+            String floorCadPath = path + "/results/floorplan_cad";
+            List<String> floorCadList = FileUtil.getFileList(floorCadPath);
+            if(CollUtil.isNotEmpty(floorCadList)){
+                floorCadList.stream().forEach(str->{
+                    String[] arr = str.split("floor");
+                    String[] arr2 = arr[1].split(".");
+                    uploadToOssUtil.upload(str, String.format(userEditPath, num, arr2[0], arr2[1]));
+                    uploadToOssUtil.upload(str, String.format(userViewPath, num, arr2[0], arr2[1]));
+                });
+            }
+
             //拷贝模型文件到用户编辑目录
             String editImagesPath = String.format(UploadFilePath.IMG_EDIT_PATH, num);
             String viewImagesPath = String.format(UploadFilePath.IMG_VIEW_PATH, num);