scene上传工程完善-import

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

@@ -1,17 +1,11 @@
 package com.css.simulation.resource.scene;
 
 import api.common.pojo.constants.DictConstants;
-import api.common.pojo.param.scene.SceneImportParam;
 import api.common.pojo.po.system.SceneImportPO;
-import com.css.simulation.resource.scene.common.utils.AuthUtil;
 import com.css.simulation.resource.scene.common.utils.PoUtil;
-import com.css.simulation.resource.scene.feign.SceneService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-
 @Service
 public class SceneImportService {
 

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/SceneService.java

@@ -5,7 +5,6 @@ import api.common.pojo.po.system.SceneImportPO;
 import com.css.simulation.resource.common.config.FeignConfiguration;
 import com.css.simulation.resource.feign.fallback.SceneServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.PostMapping;
 
 @FeignClient(value = "simulation-resource-scene",

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/SceneAccidentController.java

@@ -3,9 +3,11 @@ package com.css.simulation.resource.scene.ctrl;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.MinioParameter;
 import api.common.pojo.param.scene.SceneAccidentParam;
+import api.common.pojo.param.scene.SceneImportParam;
 import api.common.pojo.po.scene.SceneAccidentPO;
 import api.common.pojo.vo.scene.SceneAccidentVO;
 import api.common.util.ObjectUtil;
+import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.scene.service.SceneAccidentService;
 import com.github.pagehelper.PageInfo;
@@ -63,11 +65,13 @@ public class SceneAccidentController {
     }
 
     //测试批量导入
-    @PostMapping("/saveAll")
+    @PostMapping("/saveSceneAccidentBatch")
     @ResponseBody
-    public ResponseBodyVO<String> saveAll(@RequestBody MinioParameter parms) {
-
-      return  sceneAccidentService.importMiNio(parms);
+    public ResponseBodyVO<String> saveAll(@RequestBody SceneImportParam sceneImportParam) {
+        System.out.println("saveSceneAccidentBatch" + AuthUtil.getCurrentUsername());
+        System.out.println(sceneImportParam.getMinioDirectory());
+        return null;
+      //return  sceneAccidentService.importMiNio(parms);
         //return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/SceneImportService.java

@@ -1,22 +1,14 @@
 package com.css.simulation.resource.system.service;
 
-import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.ObjectUtil;
-import api.common.util.SshUtil;
 import api.common.util.StringUtil;
 import com.css.simulation.resource.common.utils.PoUtil;
-import com.css.simulation.resource.feign.SceneService;
 import com.css.simulation.resource.system.mapper.SceneImportMapper;
-import org.apache.sshd.client.SshClient;
-import org.apache.sshd.client.session.ClientSession;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.io.IOException;
 import java.util.List;
 
 @Service