v.4.14.0

src/main/java/com/fdkankan/scene/service/ICommonService.java

@@ -1,9 +1,17 @@
 package com.fdkankan.scene.service;
 
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.scene.bean.SceneJsonBean;
+
+import java.util.Map;
+
 public interface ICommonService {
 
     void transferToFlv(String num, String fileName, String bucket) throws Exception;
 
+    void updateViewGetInfo(String num, Map<String, Object> param);
+
+    JSONObject getInfoJson(String num);
 
 
 }

src/main/java/com/fdkankan/scene/service/impl/CommonServiceImpl.java

@@ -1,21 +1,29 @@
 package com.fdkankan.scene.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.model.utils.CreateObjUtil;
+import com.fdkankan.redis.constant.RedisKey;
+import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.scene.bean.SceneJsonBean;
 import com.fdkankan.scene.service.ICommonService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.util.Map;
 
 @Service
 public class CommonServiceImpl implements ICommonService {
 
     @Resource
     private FYunFileServiceInterface fYunFileService;
+    @Resource
+    private RedisUtil redisUtil;
 
     @Override
     public void transferToFlv(String num, String fileName, String bucket) throws Exception {
@@ -44,4 +52,22 @@ public class CommonServiceImpl implements ICommonService {
         String flvFileName = fileName.replace("mp4", "flv");
         fYunFileService.uploadFile(bucket, localFilePath.replace("mp4", "flv"), userEditPath+flvFileName);
     }
+
+    @Override
+    public void updateViewGetInfo(String num, Map<String, Object> param) {
+        JSONObject infoJson = this.getInfoJson(num);
+        param.keySet().stream().forEach(k->{
+            infoJson.replace(k, param.get(k));
+        });
+
+        String redisKey = String.format(RedisKey.SCENE_JSON, num);
+        redisUtil.del(redisKey);
+    }
+
+    @Override
+    public JSONObject getInfoJson(String num) {
+        String sceneJsonKey = String.format(UploadFilePath.DATA_VIEW_PATH, num) + "scene.json";
+        String fileContent = fYunFileService.getFileContent(sceneJsonKey);
+        return JSON.parseObject(fileContent);
+    }
 }

src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -20,6 +20,7 @@ import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.bean.BodySegmentStatusBean;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.ScenePlusExt;
+import com.fdkankan.scene.service.ICommonService;
 import com.fdkankan.scene.service.IScenePlusExtService;
 import com.fdkankan.scene.service.IScenePlusService;
 import com.fdkankan.scene.service.ISceneService;
@@ -32,6 +33,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import sun.rmi.runtime.Log;
 
+import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
@@ -60,7 +62,7 @@ public class SceneServiceImpl implements ISceneService {
     private RedisUtil redisUtil;
     @Autowired
     private RabbitMqProducer rabbitMqProducer;
-    @Autowired
+    @Resource
     private FYunFileServiceInterface fYunFileService;
     @Autowired
     public FYunFileConfig fYunFileConfig;
@@ -68,6 +70,8 @@ public class SceneServiceImpl implements ISceneService {
     public IScenePlusService scenePlusService;
     @Autowired
     public IScenePlusExtService scenePlusExtService;
+    @Autowired
+    private ICommonService commonService;
 
     @Override
     public ResultData uploadBodySegment(MultipartFile file, Integer rotate) throws Exception {
@@ -181,6 +185,11 @@ public class SceneServiceImpl implements ISceneService {
             scenePlusExt.setOrientation(orientation);
             scenePlusExtService.updateById(scenePlusExt);
         }
+
+        //查看页生效
+        Map<String, Object> param = new HashMap<>();
+        param.put("orientation", orientation);
+        commonService.updateViewGetInfo(num,param);
     }
 
     @Override