From 5844344ae1650cf6212ce89cce49b1ceed9cf0cd Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 09 二月 2023 11:23:47 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/show/DataLibController.java |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/show/DataLibController.java b/src/main/java/com/lf/server/controller/show/DataLibController.java
index d1b8265..811801b 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -308,26 +308,28 @@
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp"),
             @ApiImplicitParam(name = "filter", value = "杩囨护鏉′欢", dataType = "String", paramType = "query", example = "gid >= 50 and name like '鍘�' and objectid < 5000.0"),
-            @ApiImplicitParam(name = "wkt", value = "WKT锛堣憲鍚嶆枃鏈級", dataType = "String", paramType = "query", example = "")
+            @ApiImplicitParam(name = "pwd", value = "瀵嗙爜", dataType = "String", paramType = "query", example = "")
     })
     @GetMapping(value = "/downloadEntityReq")
-    public ResponseMsg<Object> downloadEntityReq(String name, String filter, String wkt, HttpServletRequest req, HttpServletResponse res) {
+    public ResponseMsg<Object> downloadEntityReq(String name, String filter, String pwd, HttpServletRequest req, HttpServletResponse res) {
         try {
+            if (StringHelper.isEmpty(pwd)) {
+                return fail("瀵嗙爜涓嶈兘涓虹┖");
+            }
+            pwd = RsaHelper.decrypt(pwd);
+            if (StringHelper.isPwdInvalid(pwd)) {
+                return fail("瀵嗙爜涓嶇鍚堣姹�");
+            }
+
             BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
             if (baseMapper == null) {
                 return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
             }
 
-            QueryWrapper wrapper = new QueryWrapper();
-            baseQueryService.addFilterWrapper(wrapper, filter);
-            baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt);
+            UserEntity ue = tokenService.getCurrentUser(req);
+            String guid = dataLibService.zipDbData(ue, baseMapper, filter, pwd);
 
-            List<?> list = baseMapper.selectList(wrapper);
-            if (null == list || list.size() == 0) {
-                return fail("鏌ヨ鏃犳暟鎹�", null);
-            }
-
-            return success(null);
+            return success(guid);
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
         }

--
Gitblit v1.9.3