删除无用代码

gis_scene/src/main/java/com/gis/scene/controller/SceneController.java

@@ -1,9 +1,7 @@
 package com.gis.scene.controller;
 
-import cn.hutool.core.io.FileUtil;
 import com.gis.common.base.aop.WebControllerLog;
 import com.gis.common.base.entity.dto.PageDto;
-import com.gis.common.constant.ConfigConstant;
 import com.gis.common.util.Result;
 import com.gis.scene.entity.dto.RoamViableDto;
 import com.gis.scene.entity.dto.SceneDataDto;
@@ -17,8 +15,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
-import java.util.Arrays;
-import java.util.List;
 
 
 /**
@@ -31,10 +27,8 @@ import java.util.List;
 public class SceneController  {
 
     @Autowired
-    private SceneService sceneService;
+    SceneService sceneService;
 
-    @Autowired
-    ConfigConstant configConstant;
 
 
     @ApiOperation("场景列表")
@@ -64,20 +58,11 @@ public class SceneController  {
     @ApiOperation("场景删除")
     @GetMapping("removes/{ids}")
     public Result removes(@PathVariable String ids) {
-//        List<SceneEntity> entities = sceneService.findByIds(ids);
-        String[] split = ids.split(",");
-        List<SceneEntity> entities = sceneService.listByIds(Arrays.asList(split));
-        String basePath = configConstant.serverBasePath;
-
-        for (SceneEntity entity: entities) {
-            FileUtil.del(basePath + entity.getPath());
-            sceneService.removeById(entity);
-        }
-
-        return Result.success();
+        return sceneService.del(ids);
     }
 
 
+
     @ApiOperation("场景详情")
     @GetMapping("detail/{id}")
     public Result detail(@PathVariable Long id) {

gis_scene/src/main/java/com/gis/scene/service/SceneService.java

@@ -32,4 +32,6 @@ public interface SceneService extends IService<SceneEntity> {
     Result addVisit(Long id);
 
     Result upload(MultipartFile file, String sceneCode);
+
+    Result del(String ids);
 }

gis_scene/src/main/java/com/gis/scene/service/impl/SceneServiceImpl.java

@@ -27,6 +27,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -407,6 +409,24 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper,SceneEntity> imple
         return Result.success(uploadMap.get("filePath"));
     }
 
+    @Override
+    public Result del(String ids) {
+        String[] split = ids.split(",");
+        List<SceneEntity> entities = this.listByIds(Arrays.asList(split));
+
+        for (SceneEntity entity: entities) {
+            // 删除服务器器文件
+            String sceneCode = entity.getSceneCode();
+            if (StrUtil.isNotBlank(sceneCode)){
+                fileUtils.del("/data/" + entity.getSceneCode());
+            }
+
+            this.removeById(entity);
+        }
+
+        return null;
+    }
+
 
     /**
      * 2021.04.02 处理infoAttribute的m_title