浏览代码

不能删除

zhujinghui 4 年之前
父节点
当前提交
4a54b5acea

+ 16 - 18
4dkankan-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -3854,7 +3854,7 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
             scenejson = JSONObject.parseObject(strsceneInfos);
         }
         log.info("转换前-scene.json文件转换json-{}", scenejson);
-        putVideoDataToAllSceneJson(operaVideoDTO, scenejson);
+        String videos = putVideoDataToAllSceneJson(operaVideoDTO, scenejson);
         log.info("转换后-scene.json文件转换json-{}", scenejson);
         FileUtils.writeFile(dataBuffer + "scene.json", scenejson.toString());
 
@@ -3862,7 +3862,7 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
         uploadMap.put(dataBuffer + "scene.json", dataBuf + "scene.json");
         uploadToOssUtil.uploadMulFiles(uploadMap);
 
-        sceneProEntity.setVideos(scenejson.get("videos").toString());
+        sceneProEntity.setVideos(videos);
         update(sceneProEntity);
     }
 
@@ -3882,7 +3882,7 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
         }
 
         log.info("转换前-scene.json文件转换json-{}", scenejson);
-        putVideoDataToSceneJson(operaVideoDTO, scenejson);
+        String videos = putVideoDataToSceneJson(operaVideoDTO, scenejson);
         log.info("转换后-scene.json文件转换json-{}", scenejson);
         FileUtils.writeFile(dataBuffer + "scene.json", scenejson.toString());
 
@@ -3890,45 +3890,43 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
         uploadMap.put(dataBuffer + "scene.json", dataBuf + "scene.json");
         uploadToOssUtil.uploadMulFiles(uploadMap);
 
-        sceneProEntity.setVideos(scenejson.get("videos").toString());
+        sceneProEntity.setVideos(videos);
         update(sceneProEntity);
     }
 
-    private void putVideoDataToAllSceneJson(OperaVideoParam operaVideoDTO, JSONObject scenejson) {
+    private String putVideoDataToAllSceneJson(OperaVideoParam operaVideoDTO, JSONObject scenejson) {
         Object videos = scenejson.get("videos");
-        Object data;
         if (videos == null) {
             throw new BaseRuntimeException("json数据异常");
         }
-        JSONObject vo = (JSONObject) videos;
-        data = vo.get("data");
-        if (data == null || data instanceof JSONArray == false) {
-            throw new BaseRuntimeException("json-data数据异常");
-        }
-        JSONArray jsonArray = (JSONArray) data;
-        for (Object o : jsonArray) {
-            ((JSONObject)o).put("show", operaVideoDTO.getShow());
-        }
+        JSONObject vo = JSONObject.parseObject(videos.toString());
+        vo.put("show", operaVideoDTO.getShow());
+        scenejson.put("videos", vo.toString());
+        return vo.toString();
     }
 
 
     // todo
-    private void putVideoDataToSceneJson(OperaVideoParam operaVideoDTO, JSONObject scenejson) {
+    private String putVideoDataToSceneJson(OperaVideoParam operaVideoDTO, JSONObject scenejson) {
         Object videos = scenejson.get("videos");
         Object data;
         if (videos == null) {
             throw new BaseRuntimeException("json数据异常");
         }
-        JSONObject vo = (JSONObject) videos;
+        JSONObject vo = JSONObject.parseObject(videos.toString());
         data = vo.get("data");
         if (data == null || data instanceof JSONArray == false) {
             throw new BaseRuntimeException("json-data数据异常");
         }
         JSONArray jsonArray = (JSONArray) data;
-        Object jsonObj = jsonArray.stream().filter(j -> operaVideoDTO.getId().equals(((JSONObject)j).get("id")))
+        Object jsonObj = jsonArray.stream().filter(j -> operaVideoDTO.getId().equals(((JSONObject)j).get("id").toString()))
                 .findAny().orElseThrow(() -> new BaseRuntimeException("json数据data里找不到对应记录"));
 
         ((JSONObject)jsonObj).put("show", operaVideoDTO.getShow());
+        vo.put("data", data);
+        scenejson.put("videos", vo.toString());
+
+        return vo.toString();
     }
 
 }

+ 12 - 6
4dkankan-web/src/main/java/com/fdkankan/web/controller/SceneController.java

@@ -12,23 +12,29 @@ import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.exception.BaseRuntimeException;
 import com.fdkankan.common.model.Result;
 import com.fdkankan.common.model.ViewResult;
-import com.fdkankan.common.util.*;
+import com.fdkankan.common.util.FileUtils;
+import com.fdkankan.common.util.MatrixToImageWriterUtil;
+import com.fdkankan.common.util.UploadToOssUtil;
 import com.fdkankan.common.vo.request.RequestRebuildVedioScene;
 import com.fdkankan.common.vo.request.RequestScene;
 import com.fdkankan.common.vo.response.ResponseScene;
 import com.fdkankan.common.vo.response.ResponseVideoSceneProgress;
 import com.fdkankan.scene.entity.CameraEntity;
-import com.fdkankan.scene.entity.*;
+import com.fdkankan.scene.entity.SceneProEditEntity;
+import com.fdkankan.scene.entity.SceneProEntity;
+import com.fdkankan.scene.entity.VideoSceneProgressEntity;
 import com.fdkankan.scene.feign.PanoFeign;
-import com.fdkankan.scene.service.*;
-import com.fdkankan.scene.util.CreateObjUtil;
+import com.fdkankan.scene.service.ICameraService;
+import com.fdkankan.scene.service.IRebuildVideoProgressService;
+import com.fdkankan.scene.service.ISceneProEditService;
+import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.util.ComputerUtil;
-import com.fdkankan.web.aop.CheckScene;
+import com.fdkankan.scene.util.CreateObjUtil;
 import com.fdkankan.web.aop.WebControllerLog;
 import com.github.pagehelper.util.StringUtil;
 import io.swagger.annotations.*;
-import javafx.scene.Scene;
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.springframework.beans.BeanUtils;

文件差异内容过多而无法显示
+ 23 - 4
4dkankan-web/src/main/java/com/fdkankan/web/controller/TestController.java


+ 1 - 3
4dkankan-web/src/main/java/com/fdkankan/web/controller/VrController.java

@@ -3,16 +3,14 @@ package com.fdkankan.web.controller;
 import com.fdkankan.common.api.BaseController;
 import com.fdkankan.common.model.ViewResult;
 import com.fdkankan.common.util.RandomUtil;
-import com.fdkankan.scene.util.CreateObjUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.codec.binary.Base64;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.UUID;
-
 /**
  * @author Admin
  */