本地代码修改提交

pom.xml

@@ -151,6 +151,20 @@
             <version>2.2.6</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-compress -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.20</version>
+        </dependency>
+
 
     </dependencies>
 
@@ -160,10 +174,10 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>${docker.maven.plugin.version}</version>
+<!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>docker-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.plugin.version}</version>-->
 <!--                <executions>-->
 <!--                    <execution>-->
 <!--                        <id>build-image</id>-->
@@ -187,7 +201,7 @@
 <!--                        </resource>-->
 <!--                    </resources>-->
 <!--                </configuration>-->
-            </plugin>
+<!--            </plugin>-->
         </plugins>
     </build>
 

src/main/java/com/macro/mall/tiny/common/util/MyFileUtils.java

@@ -12,10 +12,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -119,10 +116,9 @@ public class MyFileUtils {
             return Lists.newArrayList();
         }
         if (oriDic.exists() && oriDic.isDirectory()) {
-            File[] sonFiles = filter == null ? oriDic.listFiles() : oriDic.listFiles(filter);
+            File[] sonFiles = filter == null ? oriDic.listFiles((dir, name) -> auth || !name.startsWith(String.valueOf(UploadConfig.AUTH_STR))) : oriDic.listFiles(filter);
             if (sonFiles == null) return Lists.newArrayList();
             return Arrays.stream(sonFiles)
-                    .filter(son -> auth || !son.getName().startsWith("~"))
                     .map(son -> {
                         final BFile sonFile = new BFile();
                         sonFile.setName(son.getName());
@@ -227,4 +223,42 @@ public class MyFileUtils {
             return size / 100 + "." + size % 100 + "GB";
         }
     }
+
+    public static boolean hasSonFile(String parentDic, boolean access) {
+        return hasSonFile(parentDic, null, access);
+    }
+
+    public static boolean hasSonFile(String parentDic, FilenameFilter filter, boolean access) {
+        File dic = new File(parentDic);
+        if (!dic.exists() || !dic.isDirectory()) {
+            return false;
+        }
+        File[] subFiles = filter == null ? dic.listFiles((dir, name) -> access || !name.startsWith(String.valueOf(UploadConfig.AUTH_STR))) : dic.listFiles(filter);
+        if (subFiles == null) {
+            return false;
+        }
+        for (File subFile : subFiles) {
+            if (subFile.isFile()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static void addAllSubFileList(List<String> fileList, File directory, boolean access) {
+        if (!directory.exists() || !directory.isDirectory()) {
+            return;
+        }
+        File[] subFiles = directory.listFiles((dir, name) -> access || !name.startsWith(String.valueOf(UploadConfig.AUTH_STR)));
+        if (subFiles == null) {
+            return;
+        }
+        Arrays.stream(subFiles).forEach(subFile -> {
+            if (subFile.isDirectory()) {
+                addAllSubFileList(fileList, subFile, access);
+            } else {
+                fileList.add(subFile.getPath());
+            }
+        });
+    }
 }

src/main/java/com/macro/mall/tiny/common/util/ZipUtils.java

@@ -4,18 +4,18 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.charset.Charset;
-import java.nio.file.*;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.LinkedList;
-import java.util.stream.Collectors;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.concurrent.ExecutionException;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
 
 public class ZipUtils {
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) throws IOException, ExecutionException, InterruptedException {
         ZipUtils.unPacket(Paths.get("E:/WorkSpace/doc-manager-master/temp/四川.zip"), Paths.get("E:/WorkSpace/doc-manager-master/power"), "gbk");
     }
 
@@ -65,128 +65,4 @@ public class ZipUtils {
             }
         }
     }
-
-    /**
-     * 压缩指定的文件
-     *
-     * @param files   目标文件
-     * @param zipFile 生成的压缩文件
-     * @throws IOException
-     */
-    public static void packet(Path[] files, Path zipFile) throws IOException {
-        OutputStream outputStream = Files.newOutputStream(zipFile, StandardOpenOption.CREATE_NEW);
-        ZipOutputStream zipOutputStream = new ZipOutputStream(outputStream);
-        try {
-            for (Path file : files) {
-                if (Files.isDirectory(file)) {
-                    continue;
-                }
-                try (InputStream inputStream = Files.newInputStream(file)) {
-                    // 创建一个压缩项，指定名称
-                    ZipEntry zipEntry = new ZipEntry(file.getFileName().toString());
-                    // 添加到压缩流
-                    zipOutputStream.putNextEntry(zipEntry);
-                    // 写入数据
-                    int len = 0;
-                    byte[] buffer = new byte[1024 * 10];
-                    while ((len = inputStream.read(buffer)) > 0) {
-                        zipOutputStream.write(buffer, 0, len);
-                    }
-                    zipOutputStream.flush();
-                }
-            }
-            // 完成所有压缩项的添加
-            zipOutputStream.closeEntry();
-        } finally {
-            zipOutputStream.close();
-            outputStream.close();
-        }
-    }
-
-    /**
-     * 压缩指定的目录
-     *
-     * @param folder
-     * @param zipFile
-     * @throws IOException
-     */
-    public static void packet(Path folder, Path zipFile) throws IOException {
-        if (!Files.isDirectory(folder)) {
-            throw new IllegalArgumentException(folder.toString() + " 不是合法的文件夹");
-        }
-        OutputStream outputStream = Files.newOutputStream(zipFile, StandardOpenOption.CREATE_NEW);
-        ZipOutputStream zipOutputStream = new ZipOutputStream(outputStream);
-
-        LinkedList<String> path = new LinkedList<>();
-
-        try {
-            Files.walkFileTree(folder, new FileVisitor<Path>() {
-
-                @Override
-                public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
-
-                    if (!dir.equals(folder)) {
-                        // 开始遍历目录
-                        String folder = dir.getFileName().toString();
-                        path.addLast(folder);
-                        // 写入目录
-                        ZipEntry zipEntry = new ZipEntry(path.stream().collect(Collectors.joining("/", "", "/")));
-                        try {
-                            zipOutputStream.putNextEntry(zipEntry);
-                            zipOutputStream.flush();
-                        } catch (IOException e) {
-                            throw new RuntimeException(e);
-                        }
-                    }
-                    return FileVisitResult.CONTINUE;
-                }
-
-                @Override
-                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-                    // 开始遍历文件
-                    try (InputStream inputStream = Files.newInputStream(file)) {
-
-                        // 创建一个压缩项，指定名称
-                        String fileName = path.size() > 0
-                                ? path.stream().collect(Collectors.joining("/", "", "")) + "/" + file.getFileName().toString()
-                                : file.getFileName().toString();
-
-                        ZipEntry zipEntry = new ZipEntry(fileName);
-
-                        // 添加到压缩流
-                        zipOutputStream.putNextEntry(zipEntry);
-                        // 写入数据
-                        int len = 0;
-                        byte[] buffer = new byte[1024 * 10];
-                        while ((len = inputStream.read(buffer)) > 0) {
-                            zipOutputStream.write(buffer, 0, len);
-                        }
-
-                        zipOutputStream.flush();
-                    } catch (IOException e) {
-                        throw new RuntimeException(e);
-                    }
-                    return FileVisitResult.CONTINUE;
-                }
-
-                @Override
-                public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
-                    return FileVisitResult.CONTINUE;
-                }
-
-                @Override
-                public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
-                    // 结束遍历目录
-                    if (!path.isEmpty()) {
-                        path.removeLast();
-                    }
-                    return FileVisitResult.CONTINUE;
-                }
-            });
-            zipOutputStream.closeEntry();
-        } finally {
-            zipOutputStream.close();
-            outputStream.close();
-        }
-    }
 }

src/main/java/com/macro/mall/tiny/config/RestTemplateConfig.java

@@ -0,0 +1,23 @@
+package com.macro.mall.tiny.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.web.client.RestTemplate;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * RestTemplate配置类
+ */
+@Configuration
+public class RestTemplateConfig {
+
+    @Bean
+    public RestTemplate restTemplate() {
+        RestTemplate restTemplate = new RestTemplate(new HttpComponentsClientHttpRequestFactory()); // 使用HttpClient，支持GZIP
+        restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8)); // 支持中文编码
+        return restTemplate;
+    }
+}

src/main/java/com/macro/mall/tiny/domain/AdminUserDetails.java

@@ -30,6 +30,13 @@ public class AdminUserDetails implements UserDetails {
                 .collect(Collectors.toList());
     }
 
+    public List<String> getResourceUrlList() {
+        // 返回当前用户拥有的资源URL
+        return resourceList.stream()
+                .map(UmsResource::getUrl)
+                .collect(Collectors.toList());
+    }
+
     @Override
     public String getPassword() {
         return umsAdmin.getPassword();

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

@@ -0,0 +1,38 @@
+package com.macro.mall.tiny.modules.business.controller;
+
+import com.macro.mall.tiny.common.api.CommonResult;
+import com.macro.mall.tiny.modules.business.dto.WeatherParam;
+import com.macro.mall.tiny.modules.business.model.Weather;
+import com.macro.mall.tiny.modules.business.service.CommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author gjs
+ * @description
+ * @date 2021/4/11 20:10
+ */
+@RestController
+@Api(tags = "CommonController", description = "提供公共类相关API")
+@RequestMapping("/common")
+public class CommonController {
+
+    @Autowired
+    private CommonService commonService;
+
+    @ApiOperation("根据经纬度获取实时天气")
+    @RequestMapping(value = "/waether", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<Weather> getWeather(@Validated WeatherParam weatherParam) {
+        String lat = weatherParam.getLat();
+        String lon = weatherParam.getLon();
+        return CommonResult.success(commonService.getWeather(lat, lon));
+    }
+
+}

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

@@ -1,6 +1,8 @@
 package com.macro.mall.tiny.modules.business.controller;
 
+import com.google.common.collect.Lists;
 import com.macro.mall.tiny.common.api.CommonResult;
+import com.macro.mall.tiny.common.util.MyFileUtils;
 import com.macro.mall.tiny.config.UploadConfig;
 import com.macro.mall.tiny.domain.AdminUserDetails;
 import com.macro.mall.tiny.modules.business.dto.FileDownloadParam;
@@ -13,6 +15,10 @@ 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.parallel.InputStreamSupplier;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +37,10 @@ import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -98,12 +107,12 @@ public class FileController {
     }
 
     /**
-     *@describe 获取全部文件夹
-     *@param
-     *@return   com.macro.mall.tiny.common.api.CommonResult<com.macro.mall.tiny.modules.business.model.BDirectory>
-     *@author   gjs
-     *@since    J7.23.0
-     *@date     2021/4/2
+     * @param
+     * @return com.macro.mall.tiny.common.api.CommonResult<com.macro.mall.tiny.modules.business.model.BDirectory>
+     * @describe 获取全部文件夹
+     * @author gjs
+     * @date 2021/4/2
+     * @since J7.23.0
      */
     @ApiOperation("获取全部文件夹接口")
     @GetMapping("/getAllDirectory")
@@ -114,12 +123,12 @@ public class FileController {
     }
 
     /**
-     *@describe 获取文件夹下全被文件详细接口
-     *@param    path
-     *@return   com.macro.mall.tiny.common.api.CommonResult<java.util.List<com.macro.mall.tiny.modules.business.model.BFileDetail>>
-     *@author   gjs
-     *@since    J7.23.0
-     *@date     2021/4/5
+     * @param path
+     * @return com.macro.mall.tiny.common.api.CommonResult<java.util.List < com.macro.mall.tiny.modules.business.model.BFileDetail>>
+     * @describe 获取文件夹下全被文件详细接口
+     * @author gjs
+     * @date 2021/4/5
+     * @since J7.23.0
      */
     @ApiOperation("获取文件夹下全部文件详细接口")
     @GetMapping("/getFileDetail")
@@ -143,16 +152,16 @@ public class FileController {
         AdminUserDetails userDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         boolean access = AuthUtil.checkAccess(userDetails, AuthUtil.ACCESS);
         File file = new File(path);
-        if (file.getName().startsWith(String.valueOf(UploadConfig.AUTH_STR))&&!access) return;
+        if (file.getName().contains(String.valueOf(UploadConfig.AUTH_STR)) && !access) return;
         if (file.exists()) { //判断文件父目录是否存在
             String fileName = file.getName();
             response.setContentType("application/form-data");
             response.setCharacterEncoding("UTF-8");
             response.setHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(fileName, "UTF-8"));
             response.setHeader("Access-Control-Expose-Headers", "content-Disposition");
-            try(FileInputStream fileInputStream = new FileInputStream(file)){
+            try (FileInputStream fileInputStream = new FileInputStream(file)) {
                 try (BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream)) {
-                    try (OutputStream outputStream = response.getOutputStream()){
+                    try (OutputStream outputStream = response.getOutputStream()) {
                         byte[] buffer = new byte[1024];
                         int read = bufferedInputStream.read(buffer);
                         while (read != -1) {
@@ -172,46 +181,57 @@ public class FileController {
         AdminUserDetails userDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         boolean access = AuthUtil.checkAccess(userDetails, AuthUtil.ACCESS);
         OutputStream outputStream = response.getOutputStream();
-        ZipOutputStream zipOutputStream = new ZipOutputStream(outputStream, Charset.forName(charset));
+        ParallelScatterZipCreator scatterZipCreator = new ParallelScatterZipCreator();
+        ZipArchiveOutputStream zipArchiveOutputStream = new ZipArchiveOutputStream(outputStream);
         response.setContentType("multipart/form-data");
         response.setHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(fileDownloadParam.getName(), "UTF-8"));
         response.setHeader("Access-Control-Expose-Headers", "content-Disposition");
         try {
-            for (String path : fileDownloadParam.getFileList()) {
-                Path file = Paths.get(path);
-                String fileName = file.getFileName().toString();
-                if (fileName.startsWith(String.valueOf(UploadConfig.AUTH_STR)) && !access) {
-                    continue;
+            List<String> fileList = fileDownloadParam.getFileList();
+            ArrayList<String> allSubFile = Lists.newArrayList();
+            fileList.forEach(filePath -> {
+                File file = new File(filePath);
+                if (file.exists() && file.isDirectory()) {
+                    MyFileUtils.addAllSubFileList(allSubFile, file, access);
                 }
-                if (Files.isDirectory(file)) {
-                    continue;
+            });
+            fileList.addAll(allSubFile);
+
+            fileList.forEach(filePath -> {
+                Path path = Paths.get(filePath);
+                if (Files.isDirectory(path)) {
+                    return;
                 }
-                try (InputStream inputStream = Files.newInputStream(file)) {
-                    // 创建一个压缩项，指定名称
-                    int count = file.getNameCount();
-                    StringBuilder filePathSB = new StringBuilder();
-                    for (int i = 2; i < count - 1; i++) {
-                        filePathSB.append(file.getName(i)).append("/");
-                    }
-                    String filePath = filePathSB.toString() + fileName;
-                    ZipEntry zipEntry = new ZipEntry(filePath);
-                    // 添加到压缩流
-                    zipOutputStream.putNextEntry(zipEntry);
-                    // 写入数据
-                    int len;
-                    byte[] buffer = new byte[1024 * 10];
-                    while ((len = inputStream.read(buffer)) > 0) {
-                        zipOutputStream.write(buffer, 0, len);
+                Path relativePath = path.subpath(3, path.getNameCount());
+                ZipArchiveEntry archiveEntry = new ZipArchiveEntry(relativePath.toString());
+                archiveEntry.setMethod(ZipEntry.DEFLATED);
+                InputStreamSupplier supplier = () -> {
+                    try {
+                        return new FileInputStream(path.toFile());
+                    } catch (FileNotFoundException e) {
+                        e.printStackTrace();
+                        return null;
                     }
-                    zipOutputStream.flush();
-                }
-                // 完成所有压缩项的添加
-                zipOutputStream.closeEntry();
-            }
+                };
+                scatterZipCreator.addArchiveEntry(archiveEntry, supplier);
+            });
+            scatterZipCreator.writeTo(zipArchiveOutputStream);
         } finally {
-            zipOutputStream.close();
+            zipArchiveOutputStream.close();
             outputStream.close();
         }
     }
 
+    @ApiOperation("文件删除接口")
+    @GetMapping("/delete")
+    public CommonResult<String> delete(@RequestParam @PathParam(value = "path") String path) throws IOException {
+        AdminUserDetails userDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        boolean deleteFile = fileService.deleteFile(path, userDetails);
+        if (deleteFile) {
+            return CommonResult.success("删除成功");
+        } else {
+            return CommonResult.failed("删除失败");
+        }
+    }
+
 }

src/main/java/com/macro/mall/tiny/modules/business/dto/WeatherParam.java

@@ -0,0 +1,25 @@
+package com.macro.mall.tiny.modules.business.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author gjs
+ * @description
+ * @date 2021/3/25 10:17
+ */
+@Getter
+@Setter
+public class WeatherParam {
+
+    @NotBlank
+    @ApiModelProperty(value = "经度")
+    private String lon;
+
+    @NotBlank
+    @ApiModelProperty(value = "纬度")
+    private String lat;
+}

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

@@ -22,7 +22,6 @@ import lombok.EqualsAndHashCode;
  * @since 2021-03-24
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
 @TableName("b_tower")
 @ApiModel(value="BTower对象", description="塔表")
 public class BTower implements Serializable {
@@ -54,6 +53,20 @@ public class BTower implements Serializable {
     @ApiModelProperty(value = "纬度")
     private BigDecimal lat;
 
+    @ApiModelProperty(value = "是否含有资料")
+    private Integer hasFile;
+
+    @Override
+    public boolean equals(Object obj){
+        BTower tower = (BTower) obj;
+        return this.name.equals(tower.name) && this.lineId.equals(tower.lineId);
+    }
+
+    @Override
+    public int hashCode(){
+        return this.name.hashCode() + this.lineId.intValue();
+    }
+
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

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

@@ -0,0 +1,62 @@
+package com.macro.mall.tiny.modules.business.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author gjs
+ * @description
+ * @date 2021/4/11 20:29
+ */
+@Data
+@ApiModel(value = "Weather对象", description = "实时天气")
+public class Weather implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "温度，默认单位：摄氏度")
+    private String temp;
+
+    @ApiModelProperty(value = "体感温度，默认单位：摄氏度")
+    private String feelsLike;
+
+    @ApiModelProperty(value = "天气状况的文字描述，包括阴晴雨雪等天气状态的描述")
+    private String text;
+
+    @ApiModelProperty(value = "风向360角度")
+    private String wind360;
+
+    @ApiModelProperty(value = "风向")
+    private String windDir;
+
+    @ApiModelProperty(value = "风力等级")
+    private String windScale;
+
+    @ApiModelProperty(value = "风速，公里/小时")
+    private String windSpeed;
+
+    @ApiModelProperty(value = "相对湿度，百分比数值")
+    private String humidity;
+
+    @ApiModelProperty(value = "当前小时累计降水量，默认单位：毫米")
+    private String precip;
+
+    @ApiModelProperty(value = "大气压强，默认单位：百帕")
+    private String pressure;
+
+    @ApiModelProperty(value = "能见度，默认单位：公里")
+    private String vis;
+
+    @ApiModelProperty(value = "云量，百分比数值")
+    private String cloud;
+
+    @ApiModelProperty(value = "露点温度")
+    private String dew;
+
+
+
+}

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

@@ -1,11 +1,10 @@
 package com.macro.mall.tiny.modules.business.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.macro.mall.tiny.domain.AdminUserDetails;
 import com.macro.mall.tiny.modules.business.model.BFile;
 import com.macro.mall.tiny.modules.business.model.BTower;
-import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.security.Principal;
 import java.util.List;
 import java.util.Map;
 
@@ -22,4 +21,7 @@ public interface BTowerService extends IService<BTower> {
     long saveAndUpdate(List<BTower> towerList);
 
     Map<String, List<BFile>> getFile(Long id, AdminUserDetails userDetails);
+
+    void setHasFile(List<BTower> towerList, AdminUserDetails userDetails);
+
 }

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

@@ -0,0 +1,13 @@
+package com.macro.mall.tiny.modules.business.service;
+
+import com.macro.mall.tiny.modules.business.model.Weather;
+
+/**
+ * @author gjs
+ * @description
+ * @date 2021/4/11 20:12
+ */
+public interface CommonService {
+
+    Weather getWeather(String lat, String lon);
+}

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

@@ -7,7 +7,6 @@ import com.macro.mall.tiny.modules.business.model.BFileDetail;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.security.Principal;
 import java.util.List;
 
 /**
@@ -27,4 +26,6 @@ public interface FileService {
 
     List<BFile> getFileList(String path, AdminUserDetails userDetails);
 
+    boolean deleteFile(String path, AdminUserDetails userDetails) throws IOException;
+
 }

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

@@ -2,6 +2,7 @@ package com.macro.mall.tiny.modules.business.service.impl;
 
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.common.collect.Lists;
 import com.macro.mall.tiny.common.exception.ApiException;
 import com.macro.mall.tiny.common.exception.Asserts;
 import com.macro.mall.tiny.common.util.CommonUtils;
@@ -29,9 +30,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -89,6 +88,7 @@ public class AsyncHandler {
             QueryWrapper<BLine> wrapper = new QueryWrapper<>();
             wrapper.lambda().eq(BLine::getName, lineName);
             BLine line = lineService.getOne(wrapper);
+            List<BTower> towerList = Lists.newArrayList();
             if (line == null) {
                 // 如果为空，则创建新线路
                 BLine newLine = new BLine();
@@ -140,7 +140,7 @@ public class AsyncHandler {
                         } else if ("杆塔信息录入.xlsx".equals(SecDirectoryName) || "杆塔信息录入.xls".equals(SecDirectoryName)) {
                             List<TowerExcelModel> modelArrayList = EasyExcel.read(zipFile.getInputStream(zipEntry), TowerExcelModel.class, null).sheet().doReadSync();
                             BLine finalLine = line;
-                            List<BTower> towerList = modelArrayList.stream().map(model -> {
+                            towerList = modelArrayList.stream().map(model -> {
                                 BTower tower = new BTower();
                                 tower.setName(model.getName());
                                 tower.setShape(model.getShape());
@@ -154,10 +154,11 @@ public class AsyncHandler {
                                 tower.setLon(lon);
                                 tower.setLat(lat);
                                 tower.setLineId(finalLine.getId());
+                                tower.setHasFile(0);
                                 tower.setCreateTime(new Date());
                                 return tower;
                             }).collect(Collectors.toList());
-                            towerService.saveAndUpdate(towerList);
+//                            towerService.saveAndUpdate(towerList);
                             continue;
                         } else {
                             warnMsg.append(entryName).append("第二层目录解析出错;");
@@ -202,6 +203,14 @@ public class AsyncHandler {
             lineUploadLog.setWarnMsg(warnMsg.toString());
             lineUploadLogService.save(lineUploadLog);
 
+            // 后续更新塔是否包含资料
+            QueryWrapper<BTower> towerWrapper = new QueryWrapper<>();
+            towerWrapper.lambda().eq(BTower::getLineId, line.getId());
+            List<BTower> oriTowerList = towerService.list(towerWrapper);
+            HashSet<BTower> towerSet = new HashSet<>(oriTowerList);
+            towerSet.addAll(towerList);
+            towerService.setHasFile(new ArrayList<>(towerSet), userDetails);
+
             // 后续清楚缓存处理
             lineCacheService.delLineList();
             directoryCacheService.delDirectory();

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

@@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.io.FilenameFilter;
 import java.util.HashMap;
 import java.util.List;
@@ -68,8 +69,8 @@ public class BTowerServiceImpl extends ServiceImpl<BTowerMapper, BTower> impleme
                 province.getProvince() + UploadConfig.SEPARATOR +
                 line.getName();
 
-        String SecBasePath;
-        String ThirdBasePath;
+        String secBasePath;
+        String thirdBasePath;
         List<BFile> sonList;
         // 获取3杆塔图纸
         String shape = tower.getShape();
@@ -78,28 +79,82 @@ public class BTowerServiceImpl extends ServiceImpl<BTowerMapper, BTower> impleme
             shape = shape.substring(0, lastIndex).replace('/', ' ');
         }
         if (StringUtils.isNotBlank(shape)) {
-            SecBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TOWER_PIC.getName(), auth);
-            ThirdBasePath = MyFileUtils.getAuthFilePath(SecBasePath, shape, auth);
-            sonList = MyFileUtils.getSonFiles(ThirdBasePath, auth);
+            secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TOWER_PIC.getName(), auth);
+            thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, shape, auth);
+            sonList = MyFileUtils.getSonFiles(thirdBasePath, auth);
         } else {
             sonList = Lists.newArrayList();
         }
         resultMap.put("shapeFileList", sonList);
 
         // 获取6地线金具串图
-        SecBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.EARTH_WIRE_HARD_PIC.getName(), auth);
+        secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.EARTH_WIRE_HARD_PIC.getName(), auth);
         String hardwareType = tower.getHardwareType().replace('/', ' ');
         FilenameFilter hardwareTypeFilter = (dir, name) -> name.startsWith(hardwareType) || (name.startsWith(UploadConfig.AUTH_STR + hardwareType) && auth);
-        sonList = MyFileUtils.getSonFiles(SecBasePath, hardwareTypeFilter, auth);
+        sonList = MyFileUtils.getSonFiles(secBasePath, hardwareTypeFilter, auth);
         resultMap.put("hardwareFileList", sonList);
 
         // 获取7班组巡检照片
-        SecBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TEAM_CHECK_PIC.getName(), auth);
+        secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TEAM_CHECK_PIC.getName(), auth);
         String towerName = tower.getName();
-        ThirdBasePath = MyFileUtils.getAuthFilePath(SecBasePath, towerName, auth);
-        sonList = MyFileUtils.getSonFiles(ThirdBasePath, auth);
+        thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, towerName, auth);
+        sonList = MyFileUtils.getSonFiles(thirdBasePath, auth);
         resultMap.put("teamCheckFileList", sonList);
 
         return resultMap;
     }
+
+    @Override
+    public void setHasFile(List<BTower> towerList, AdminUserDetails userDetails) {
+        boolean access = AuthUtil.checkAccess(userDetails, AuthUtil.ACCESS);
+        BTower firstTower = towerList.get(0);
+        BLine line = lineMapper.selectById(firstTower.getLineId());
+        BProvince province = provinceMapper.selectById(line.getProvinceId());
+        String basePath = UploadConfig.powerPath +
+                province.getProvince() + UploadConfig.SEPARATOR +
+                line.getName();
+
+        for (BTower tower : towerList) {
+            String secBasePath;
+            String thirdBasePath;
+
+            // 检验是否包含塔形资料
+            String shape = tower.getShape();
+            int lastIndex = shape.lastIndexOf('-');
+            if (lastIndex > 0) {
+                shape = shape.substring(0, lastIndex).replace('/', ' ');
+            }
+            if (StringUtils.isNotBlank(shape)) {
+                secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TOWER_PIC.getName(), access);
+                thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, shape, access);
+                if (MyFileUtils.hasSonFile(thirdBasePath, access)) {
+                    tower.setHasFile(1);
+                    continue;
+                }
+            }
+
+            // 检验是否含有金具串资料
+            secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.EARTH_WIRE_HARD_PIC.getName(), access);
+            String hardwareType = tower.getHardwareType().replace('/', ' ');
+            FilenameFilter hardwareTypeFilter = (dir, name) -> name.startsWith(hardwareType) || (name.startsWith(UploadConfig.AUTH_STR + hardwareType) && access);
+            if (MyFileUtils.hasSonFile(secBasePath, hardwareTypeFilter, access)) {
+                tower.setHasFile(1);
+                continue;
+            }
+
+            // 检验是否含有巡检照片
+            secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TEAM_CHECK_PIC.getName(), access);
+            thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, tower.getName(), access);
+            if (MyFileUtils.hasSonFile(thirdBasePath, access)) {
+                tower.setHasFile(1);
+                continue;
+            }
+
+
+            tower.setHasFile(0);
+        }
+
+        towerMapper.saveAndUpdate(towerList);
+    }
+
 }

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

@@ -0,0 +1,48 @@
+package com.macro.mall.tiny.modules.business.service.impl;
+
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.macro.mall.tiny.modules.business.model.Weather;
+import com.macro.mall.tiny.modules.business.service.CommonService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author gjs
+ * @description
+ * @date 2021/4/11 20:12
+ */
+@Service
+@Slf4j
+public class CommonServiceImpl implements CommonService {
+
+    @Value("${weather.REQUEST_URL}")
+    private String weatherUrl;
+
+    @Value("${weather.KEY}")
+    private String weatherKey;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+
+    @Override
+    public Weather getWeather(String lat, String lon) {
+        String getParam = "?location=" + lon + "," + lat + "&key=" + weatherKey;
+        ResponseEntity<JSONObject> responseEntity = restTemplate.getForEntity(weatherUrl + getParam, JSONObject.class);
+        JSONObject entityBody = responseEntity.getBody();
+        String code = entityBody.getStr("code");
+        if ("200".equals(code)) {
+            return entityBody.get("now", Weather.class);
+        } else {
+            log.error("获取实时天气数据失败，lat：{}，lon:{}，code：{}", lat, lon, code);
+            return new Weather();
+        }
+    }
+
+}

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

@@ -1,13 +1,19 @@
 package com.macro.mall.tiny.modules.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.macro.mall.tiny.common.exception.Asserts;
 import com.macro.mall.tiny.common.util.MyFileUtils;
 import com.macro.mall.tiny.config.UploadConfig;
 import com.macro.mall.tiny.domain.AdminUserDetails;
-import com.macro.mall.tiny.modules.business.model.BDirectory;
-import com.macro.mall.tiny.modules.business.model.BFile;
-import com.macro.mall.tiny.modules.business.model.BFileDetail;
+import com.macro.mall.tiny.modules.business.enums.DirectoryEnum;
+import com.macro.mall.tiny.modules.business.mapper.BLineMapper;
+import com.macro.mall.tiny.modules.business.mapper.BTowerMapper;
+import com.macro.mall.tiny.modules.business.model.*;
 import com.macro.mall.tiny.modules.business.service.BDirectoryCacheService;
+import com.macro.mall.tiny.modules.business.service.BLineCacheService;
+import com.macro.mall.tiny.modules.business.service.BTowerService;
 import com.macro.mall.tiny.modules.business.service.FileService;
+import com.macro.mall.tiny.security.util.AuthUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -15,6 +21,9 @@ 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.util.List;
 
 import static com.macro.mall.tiny.common.util.UploadUtils.*;
@@ -32,7 +41,19 @@ public class FileServiceImpl implements FileService {
     private AsyncHandler asyncHandler;
 
     @Autowired
-    BDirectoryCacheService directoryCacheService;
+    private BDirectoryCacheService directoryCacheService;
+
+    @Autowired
+    private BTowerService towerService;
+
+    @Autowired
+    private BTowerMapper towerMapper;
+
+    @Autowired
+    private BLineMapper lineMapper;
+
+    @Autowired
+    private BLineCacheService lineCacheService;
 
     /**
      * 上传文件
@@ -96,4 +117,42 @@ public class FileServiceImpl implements FileService {
         return MyFileUtils.getSonFiles(path, userDetails);
     }
 
+    @Override
+    public boolean deleteFile(String path, AdminUserDetails userDetails) throws IOException {
+        boolean delete = AuthUtil.checkAccess(userDetails, AuthUtil.DELETE);
+        Path filePath = Paths.get(path);
+        if (!delete) {
+            Asserts.fail("您没有删除权限");
+        }
+        if (Files.exists(filePath)) {
+            Files.delete(filePath);
+        } else {
+            Asserts.fail("该文件不存在");
+        }
+        int count = filePath.getNameCount();
+        if (count < 5) {
+            return true;
+        }
+        String lineNameStr = filePath.getName(3).toString();
+        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;
+        }
+
+        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);
+
+        // 后续清楚缓存处理
+        lineCacheService.delLineList();
+        directoryCacheService.delDirectory();
+        return true;
+    }
+
 }

src/main/java/com/macro/mall/tiny/security/util/AuthUtil.java

@@ -1,7 +1,6 @@
 package com.macro.mall.tiny.security.util;
 
 import com.macro.mall.tiny.domain.AdminUserDetails;
-import org.springframework.security.core.GrantedAuthority;
 
 /**
  * @author gjs
@@ -12,10 +11,11 @@ public class AuthUtil {
 
     public static final String COVER = "/cover";
     public static final String ACCESS = "/visit";
+    public static final String DELETE = "/delete";
 
     public static boolean checkAccess(AdminUserDetails userDetails, String resource) {
-        for (GrantedAuthority authority : userDetails.getAuthorities()) {
-            if (resource.equals(authority.getAuthority())) {
+        for (String url : userDetails.getResourceUrlList()) {
+            if (resource.equals(url)) {
                 return true;
             }
         }

src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     url: jdbc:mysql://localhost:3306/power_system?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
     username: root
-    password: root
+    password: abc45628
   redis:
     host: localhost # Redis服务器地址
     database: 0 # Redis数据库索引（默认为0）

src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     url: jdbc:mysql://localhost:3306/power_system?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
     username: root
-    password: root
+    password: abc45628
   redis:
     host: localhost # Redis服务器地址
     database: 0 # Redis数据库索引（默认为0）

src/main/resources/application.yml

@@ -69,4 +69,8 @@ thread:
     queueCapacity: 512
 
 system:
-  charset: gbk
+  charset: gbk
+
+weather:
+  REQUEST_URL: https://devapi.qweather.com/v7/weather/now
+  KEY: b7942152d9844b958862bd612297b471

src/main/resources/generator.properties

@@ -1,5 +1,5 @@
 dataSource.url=jdbc:mysql://localhost:3306/power_system?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
 dataSource.driverName=com.mysql.cj.jdbc.Driver
 dataSource.username=root
-dataSource.password=root
+dataSource.password=abc45628
 package.base=com.macro.mall.tiny.modules

src/main/resources/mapper/business/BLineMapper.xml

@@ -16,6 +16,7 @@
                t.line_id       t_line_id,
                t.lon           t_lon,
                t.lat           t_lat,
+               t.has_file      t_has_file,
                t.create_time   t_create_time
         FROM b_line l
                  LEFT JOIN b_tower t ON l.id = t.line_id
@@ -36,6 +37,7 @@
                t.line_id       t_line_id,
                t.lon           t_lon,
                t.lat           t_lat,
+               t.has_file      t_has_file,
                t.create_time   t_crete_time
         FROM b_line l
                  LEFT JOIN b_tower t ON l.id = t.line_id
@@ -64,6 +66,7 @@
             <result column="t_line_id" property="lineId"/>
             <result column="t_lon" property="lon"/>
             <result column="t_lat" property="lat"/>
+            <result column="t_has_file" property="hasFile"/>
             <result column="t_create_time" property="createTime"/>
         </collection>
     </resultMap>

src/main/resources/mapper/business/BTowerMapper.xml

@@ -11,6 +11,7 @@
         line_id,
         lon,
         lat,
+        has_file,
         create_time
         )
         VALUES
@@ -23,6 +24,7 @@
             #{item.lineId},
             #{item.lon},
             #{item.lat},
+            #{item.hasFile},
             #{item.createTime}
             )
         </foreach>
@@ -32,6 +34,7 @@
         hardware_type = VALUES(hardware_type),
         lon = VALUES(lon),
         lat = VALUES(lat),
+        has_file = VALUES(has_file),
         create_time = VALUES(create_time);
 
     </insert>
@@ -39,10 +42,15 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.macro.mall.tiny.modules.business.model.BTower">
         <id column="id" property="id"/>
+        <result column="sort" property="sort"/>
         <result column="name" property="name"/>
         <result column="shape" property="shape"/>
         <result column="hardware_type" property="hardwareType"/>
         <result column="line_id" property="lineId"/>
+        <result column="lon" property="lon"/>
+        <result column="lat" property="lat"/>
+        <result column="has_file" property="hasFile"/>
+        <result column="create_time" property="createTime"/>
     </resultMap>
 
 </mapper>