场景计算拆分

4dkankan-center-auth/pom.xml

@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>com.fdkankan</groupId>
 			<artifactId>4dkankan-common-utils</artifactId>
-			<version>2.0.0-SNAPSHOT</version>
+			<version>3.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

4dkankan-center-platform/pom.xml

@@ -36,7 +36,7 @@
       <dependency>
           <groupId>com.fdkankan</groupId>
           <artifactId>4dkankan-common-utils</artifactId>
-          <version>2.0.0-SNAPSHOT</version>
+          <version>3.0.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>

4dkankan-center-scene/src/main/java/com/fdkankan/scene/listener/BuildSceneResultMQListener.java

@@ -163,11 +163,15 @@ public class BuildSceneResultMQListener implements RocketMQListener<String> {
             uploadToOssUtil.upload(outPathZh, String.format(UploadFilePath.DOWNLOADS_QRCODE, sceneCode) + sceneCode + ".png");
             uploadToOssUtil.upload(outPathEn, String.format(UploadFilePath.DOWNLOADS_QRCODE, sceneCode) + sceneCode + "_en.png");
 
+            Map<String, String> newUploadFiles = buildScenePreService
+                .uploadFileMapHandler(sceneCode, cameraType, uploadFiles);
+
             //上传计算结果中的caches/images和caches/videos
             buildScenePreService.uploadCaches(sceneCode, uploadFiles, path);
 
-
             //上传文件
+            uploadToOssUtil.uploadMulFiles(newUploadFiles);
+            // TODO: 2022/3/11 同时上传一份到旧版本的目录，用于过渡期使用，待重构版本稳定后删除
             uploadToOssUtil.uploadMulFiles(uploadFiles);
 
             //拷贝部分文件到编辑目录，用于用户编辑

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

@@ -21,7 +21,7 @@ public interface IBuildScenePreService {
 
     void downLoadSource(BuildSceneMqMessage buildSceneMqMessage, String path) throws Exception;
 
-    void uploadFileMapHandler(String num, int cameraType, Map<String, String> map);
+    Map<String, String> uploadFileMapHandler(String num, int cameraType, Map<String, String> map);
 
     void uploadCaches(String num, Map<String,String> map, String path);
 

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

@@ -165,7 +165,10 @@ public class BuildScenePreServiceImpl implements IBuildScenePreService {
     }
 
     @Override
-    public void uploadFileMapHandler(String num, int cameraType, Map<String, String> map) {
+    public Map<String, String> uploadFileMapHandler(String num, int cameraType, Map<String, String> map) {
+        if(CollUtil.isEmpty(map)){
+            return null;
+        }
 
         String dataPath = String.format("data/data%s/", num);
         String imagePath = String.format("images/images%s/", num);
@@ -175,20 +178,21 @@ public class BuildScenePreServiceImpl implements IBuildScenePreService {
         String imgViewPath = String.format(UploadFilePath.IMG_VIEW_PATH, num);
         String videosViewPath = String.format(UploadFilePath.VIDEOS_VIEW_PATH, num);
 
+        Map<String, String> newMap = new HashMap<>();
         map.entrySet().parallelStream().forEach(entry -> {
-
             String key = entry.getKey();
             String value = entry.getValue();
             if(value.contains(dataPath)){
-                map.put(key, value.replace(dataPath, dataViewPath));
+                newMap.put(key, value.replace(dataPath, dataViewPath));
             }
             if(value.contains(imagePath)){
-                map.put(key, value.replace(imagePath, imgViewPath));
+                newMap.put(key, value.replace(imagePath, imgViewPath));
             }
             if(value.contains(videoPath)){
-                map.put(key, value.replace(videoPath, videosViewPath));
+                newMap.put(key, value.replace(videoPath, videosViewPath));
             }
         });
+        return newMap;
     }
 
     @Override