From 8ccd68d25ba905698dcf9e0cc565a966e06242dc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 15 二月 2023 14:47:51 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/show/MarkService.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/lf/server/service/show/MarkService.java b/src/main/java/com/lf/server/service/show/MarkService.java
index da8ad3f..d6ce01e 100644
--- a/src/main/java/com/lf/server/service/show/MarkService.java
+++ b/src/main/java/com/lf/server/service/show/MarkService.java
@@ -94,17 +94,17 @@
      * @throws Exception 寮傚父
      */
     public String downloadShp(UserEntity ue, List<MarkJsonEntity> list) throws Exception {
-        String parent = pathHelper.getTempPath();
+        String path = pathHelper.getTempPath();
+        createShapeFiles(ue, list, path);
 
-        String path = createShapeFiles(ue, list, parent);
         File[] files = new File(path).listFiles();
         if (files == null || files.length == 0) {
             return null;
         }
 
         String zip = getZipPath();
-        ZipHelper.zip(zip, parent);
-        FileHelper.deleteDir(parent);
+        ZipHelper.zip(zip, path);
+        FileHelper.deleteDir(path);
 
         String guid = FileHelper.getFileMd5(zip);
         DownloadEntity entity = downloadService.selectByGuid(guid);
@@ -121,9 +121,7 @@
     /**
      * 鍒涘缓shp鏂囦欢
      */
-    private String createShapeFiles(UserEntity ue, List<MarkJsonEntity> list, String parent) {
-        String path = getShpDir(ue, parent);
-
+    private String createShapeFiles(UserEntity ue, List<MarkJsonEntity> list, String path) {
         List<MarkJsonEntity> points = getMarkByType(list, "POINT");
         if (points.size() > 0) {
             ShpHelper.createShp(points, path, "POINT");

--
Gitblit v1.9.3