代码更新

src/main/java/com/macro/mall/tiny/modules/business/controller/FileController.java

@@ -15,9 +15,7 @@ import com.macro.mall.tiny.security.util.AuthUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.compress.archivers.zip.ParallelScatterZipCreator;
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
+import org.apache.commons.compress.archivers.zip.*;
 import org.apache.commons.compress.parallel.InputStreamSupplier;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -38,7 +36,9 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;

src/main/java/com/macro/mall/tiny/modules/business/model/BLine.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -54,7 +55,7 @@ public class BLine implements Serializable {
 
     @ApiModelProperty(value = "匹配塔形关键字")
     @TableField(exist = false)
-    private String matchShape;
+    private Set<String> matchShapeList;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")

src/main/java/com/macro/mall/tiny/modules/business/service/impl/AsyncHandler.java

@@ -134,6 +134,7 @@ public class AsyncHandler {
                     if (pathStr.length < 2) {
                         continue;
                     }
+                    entryName = lineName + entryName.substring(entryName.indexOf(UploadConfig.SEPARATOR));
                     String SecDirectoryName = pathStr[1].charAt(0) == UploadConfig.AUTH_STR ? pathStr[1].substring(1) : pathStr[1];
                     if (booleanHashMap.get(SecDirectoryName) != null) {
                         booleanHashMap.put(SecDirectoryName, true);
@@ -174,7 +175,7 @@ public class AsyncHandler {
                         Path parent = entryFile.getParent();
                         if (!canCover && Files.exists(entryFile)) {
                             warnMsg.append(entryName).append(entryFile.getFileName().toString()).append("已存在，无权覆盖;");
-                        } else if (Files.isDirectory(parent)) {
+                        } else {
                             Files.createDirectories(parent);
                             try (OutputStream o = Files.newOutputStream(entryFile)) {
                                 IOUtils.copy(ais, o);
@@ -203,9 +204,7 @@ public class AsyncHandler {
             List<BTower> oriTowerList = towerService.list(towerWrapper);
             HashSet<BTower> towerSet = new HashSet<>(oriTowerList);
             towerSet.addAll(towerList);
-            if (towerSet.size() > 0) {
-                towerService.setHasFile(new ArrayList<>(towerSet), userDetails);
-            }
+            towerService.setHasFile(new ArrayList<>(towerSet), userDetails);
 
             // 后续清楚缓存处理
             lineCacheService.delLineList();

src/main/java/com/macro/mall/tiny/modules/business/service/impl/BLineServiceImpl.java

@@ -1,6 +1,7 @@
 package com.macro.mall.tiny.modules.business.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.google.common.collect.Lists;
 import com.macro.mall.tiny.common.exception.Asserts;
 import com.macro.mall.tiny.common.util.MyFileUtils;
 import com.macro.mall.tiny.config.UploadConfig;
@@ -21,7 +22,9 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -64,12 +67,11 @@ public class BLineServiceImpl extends ServiceImpl<BLineMapper, BLine> implements
         if (StringUtils.isNotBlank(key)) {
             lineList.forEach(line -> {
                 if (!line.getProvince().contains(key) && !line.getName().contains(key)) {
-                    for (BTower tower : line.getTowerList()) {
-                        if (tower.getShape().contains(key)) {
-                            line.setMatchShape(tower.getShape());
-                            break;
-                        }
-                    }
+                    String keyLow = key.toLowerCase();
+                    Set<String> matchShapeList = line.getTowerList().stream()
+                            .filter(tower-> tower.getShape().toLowerCase().contains(keyLow))
+                            .map(BTower::getShape).collect(Collectors.toSet());
+                    line.setMatchShapeList(matchShapeList);
                 }
             });
         }

src/main/java/com/macro/mall/tiny/modules/business/service/impl/BTowerServiceImpl.java

@@ -106,6 +106,9 @@ public class BTowerServiceImpl extends ServiceImpl<BTowerMapper, BTower> impleme
 
     @Override
     public void setHasFile(List<BTower> towerList, AdminUserDetails userDetails) {
+        if (towerList == null || towerList.size() == 0) {
+            return;
+        }
         boolean access = AuthUtil.checkAccess(userDetails, AuthUtil.ACCESS);
         BTower firstTower = towerList.get(0);
         BLine line = lineMapper.selectById(firstTower.getLineId());

src/main/java/com/macro/mall/tiny/modules/business/service/impl/FileServiceImpl.java

@@ -21,9 +21,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.List;
 
 import static com.macro.mall.tiny.common.util.UploadUtils.*;
@@ -125,30 +124,53 @@ public class FileServiceImpl implements FileService {
         if (!delete) {
             Asserts.fail("您没有删除权限");
         }
-        if (Files.exists(filePath)) {
-            Files.delete(filePath);
-        } else {
+        if (!Files.exists(filePath)) {
             Asserts.fail("该文件不存在");
         }
         int count = filePath.getNameCount();
-        if (count < 5) {
+        if (count < 4) {
             return true;
         }
-        String lineNameStr = filePath.getName(3).toString();
-        String dirType = filePath.getName(4).toString();
+        if (Files.isDirectory(filePath)) {
+            Files.walkFileTree(filePath, new SimpleFileVisitor<Path>() {
+                @Override
+                public FileVisitResult visitFile(Path file, BasicFileAttributes attributes) throws IOException {
+                    Files.delete(file); // this will work because it's always a File
+                    return FileVisitResult.CONTINUE;
+                }
+
+                @Override
+                public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                    Files.delete(dir); //this will work because Files in the directory are already deleted
+                    return FileVisitResult.CONTINUE;
+                }
+            });
+        } else {
+            Files.delete(filePath);
+        }
 
-        if (!dirType.equals(DirectoryEnum.TOWER_PIC.getName()) && !dirType.equals(DirectoryEnum.EARTH_WIRE_HARD_PIC.getName()) && !dirType.equals(DirectoryEnum.TEAM_CHECK_PIC.getName())) {
-            return true;
+        if (count > 4) {
+            String dirType = filePath.getName(4).toString();
+            if (!dirType.equals(DirectoryEnum.TOWER_PIC.getName()) && !dirType.equals(DirectoryEnum.EARTH_WIRE_HARD_PIC.getName()) && !dirType.equals(DirectoryEnum.TEAM_CHECK_PIC.getName())) {
+                return true;
+            }
         }
 
+        String lineNameStr = filePath.getName(3).toString();
         QueryWrapper<BLine> lineQueryWrapper = new QueryWrapper<>();
         lineQueryWrapper.lambda().eq(BLine::getName, lineNameStr);
         BLine line = lineMapper.selectOne(lineQueryWrapper);
 
         QueryWrapper<BTower> towerQueryWrapper = new QueryWrapper<>();
         towerQueryWrapper.lambda().eq(BTower::getLineId, line.getId());
-        List<BTower> towerList = towerMapper.selectList(towerQueryWrapper);
-        towerService.setHasFile(towerList, userDetails);
+
+        if (count == 4) {
+            lineMapper.deleteById(line.getId());
+            towerMapper.delete(towerQueryWrapper);
+        } else {
+            List<BTower> towerList = towerMapper.selectList(towerQueryWrapper);
+            towerService.setHasFile(towerList, userDetails);
+        }
 
         // 后续清楚缓存处理
         lineCacheService.delLineList();