Merge remote-tracking branch 'origin/master'

# Conflicts:
#	4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/controller/pay/OrderWechatPayController.java

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/controller/pay/OrderWechatPayController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.platform.order.controller.pay;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.config.RedisDefaultConfig;
 import com.fdkankan.common.constant.Constant;
 import com.fdkankan.common.constant.ConstantUrl;
 import com.fdkankan.common.constant.OrderConstant;

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

@@ -90,7 +90,7 @@ public class SceneAppEditController {
      * @return
      */
     @PostMapping(value = "/uploadPic")
-    public ResultData uploadPic(@RequestBody FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception {
+    public ResultData uploadPic(FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception {
         return sceneProAppService.uploadPic(param.getSceneNum(), param.getFolderName(), file);
     }
 
@@ -100,7 +100,7 @@ public class SceneAppEditController {
      * @return
      */
     @PostMapping(value = "/uploadScreencapVoice")
-    public ResultData uploadScreencapVoice(@RequestBody FileParamVO param, @RequestParam("file")  MultipartFile file) throws Exception {
+    public ResultData uploadScreencapVoice(FileParamVO param, @RequestParam("file")  MultipartFile file) throws Exception {
         return sceneProAppService.uploadScreencapVoice(param.getSceneNum(), file);
     }
 
@@ -201,7 +201,7 @@ public class SceneAppEditController {
      * @return
      */
     @PostMapping(value = "/uploadFloorplanPng")
-    public ResultData uploadFloorplanPng(@RequestBody FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception {
+    public ResultData uploadFloorplanPng(FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception {
         return sceneProAppService.uploadFloorplanPng(param.getSceneNum(), file, param.getCadInfo());
     }
 
@@ -209,7 +209,7 @@ public class SceneAppEditController {
      * 上传场景背景音乐
      */
     @PostMapping(value = "/uploadBgMusic")
-    public ResultData uploadBgMusic(@RequestBody FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception{
+    public ResultData uploadBgMusic(FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception{
         return sceneProAppService.uploadBgMusic(param.getSceneNum(), param.getFileName(), file);
     }
 

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

@@ -89,7 +89,7 @@ public class SceneEditController extends BaseController {
      * @return com.fdkankan.common.response.ResultData
      **/
     @PostMapping(value = "/uploadScreencapVoiceNew")
-    public ResultData uploadScreencapVoice(@RequestBody @Validated FileParamVO param,
+    public ResultData uploadScreencapVoice(FileParamVO param,
                                            @RequestParam("file") MultipartFile file) throws Exception {
         return sceneProService.uploadScreencapVoiceNew(param, file);
     }
@@ -105,7 +105,7 @@ public class SceneEditController extends BaseController {
      * @return com.fdkankan.common.response.ResultData
      **/
     @PostMapping(value = "/uploadScreencapVoiceNewV3")
-    public ResultData uploadScreencapVoiceV3(@RequestBody @Validated FileParamVO param,
+    public ResultData uploadScreencapVoiceV3(FileParamVO param,
                                          @RequestParam("file")  MultipartFile file) throws Exception {
         return sceneProService.uploadScreencapVoiceNewV3(param, file);
     }
@@ -275,7 +275,7 @@ public class SceneEditController extends BaseController {
      * @return com.fdkankan.common.response.ResultData
      **/
     @PostMapping(value = "/uploadHotMedia")
-    public ResultData uploadHotMedia(@RequestBody FileParamVO param, @RequestParam("file")  MultipartFile file) throws Exception {
+    public ResultData uploadHotMedia(FileParamVO param, @RequestParam("file")  MultipartFile file) throws Exception {
         return sceneProService.uploadHotMedia(param, file);
     }
 
@@ -290,7 +290,7 @@ public class SceneEditController extends BaseController {
      * @return com.fdkankan.common.response.ResultData
      **/
     @PostMapping(value = "/uploadOverlayMedia")
-    public ResultData uploadOverlayMedia(@RequestBody FileParamVO param, @RequestParam("file")  MultipartFile file) throws Exception {
+    public ResultData uploadOverlayMedia(FileParamVO param, @RequestParam("file")  MultipartFile file) throws Exception {
         return sceneProService.uploadOverlayMedia(param, file);
     }
 
@@ -336,7 +336,7 @@ public class SceneEditController extends BaseController {
      * 获取从浏览器的音频
      */
     @PostMapping(value = "/getRecordAudioFromBrowser")
-    public ResultData getRecordAudioFromBrowser(@RequestBody FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception{
+    public ResultData getRecordAudioFromBrowser(FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception{
         return sceneProService.getRecordAudioFromBrowser(param, file);
     }
 
@@ -352,7 +352,7 @@ public class SceneEditController extends BaseController {
      * 安居客
      */
     @PostMapping(value = "/uploadFloorJsonAjk")
-    public ResultData uploadFloorJsonAjk(@RequestBody FileParamVO param, @RequestParam("file") MultipartFile[] file) throws Exception{
+    public ResultData uploadFloorJsonAjk(FileParamVO param, @RequestParam("file") MultipartFile[] file) throws Exception{
 
         return sceneProService.uploadFloorJsonAjk(param, file);
     }
@@ -383,7 +383,7 @@ public class SceneEditController extends BaseController {
      * @return
      */
     @PostMapping(value = "/uploadPic")
-    public ResultData uploadPic(@RequestBody FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception {
+    public ResultData uploadPic(FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception {
         return sceneProService.uploadPic(param, file);
     }
 
@@ -411,7 +411,7 @@ public class SceneEditController extends BaseController {
      * @return
      */
     @PostMapping(value = "/uploadFloorplanPng")
-    public ResultData uploadFloorplanPng(@RequestBody FileParamVO param, @RequestParam("file") MultipartFile[] file) throws Exception {
+    public ResultData uploadFloorplanPng(FileParamVO param, @RequestParam("file") MultipartFile[] file) throws Exception {
         return sceneProService.uploadFloorplanPng(param, file);
     }
 
@@ -440,7 +440,7 @@ public class SceneEditController extends BaseController {
      */
 //    @SystemControllerLog(description = "上传修改后的obj和贴图")
     @PostMapping(value = "/uploadObjAndImg")
-    public ResultData uploadObjAndImg(@RequestBody FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception {
+    public ResultData uploadObjAndImg(FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception {
         return sceneProService.uploadObjAndImg(param, file);
     }
 
@@ -474,7 +474,7 @@ public class SceneEditController extends BaseController {
      * 上传点位全景图或视频
      */
     @PostMapping(value = "/uploadPanoramaOrVideo")
-    public ResultData uploadPanoramaOrVideo(@RequestBody FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception{
+    public ResultData uploadPanoramaOrVideo(FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception{
         return sceneProService.uploadPanoramaOrVideo(param, file);
     }
 
@@ -482,7 +482,7 @@ public class SceneEditController extends BaseController {
      * 上传绿幕抠图视频
      */
     @PostMapping(value = "/uploadROIVideo")
-    public ResultData uploadROIVideo(@RequestBody FileParamVO param, @RequestParam(name = "file", required = false) MultipartFile file) throws Exception{
+    public ResultData uploadROIVideo(FileParamVO param, @RequestParam(name = "file", required = false) MultipartFile file) throws Exception{
         return sceneProService.uploadROIVideo(param, file);
     }
 
@@ -499,7 +499,7 @@ public class SceneEditController extends BaseController {
      * 上传场景背景音乐
      */
     @PostMapping(value = "/uploadBgMusic")
-    public ResultData uploadBgMusic(@RequestBody FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception{
+    public ResultData uploadBgMusic(FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception{
         return sceneProService.uploadBgMusic(param, file);
     }
 
@@ -516,7 +516,7 @@ public class SceneEditController extends BaseController {
      * 保存关联全景图
      */
     @PostMapping(value = "/savePanorama")
-    public ResultData savePanorama(@RequestBody FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception{
+    public ResultData savePanorama(FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception{
         return sceneProService.savePanorama(param, file);
     }
 

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

@@ -2139,29 +2139,30 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = findBySceneNum(sceneNum);
+        ScenePro scenePro = this.findBySceneNum(sceneNum);
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
 
         String fileName = "hot" + sid + ".mp4";
-        if (!file.isEmpty()){
+        if (file.isEmpty())
+            return ResultData.ok(fileName);
 
-            String path = ConstantFilePath.SCENE_PATH + "images" + File.separator + "images" + sceneNum;
-            File targetFile = new File(path);
-            if (!targetFile.exists()){
-                targetFile.mkdirs();
-            }
+        String path = String.format(ConstantFilePath.IMAGESBUFFER_FORMAT, sceneNum);
+        File targetFile = new File(path);
+        if (!targetFile.exists()){
+            targetFile.mkdirs();
+        }
 
-            targetFile = new File(path + File.separator + fileName);
-            if (targetFile.exists()){
-                FileUtils.deleteFile(path + File.separator + fileName);
-            }
-            file.transferTo(targetFile);
+        targetFile = new File(path + File.separator + fileName);
+        if (targetFile.exists()){
+            FileUtils.deleteFile(path + File.separator + fileName);
+        }
+        file.transferTo(targetFile);
 
-            if(targetFile.exists()){
-                FileUtils.executeCodecs(path + File.separator + fileName, path, "hot" + sid + "-cut");
-            }
+        if(targetFile.exists()){
+            //获取指定视频的帧并保存为图片至指定目录
+            FileUtils.executeCodecs(path + File.separator + fileName, path, "hot" + sid + "-cut");
         }
 
         return ResultData.ok(fileName);
@@ -2844,10 +2845,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
             SceneProEdit sceneProEdit = sceneProEditService.findByProId(scenePro.getId());
 
-            Map<String, Object> map = new HashMap<>();
-            map.put("shareLogo", imagesBuf.toString() + fileName);
-            map.put("version", sceneProEdit.getVersion()+1);
-            FileUtils.writeJsonFile(dataBuffer.toString() + "scene.json", map);
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("shareLogo", imagesBuf.toString() + fileName);
+//            map.put("version", sceneProEdit.getVersion()+1);
+//            FileUtils.writeJsonFile(dataBuffer.toString() + "scene.json", map);
 
             sceneProEdit.setShareLogo(imagesBuf.toString() + fileName);
             sceneProEdit.setVersion(sceneProEdit.getVersion()+1);

pom.xml

@@ -165,6 +165,12 @@
                 <artifactId>log4j-to-slf4j</artifactId>
                 <version>2.17.0</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.fdkankan</groupId>
+                <artifactId>4dkankan-utils-redis</artifactId>
+                <version>2.0.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>