1、废除马赛克列表接口

2、发布接口增加发布马赛克数据
3、getinfo接口返回马赛克列表

4dkankan-center-scene/src/main/java/com/fdkankan/scene/bean/SceneJsonBean.java

@@ -161,6 +161,11 @@ public class SceneJsonBean {
     private Integer mosaic;
 
     /**
+     * 马赛克列表
+     */
+    private List<JSONObject> mosaicList;
+
+    /**
      * 水印文件名
      */
     private String waterMark;

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -1028,7 +1028,7 @@ public class SceneEditController extends BaseController {
     @CheckCooperationPermit
     @PostMapping(value = "/mosaics/list")
     public ResultData getMosaicList(@RequestBody @Validated BaseSceneParamVO param) throws Exception{
-        return sceneEditInfoService.getMosaicList(param);
+        return ResultData.ok(sceneEditInfoService.getMosaicList(param.getNum()));
     }
 
     /**

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

@@ -1,11 +1,13 @@
 package com.fdkankan.scene.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.api.dto.SceneInfoDTO;
 import com.fdkankan.scene.entity.SceneEditInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.scene.vo.*;
 import java.io.IOException;
+import java.util.List;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
@@ -82,7 +84,7 @@ public interface ISceneEditInfoService extends IService<SceneEditInfo> {
 
     ResultData deleteMosaics(DeleteMosaicParamVO param) throws Exception;
 
-    ResultData getMosaicList(BaseSceneParamVO param) throws Exception;
+    List<JSONObject> getMosaicList(String num) throws Exception;
 
     ResultData addWaterMark(BaseFileParamVO param) throws Exception;
 

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

@@ -253,6 +253,9 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             sceneJson.setVideos(scenePlusExt.getVideos());
         }
 
+        //发布马赛克列表
+        sceneJson.setMosaicList(this.getMosaicList(num));
+
         //处理热点数据，生成hot.json
         this.publicHotData(num, sceneEditInfo);
 
@@ -462,6 +465,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         sceneInfoVO.setSceneResolution(scenePlusExt.getSceneResolution());
         sceneInfoVO.setSceneFrom(scenePlusExt.getSceneFrom());
         sceneInfoVO.setVideos(scenePlusExt.getVideos());
+        sceneInfoVO.setMosaicList(this.getMosaicList(num));
 
         // TODO: 2022/4/24 v3版本停机要切换---------------------------start
 //        this.setExtData(sceneInfoVO, scenePlus.getCameraId());
@@ -2408,20 +2412,19 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     }
 
     @Override
-    public ResultData getMosaicList(BaseSceneParamVO param) throws Exception {
+    public List<JSONObject> getMosaicList(String num) throws Exception {
 
         //如果redis数据丢失，从本地文件中同步马赛克数据到redis
-        this.syncMosaicFromFileToRedis(param.getNum());
+        this.syncMosaicFromFileToRedis(num);
 
-        String key = String.format(RedisKey.SCENE_MOSAIC_DATA, param.getNum());
+        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 ResultData.ok(
-            map.values().stream()
+        return map.values().stream()
                 .map(mosaic-> JSON.parseObject(mosaic))
-                .collect(Collectors.toList()));
+                .collect(Collectors.toList());
 
     }
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

@@ -1,6 +1,8 @@
 package com.fdkankan.scene.vo;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -173,6 +175,11 @@ public class SceneInfoVO {
     private Integer mosaic;
 
     /**
+     * 马赛克列表
+     */
+    private List<JSONObject> mosaicList;
+
+    /**
      * 水印文件名
      */
     private String waterMark;