From 739290c9f9274e7e5b3b79afe13fbfad7fe19e38 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 15 二月 2023 12:22:19 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/show/MarkService.java |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 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 66aff19..0fb3ade 100644
--- a/src/main/java/com/lf/server/service/show/MarkService.java
+++ b/src/main/java/com/lf/server/service/show/MarkService.java
@@ -103,7 +103,7 @@
             return null;
         }
 
-        String zip = getZip();
+        String zip = getZipPath();
         ZipHelper.zip(zip, parent);
         FileHelper.deleteDir(parent);
 
@@ -119,25 +119,31 @@
         return rows > 0 ? de.getGuid() : null;
     }
 
+    /**
+     * 鍒涘缓shp鏂囦欢
+     */
     private String createShapeFiles(UserEntity ue, List<MarkJsonEntity> list, String parent) {
         String path = getShpDir(ue, parent);
 
         List<MarkJsonEntity> points = getMarkByType(list, "POINT");
         if (points.size() > 0) {
-            String pointFile = ShpHelper.createShp(points, path, "POINT");
+            ShpHelper.createShp(points, path, "POINT");
         }
         List<MarkJsonEntity> lines = getMarkByType(list, "LINESTRING");
         if (lines.size() > 0) {
-            String lineFile = ShpHelper.createShp(lines, path, "LINESTRING");
+            ShpHelper.createShp(lines, path, "LINESTRING");
         }
         List<MarkJsonEntity> polygons = getMarkByType(list, "POLYGON");
         if (polygons.size() > 0) {
-            String polygonFile = ShpHelper.createShp(polygons, path, "POLYGON");
+            ShpHelper.createShp(polygons, path, "POLYGON");
         }
 
         return path;
     }
 
+    /**
+     * 鑾峰彇shp鐩綍
+     */
     private String getShpDir(UserEntity ue, String parent) {
         String path = parent + File.separator + WebHelper.getRandomInt(100000, 1000000);
 
@@ -149,8 +155,11 @@
         return path;
     }
 
+    /**
+     * 鑾峰彇鏍囩粯绫诲瀷
+     */
     private List<MarkJsonEntity> getMarkByType(List<MarkJsonEntity> list, String type) {
-        List<MarkJsonEntity> rs = new ArrayList<MarkJsonEntity>();
+        List<MarkJsonEntity> rs = new ArrayList<>();
         for (MarkJsonEntity mark : list) {
             if (StringHelper.isEmpty(mark.getWkt())) {
                 continue;
@@ -163,7 +172,10 @@
         return rs;
     }
 
-    private String getZip() {
+    /**
+     * 鑾峰彇zip璺緞
+     */
+    private String getZipPath() {
         String path = pathHelper.getDownloadFullPath() + File.separator + StringHelper.YMDHMS2_FORMAT.format(new Date()) + ".zip";
 
         File file = new File(path);
@@ -174,6 +186,9 @@
         return path;
     }
 
+    /**
+     * 鑾峰彇涓嬭浇瀹炰綋绫�
+     */
     private DownloadEntity getDownloadEntity(UserEntity ue, String file) throws Exception {
         DownloadEntity de = new DownloadEntity();
         de.setName(FileHelper.getFileName(file));
@@ -183,7 +198,7 @@
         de.setDcount(0);
         // de.setPwd(null)
         de.setUrl(FileHelper.getRelativePath(file));
-        de.setDescr("ShapeFile鏂囦欢");
+        de.setDescr("shp鏂囦欢");
         de.setGuid(FileHelper.getFileMd5(file));
         de.setCreateUser(ue.getId());
         // de.setGeom(null)
@@ -193,9 +208,6 @@
 
     /**
      * 鑾峰彇涓嬭浇鏂囦欢璺緞
-     *
-     * @param de 涓嬭浇瀹炰綋绫�
-     * @return 涓嬭浇鏂囦欢璺緞
      */
     public String getDownloadFilePath(DownloadEntity de) {
         return pathHelper.getConfig().getDownloadPath() + File.separator + de.getUrl();
@@ -203,9 +215,6 @@
 
     /**
      * 璇诲彇ShapeFile鏂囦欢鑾峰彇Mark瀹炰綋绫�
-     *
-     * @param list ShapeFile鏂囦欢鍒楄〃
-     * @return Mark瀹炰綋绫婚泦鍚�
      */
     public List<MarkJsonEntity> readShpForMarks(List<MetaFileEntity> list) {
         String fileName = null;

--
Gitblit v1.9.3