浏览代码

model \ raster 删除文件成功

wuweihao 5 年之前
父节点
当前提交
af1b6294f8

+ 2 - 1
src/main/java/com/fd/server/IBaseServer.java

@@ -7,5 +7,6 @@ import java.io.Serializable;
  */
 public interface IBaseServer<T, ID extends Serializable> {
 
-//    public abstract
+    public abstract T find(ID id);
+
 }

+ 4 - 2
src/main/java/com/fd/server/impl/ModelServerImpl.java

@@ -9,6 +9,7 @@ import com.fd.dto.PageDto;
 import com.fd.entity.FileEntity;
 import com.fd.entity.OutputFileEntity;
 import com.fd.repository.FileRepository;
+import com.fd.repository.IBaseRepository;
 import com.fd.repository.OutputFileRepository;
 import com.fd.server.ModelServer;
 import com.fd.util.FileUtils;
@@ -33,7 +34,7 @@ import java.util.Optional;
  */
 @Log4j2
 @Service
-public class ModelServerImpl implements ModelServer {
+public class ModelServerImpl implements ModelServer  {
 
     @Value("${input.file.path.model}")
     private String INPUT_FILE_PATH;
@@ -72,7 +73,7 @@ public class ModelServerImpl implements ModelServer {
         }
 
         if (fileEntity.getCoordGeneralPath() != null) {
-            FileUtils.delFolder(fileEntity.getCoordStrictPath());
+            FileUtils.delFolder(fileEntity.getCoordGeneralPath());
         }
 
         if (fileEntity.getUnZipPath() != null) {
@@ -258,4 +259,5 @@ public class ModelServerImpl implements ModelServer {
     }
 
 
+
 }

+ 25 - 0
src/main/java/com/fd/server/impl/RasterServerImpl.java

@@ -64,12 +64,36 @@ public class RasterServerImpl implements RasterServer {
     @Override
     public R deleteById(Long fileId) {
         // 删除服务器文件
+        // 删除服务器文件
         Optional<OutputFileEntity> e = outputFileRepository.findById(fileId);
         if (!e.isPresent()) {
             return new R(50002, MsgCode.E50002);
         }
         OutputFileEntity fileEntity = e.get();
         // 文件
+        if (fileEntity.getUploadPath() != null) {
+            FileUtils.delFolder(fileEntity.getUploadPath());
+        }
+
+        if (fileEntity.getCoordGeneralPath() != null) {
+            FileUtils.delFolder(fileEntity.getCoordGeneralPath());
+        }
+
+        if (fileEntity.getUnZipPath() != null) {
+            FileUtils.delFolder(fileEntity.getUnZipPath());
+        }
+
+        if (fileEntity.getGeojsonPath() != null) {
+            FileUtils.delFolder(fileEntity.getGeojsonPath());
+        }
+
+        if (fileEntity.getCoordStrictPath() != null) {
+            FileUtils.delFolder(fileEntity.getCoordStrictPath());
+        }
+
+        if (fileEntity.getSlicePath() != null) {
+            FileUtils.delFolder(fileEntity.getSlicePath());
+        }
 
 
         // 删除数据库记录
@@ -77,6 +101,7 @@ public class RasterServerImpl implements RasterServer {
         fileRepository.deleteById(fileEntity.getUploadId());
 
         return new R(200, MsgCode.SUCCESS);
+
     }