计算结果处理

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

@@ -141,7 +141,7 @@ public class SceneJsonBean {
     /**
      *点位视频
      */
-    private String videos;
+    private JSONObject videos;
 
     /**
      * 是否有热点数据

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

@@ -155,10 +155,10 @@ public class BuildSceneResultMQListener implements RocketMQListener<String> {
             }
 
             //读取计算结果文件生成videosJson
-            String videosJson = buildScenePreService.getVideosJson(path, videoVersion, sceneCode, cameraType);
+            JSONObject videosJson = buildScenePreService.getVideosJson(path, videoVersion, sceneCode, cameraType);
 
             //写入数据库
-            ScenePro scenePro = this.updateDb(sceneCode, space, payStatus, videosJson, computeTime, fileId);
+            ScenePro scenePro = this.updateDb(sceneCode, space, payStatus, videosJson.toJSONString(), computeTime, fileId);
             SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
             Object[] editInfoArr = this.updateEditInfo(scenePro);
             SceneEditInfo sceneEditInfo = (SceneEditInfo)editInfoArr[0];

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

@@ -40,9 +40,9 @@ public interface IBuildScenePreService {
 
     void uploadLogFile(String num, String dataSource);
 
-    String getVideosJson(String path, Integer videoVersion, String projectNum, int cameraType) throws Exception ;
+    JSONObject getVideosJson(String path, Integer videoVersion, String projectNum, int cameraType) throws Exception ;
 
-    String writeSceneJson(String num, String videoJson, SceneEditInfo sceneEditInfo, SceneEditControls sceneEditControls, ScenePro scenePro, SceneProExt sceneProExt) throws Exception;
+    String writeSceneJson(String num, JSONObject videoJson, SceneEditInfo sceneEditInfo, SceneEditControls sceneEditControls, ScenePro scenePro, SceneProExt sceneProExt) throws Exception;
 
 
 

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

@@ -358,7 +358,7 @@ public class BuildScenePreServiceImpl implements IBuildScenePreService {
     }
 
     @Override
-    public String getVideosJson(String path, Integer videoVersion, String projectNum, int cameraType) throws Exception {
+    public JSONObject getVideosJson(String path, Integer videoVersion, String projectNum, int cameraType) throws Exception {
         //读取videos_hdr_param.json, 保存点位视频的value
         Map<String, Object> videoMap = new HashMap<>();
         String videosHdr = FileUtils.readFile(path + File.separator + "results/videos/videos_hdr_param.json");
@@ -454,11 +454,11 @@ public class BuildScenePreServiceImpl implements IBuildScenePreService {
             }
         }
 
-        return videosJson.toJSONString();
+        return videosJson;
     }
 
     @Override
-    public String writeSceneJson(String num, String videosJson, SceneEditInfo sceneEditInfo,
+    public String writeSceneJson(String num, JSONObject videosJson, SceneEditInfo sceneEditInfo,
         SceneEditControls sceneEditControls, ScenePro scenePro, SceneProExt sceneProExt)  throws Exception{
         String sceneJsonPath = String.format(ConstantFilePath.SCENE_PATH_FORMAT, num);
         String strsceneInfos = FileUtils.readFile(sceneJsonPath);

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

@@ -191,7 +191,9 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         sceneJson.setSceneResolution(sceneProExt.getSceneResolution());
         sceneJson.setSceneFrom(sceneProExt.getSceneFrom());
-        sceneJson.setVideos(scenePro.getVideos());
+        if(StrUtil.isNotEmpty(scenePro.getVideos())){
+            sceneJson.setVideos(JSON.parseObject(scenePro.getVideos()));
+        }
 
         //处理热点数据，生成hot.json
         this.publicHotData(sceneNum, sceneJson, sceneEditInfo);