Merge branch 'release-绘图' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/entity/ScenePlus.java
#	src/main/java/com/fdkankan/contro/service/ICommonService.java
#	src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -333,6 +333,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             //生成floorpan.json
             commonService.uploadFloorplanJson(sceneCode, path);
 
+            //上传平面图ai识别结果
+            commonService.uploadFloorplanAi(sceneCode, path);
+
             //重置异步操作记录
             commonService.removeSceneAsynOperLog(sceneCode);
 

src/main/java/com/fdkankan/contro/service/ICommonService.java

@@ -65,4 +65,6 @@ public interface ICommonService {
 
     Integer getSlamCount(String num);
 
+    void uploadFloorplanAi(String num, String path);
+
 }

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

@@ -873,4 +873,18 @@ public class CommonServiceImpl implements ICommonService {
 
         return slamCount;
     }
+
+    @Override
+    public void uploadFloorplanAi(String num, String path) {
+        String floorplanPath = path + "/results/floorplan/";
+        List<File> files = FileUtil.loopFiles(floorplanPath);
+        if(CollUtil.isEmpty(files)){
+            return;
+        }
+        String ossPath = String.format(UploadFilePath.DATA_VIEW_PATH, num) + "floorplan/";
+        for (File file : files) {
+            fYunFileService.uploadFile(file.getAbsolutePath(), file.getAbsolutePath().replace(floorplanPath, ossPath));
+        }
+
+    }
 }