上传后保存接口

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneMQListener.java

@@ -213,6 +213,8 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
         String dataPath = String.format(UploadFilePath.DATA_VIEW_PATH, projectNum);     //新版本文件路径
         String videosPath = String.format(UploadFilePath.VIDEOS_VIEW_PATH, projectNum);     //新版本文件路径
 
+        String oldDataPath = "data/data" + projectNum;//老版本文件路径
+
         try{
             if(StringUtils.equals(message.getIsStandardization(),"1")){
                 //表示标定算法
@@ -326,8 +328,7 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
                             }else {
                                 FileUtils.deleteFile(deleteFile.getAbsolutePath());
                             }
-                        }
-                        else if(!deleteFile.getAbsolutePath().contains("images")){
+                        }else if(!deleteFile.getAbsolutePath().contains("images")){
                             if(deleteFile.isDirectory()){
                                 FileUtils.delAllFile(deleteFile.getAbsolutePath());
                             }else {
@@ -353,23 +354,28 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
                 map = ComputerUtil.computer(projectNum, path, buildType);
 
                 if(Integer.parseInt(cameraType) == 5 || Integer.parseInt(cameraType) == 6){
+                    //todo 老版本old_path 待删除
                     map.put(path + File.separator + "capture/stitch_params.txt",
-                            "data/data" + projectNum + "/stitch_params.txt");
-                    //todo 待删除old_path
+                            oldDataPath + "/stitch_params.txt");
+                    //新版本文件路径
                     map.put(path + File.separator + "capture/stitch_params.txt",
                             dataPath+ "stitch_params.txt");
                 }
-                map.put(path + File.separator + "capture/Up.xml", "data/data" + projectNum + "/Up.xml");
-                map.put(path + File.separator + "capture/Up2.xml", "data/data" + projectNum + "/Up2.xml");
-                //todo 待删除old_path
+
+                //todo 老版本old_path 待删除
+                map.put(path + File.separator + "capture/Up.xml", oldDataPath + "/Up.xml");
+                map.put(path + File.separator + "capture/Up2.xml", oldDataPath + "/Up2.xml");
+                //新版本文件路径
                 map.put(path + File.separator + "capture/Up.xml", dataPath  + "Up.xml");
                 map.put(path + File.separator + "capture/Up2.xml", dataPath + "Up2.xml");
 
+                //转台相机
                 if(Integer.parseInt(cameraType) == 13){
-                    //转台相机
-                    map.put(path + File.separator + "capture/Up.txt", "data/data" + projectNum + "/Up.txt");
-                    map.put(path + File.separator + "capture/Up2.txt", "data/data" + projectNum + "/Up2.txt");
-                    //todo 待删除old_path
+
+                    //todo 老版本old_path 待删除
+                    map.put(path + File.separator + "capture/Up.txt", oldDataPath + "/Up.txt");
+                    map.put(path + File.separator + "capture/Up2.txt", oldDataPath + "/Up2.txt");
+
                     map.put(path + File.separator + "capture/Up.txt", dataPath+ "Up.txt");
                     map.put(path + File.separator + "capture/Up2.txt",dataPath + "Up2.txt");
                 }

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

@@ -601,7 +601,7 @@ public class SceneEditController extends BaseController {
      * @return com.fdkankan.common.response.ResultData
      **/
     @PostMapping(value = "/saveUpload")
-    public ResultData saveUpload(@RequestBody SaveUploadParamVO param) throws Exception{
+    public ResultData saveUpload(@RequestBody @Validated SaveUploadParamVO param) throws Exception{
         return sceneEditInfoService.saveUpload(param);
     }
 

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

@@ -80,16 +80,17 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             this.updateById(sceneEditInfo);
         }
 
-        SceneEditControls sceneEditControls = BeanUtil.copyProperties(param.getControls(), SceneEditControls.class);
-        sceneEditControls.setEditInfoId(sceneEditInfo.getId());
-        if(Objects.isNull(sceneEditControlsDb)){
-            sceneEditControlsService.save(sceneEditControls);
-        }else{
-            sceneEditControls.setId(sceneEditControlsDb.getId());
-            sceneEditControlsService.updateById(sceneEditControls);
+        if(Objects.nonNull(param.getControls())){
+            SceneEditControls sceneEditControls = BeanUtil.copyProperties(param.getControls(), SceneEditControls.class);
+            sceneEditControls.setEditInfoId(sceneEditInfo.getId());
+            if(Objects.isNull(sceneEditControlsDb)){
+                sceneEditControlsService.save(sceneEditControls);
+            }else{
+                sceneEditControls.setId(sceneEditControlsDb.getId());
+                sceneEditControlsService.updateById(sceneEditControls);
+            }
         }
 
-
         SceneEditInfoVO result = BeanUtil.copyProperties(param, SceneEditInfoVO.class);
         result.setCreateTime(sceneEditInfo.getCreateTime());
 

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

@@ -31,6 +31,7 @@ public class SaveUploadParamVO {
 
 //    private List<String> filePathList;
 
+    @NotBlank(message = "文件信息不能为空")
     private String fileInfo;
 
 }