From b3d4112a3998bdec4a329d9f81fd820c1579dff1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 23 四月 2023 14:45:11 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/show/InquiryController.java |   16 +++++++++++++++-
 src/main/java/com/lf/server/service/show/InquiryService.java       |   18 +++++++++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/show/InquiryController.java b/src/main/java/com/lf/server/controller/show/InquiryController.java
index 62daa62..bec4495 100644
--- a/src/main/java/com/lf/server/controller/show/InquiryController.java
+++ b/src/main/java/com/lf/server/controller/show/InquiryController.java
@@ -9,12 +9,14 @@
 import com.lf.server.entity.ctrl.ShpRecordEntity;
 import com.lf.server.entity.data.DownloadEntity;
 import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.PublishEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.AesHelper;
 import com.lf.server.helper.StringHelper;
 import com.lf.server.helper.WebHelper;
 import com.lf.server.service.all.BaseUploadService;
 import com.lf.server.service.data.DownloadService;
+import com.lf.server.service.data.PublishService;
 import com.lf.server.service.show.InquiryService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
@@ -24,6 +26,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -44,6 +47,9 @@
 
     @Autowired
     InquiryService inquiryService;
+
+    @Resource
+    PublishService publishService;
 
     @SysLog()
     @ApiOperation(value = "涓婁紶Shp鏂囦欢璇诲彇绗竴鏉¤褰曠殑WKT")
@@ -92,7 +98,15 @@
                 return fail("瀵嗙爜瑙e瘑澶辫触", null);
             }
 
-            return success("");
+            PublishEntity pub = publishService.selectById(dt.getPubid());
+            if (null == pub) {
+                return fail("鍙戝竷鏁版嵁涓嶅瓨鍦�");
+            }
+
+            UserEntity ue = tokenService.getCurrentUser(req);
+            String guid = inquiryService.downloadTiles(dt, pub, ue);
+
+            return success(guid);
         } catch (Exception ex) {
             return fail(ex, null);
         }
diff --git a/src/main/java/com/lf/server/service/show/InquiryService.java b/src/main/java/com/lf/server/service/show/InquiryService.java
index d993c20..f37172e 100644
--- a/src/main/java/com/lf/server/service/show/InquiryService.java
+++ b/src/main/java/com/lf/server/service/show/InquiryService.java
@@ -1,8 +1,10 @@
 package com.lf.server.service.show;
 
+import com.lf.server.entity.ctrl.DownloadTileEntity;
 import com.lf.server.entity.ctrl.ShpRecordEntity;
-import com.lf.server.entity.data.MetaEntity;
 import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.PublishEntity;
+import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.FileHelper;
 import com.lf.server.helper.ShpHelper;
 import com.lf.server.helper.StringHelper;
@@ -18,14 +20,11 @@
 public class InquiryService {
     /**
      * 璇诲彇Shp绗竴鏉¤褰曠殑WKT
-     *
-     * @param list
-     * @return
      */
     public ShpRecordEntity readShpFirstRecord(List<MetaFileEntity> list) {
         String fileName = null;
         for (MetaFileEntity mf : list) {
-            if (mf.getName().toLowerCase().indexOf(".shp") > -1) {
+            if (mf.getName().toLowerCase().contains(".shp")) {
                 fileName = mf.getPath();
                 break;
             }
@@ -39,4 +38,13 @@
 
         return sr;
     }
+
+    /**
+     * 涓嬭浇鐡︾墖
+     */
+    public String downloadTiles(DownloadTileEntity dt, PublishEntity pub, UserEntity ue) {
+
+
+        return "";
+    }
 }

--
Gitblit v1.9.3