场景上传路径校验提示

simulation-resource-scene/src/main/java/com/css/simulation/resource/scene/SceneImportCtrl.java

@@ -32,14 +32,22 @@ public class SceneImportCtrl {
     @ResponseBody
     public ResponseBodyVO startImport(@RequestBody SceneImportPO po, HttpServletRequest request) {
         try {
+            //路径校验
+            Boolean directory = sceneImportService.checkDirectory(po);
+            if(!directory){
+                po.setErrorMessage("路径错误: " + po.getDataDirectory());
+                po.setStatus(DictConstants.SCENE_IMPORT_STATUS_0);
+                sceneImportService.updateStatus(po);
+                return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE);
+            }
             //开始上传
             po.setStatus(DictConstants.SCENE_IMPORT_STATUS_1);
             sceneImportService.updateStatus(po);
             //上传
-            Boolean b = sceneImportService.startImport(po);
-            if(!b){
+            Boolean sceneType = sceneImportService.startImport(po);
+            if(!sceneType){
+                po.setErrorMessage("场景类型错误！");
                 po.setStatus(DictConstants.SCENE_IMPORT_STATUS_0);
-                po.setErrorMessage("路径错误");
                 sceneImportService.updateStatus(po);
                 return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE);
             }

simulation-resource-scene/src/main/java/com/css/simulation/resource/scene/SceneImportService.java

@@ -36,10 +36,6 @@ public class SceneImportService {
     MinioClient minioClient;
 
     public Boolean startImport(SceneImportPO po) throws Exception {
-        //目录校验
-        if(!checkDirectory(po)){
-            return false;
-        }
         //minio路径生成
         String sceneType = po.getSceneType();
         Integer nowTime = TimeUtil.getRq(new Date(), 0);
@@ -51,6 +47,8 @@ public class SceneImportService {
             sceneName = "标准法规场景";
         } else if (DictConstants.SCENE_ACCIDENT.equals(sceneType)) {
             sceneName = "交通事故场景";
+        }else{
+            return false;
         }
         String objectPath = sceneName + "/" + nowTime + "/" + randomCode + "/";
         //数据上传
@@ -69,7 +67,7 @@ public class SceneImportService {
         return true;
     }
 
-    private Boolean checkDirectory(SceneImportPO po) {
+    public Boolean checkDirectory(SceneImportPO po) {
         try {
             String dataDirectory = po.getDataDirectory() + File.separator + subDirectory;
             List<String> ls = FileUtil.ls(dataDirectory);