Merge branch 'feature-v4.2.0-20220803' into release

src/main/java/com/fdkankan/repair/bean/SceneJsonBean.java

@@ -3,6 +3,7 @@ package com.fdkankan.repair.bean;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.util.Date;
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -181,6 +182,11 @@ public class SceneJsonBean {
      */
     private Float floorPlanCompass;
 
+    /**
+     * 马赛克列表
+     */
+    private List<JSONObject> mosaicList;
+
 
 
 

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

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.UploadFilePath;
+import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.FileUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.MatrixToImageWriterUtil;
@@ -441,6 +442,16 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                 });
             }
 
+            //上传vision.txt、vision2.txt
+            String visionTxtPath = scenePlusExt.getDataSource() + "/results/vision.txt";
+            String vision2TxtPath = scenePlusExt.getDataSource() + "/results/vision2.txt";
+            if(cn.hutool.core.io.FileUtil.exist(visionTxtPath)){
+                uploadToOssUtil.upload(visionTxtPath, imageViewPath + "vision.txt");
+            }
+            if(cn.hutool.core.io.FileUtil.exist(vision2TxtPath)){
+                uploadToOssUtil.upload(visionTxtPath, imageViewPath + "vision2.txt");
+            }
+
             //生成scene.json
 //        生成新的scene.json,上传至scene_view_data/<num>/data
             SceneJsonBean sceneJson = new SceneJsonBean();
@@ -457,6 +468,8 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                 sceneJson.setVideos(JSON.parseObject(scenePro.getVideos()));
             }
             sceneJson.setVersion(sceneEditInfo.getVersion());
+            //发布马赛克列表
+            sceneJson.setMosaicList(this.getMosaicList(num));
             //上传sceneJson文件
             String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH+"scene.json", num);
             uploadToOssUtil.upload(JSON.toJSONBytes(sceneJson), sceneJsonPath);
@@ -498,6 +511,18 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
         }
     }
 
+    public List<JSONObject> getMosaicList(String num) throws Exception {
+
+        String key = String.format(RedisKey.SCENE_MOSAIC_DATA, num);
+        Map<String, String> map = redisUtil.hmget(key);
+        if(CollUtil.isEmpty(map)){
+            ResultData.ok(new String[0]);
+        }
+        return map.values().stream()
+            .map(mosaic-> JSON.parseObject(mosaic))
+            .collect(Collectors.toList());
+    }
+
     private void copyFileOss(String num, AtomicInteger completeCnt, AtomicInteger count, List<String> keyList, String sourcePath, String targetPah){
         if(CollUtil.isEmpty(keyList))
             return;