From 1e9806d95029ca54a8b5edcb34e9c190def1c6bc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 27 十月 2022 20:14:10 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/show/ComprehensiveController.java |   64 ++++++++++++++++++++++++++-----
 1 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
index 0554c7d..a78d553 100644
--- a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
+++ b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
@@ -4,17 +4,24 @@
 import com.lf.server.aspect.SysLog;
 import com.lf.server.controller.all.BaseController;
 import com.lf.server.entity.all.ResponseMsg;
-import com.lf.server.entity.bd.DlgAgnp;
+import com.lf.server.entity.bd.DlgAgnpEntity;
+import com.lf.server.entity.ctrl.ShpRecordEntity;
+import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.helper.AesHelper;
+import com.lf.server.helper.StringHelper;
+import com.lf.server.service.data.UploaderService;
 import com.lf.server.service.show.ComprehensiveService;
+import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -26,7 +33,15 @@
 @RequestMapping("/comprehensive")
 public class ComprehensiveController extends BaseController {
     @Autowired
+    TokenService tokenService;
+
+    @Autowired
+    UploaderService uploaderService;
+
+    @Autowired
     ComprehensiveService comprehensiveService;
+
+    private final static int FOUR = 4;
 
     @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟-鍦板悕鍦板潃")
@@ -36,13 +51,13 @@
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
     @GetMapping(value = "/selectAddrByPage")
-    public ResponseMsg<List<DlgAgnp>> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<DlgAgnpEntity>> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
             }
 
-            Page<DlgAgnp> paged = comprehensiveService.selectAddrByPage(name, pageSize, pageIndex);
+            Page<DlgAgnpEntity> paged = comprehensiveService.selectAddrByPage(name, pageSize, pageIndex);
 
             return success(paged.getTotal(), paged.getRecords());
         } catch (Exception ex) {
@@ -51,16 +66,43 @@
     }
 
     @SysLog()
-    @ApiOperation(value = "鏍规嵁ID鏌ヨ-鍦板悕鍦板潃")
+    @ApiOperation(value = "鏍规嵁ID鏌ヨWKT-鍦板悕鍦板潃")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
     })
-    @GetMapping(value = "/selectAddrById")
-    public ResponseMsg<DlgAgnp> selectAddrById(Integer id) {
+    @GetMapping(value = "/selectWktById")
+    public ResponseMsg<String> selectWktById(Integer id) {
         try {
-            DlgAgnp entity = comprehensiveService.selectAddrById(id);
+            String wkt = comprehensiveService.selectWktById(id);
 
-            return success(entity);
+            return success(wkt);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "涓婁紶Shp鏂囦欢鑾峰彇绗竴鏉¤褰曠殑WKT")
+    @ResponseBody
+    @PostMapping(value = "/uploadShp")
+    public ResponseMsg<ShpRecordEntity> uploadShp(HttpServletRequest req, HttpServletResponse res) {
+        try {
+            UserEntity ue = tokenService.getCurrentUser(req);
+            if (ue == null) {
+                return fail("鐢ㄦ埛鏈櫥褰�", null);
+            }
+
+            List<MetaFileEntity> list = uploaderService.uploadData(null, ue, req, res);
+            if (list.size() < FOUR) {
+                return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
+            }
+
+            ShpRecordEntity sr = comprehensiveService.readShpFirstRecord(list);
+            if (sr != null && !StringHelper.isEmpty(sr.getWkt())) {
+                sr.setWkt(AesHelper.encrypt(sr.getWkt()));
+            }
+
+            return success(sr);
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
         }

--
Gitblit v1.9.3