From a39c7b9256e163f69764df58782a0cb920711a9f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 16 二月 2023 19:28:31 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/all/BaseQueryController.java |   91 +++++++++++++++++++++++++++++----------------
 1 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index 1a8c47c..6e9e6cc 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -22,7 +22,6 @@
 import com.lf.server.mapper.all.GeomBaseMapper;
 import com.lf.server.service.all.BaseQueryService;
 import com.lf.server.service.data.DownloadService;
-import com.lf.server.service.data.UploadService;
 import com.lf.server.service.show.DataLibService;
 import com.lf.server.service.sys.AttachService;
 import com.lf.server.service.sys.DepService;
@@ -235,22 +234,37 @@
     @ApiOperation(value = "鏍规嵁琛ㄥ悕鍒嗛〉鏌ヨ琛�")
     @GetMapping(value = "/selectTabsByPage")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
+            @ApiImplicitParam(name = "dirs", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00,01"),
             @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg_"),
             @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
-    public ResponseMsg<List<TabEntity>> selectTabsByPage(String tab, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<TabEntity>> selectTabsByPage(String depcode, String dirs, String tab, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
             }
+            if (StringHelper.isSqlInjection(depcode)) {
+                return fail("鍗曚綅浠g爜鍚湁闈炴硶瀛楃", null);
+            }
 
-            int count = baseQueryService.selectTabsForCount(tab);
+            String filter = "1=1";
+            if (!StringHelper.isEmpty(depcode)) {
+                filter += String.format(" and depid like '%s%%'", depcode);
+            }
+            dirs = DataLibService.copeCodes(dirs, "dircode");
+            if (dirs != null) {
+                filter += String.format(" and (%s)", dirs);
+            }
+            filter = filter.replace("1=1 and ", "");
+
+            int count = baseQueryService.selectTabsForCount(tab, filter);
             if (count == 0) {
                 return success(0, null);
             }
 
-            List<TabEntity> rs = baseQueryService.selectTabsByPage(tab, pageSize, pageSize * (pageIndex - 1));
+            List<TabEntity> rs = baseQueryService.selectTabsByPage(tab, filter, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
         } catch (Exception ex) {
@@ -392,7 +406,7 @@
             }
 
             UserEntity ue = tokenService.getCurrentUser(req);
-            List<Integer> list = dataLibService.selectDbOverflowDep(ue, reqEntity.getEntities(), reqEntity.getWkt());
+            List<String> list = dataLibService.selectDbOverflowDep(ue, reqEntity.getEntities(), reqEntity.getWkt());
 
             return success(list);
         } catch (Exception ex) {
@@ -423,31 +437,62 @@
     @SysLog()
     @ApiOperation(value = "璇锋眰DB鏁版嵁涓嬭浇")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+            @ApiImplicitParam(name = "dre", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
     })
     @ResponseBody
     @PostMapping(value = "/downloadDbReq")
-    public ResponseMsg<Object> downloadDbReq(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
+    public ResponseMsg<Object> downloadDbReq(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
         try {
-            if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
+            if (null == dre || StringHelper.isEmpty(dre.getPwd())) {
                 return fail("瀵嗙爜涓嶈兘涓虹┖");
             }
-            if (null == reqEntity.getEntities() || reqEntity.getEntities().isEmpty()) {
+            if (null == dre.getEntities() || dre.getEntities().isEmpty()) {
                 return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
             }
-            reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
-            if (StringHelper.isEmpty(reqEntity.getWkt())) {
+            dre.setWkt(AesHelper.decrypt(dre.getWkt()));
+            if (StringHelper.isEmpty(dre.getWkt())) {
                 return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
             }
-            if (!DownloadService.decryptPwd(reqEntity)) {
+            if (!DownloadService.decryptPwd(dre)) {
                 return fail("瀵嗙爜瑙e瘑澶辫触", null);
             }
-            if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
+            if (StringHelper.isPwdInvalid(dre.getPwd())) {
                 return fail("瀵嗙爜涓嶇鍚堣姹�");
             }
 
             UserEntity ue = tokenService.getCurrentUser(req);
-            String guid = dataLibService.createZipFile(ue, reqEntity.getEntities(), reqEntity.getWkt(), reqEntity.getPwd());
+            String guid = dataLibService.createZipFile(ue, dre.getEntities(), dre.getWkt(), dre.getPwd());
+
+            return success(guid);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "璇锋眰瀹炰綋鏁版嵁涓嬭浇")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "dre", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+    })
+    @ResponseBody
+    @PostMapping(value = "/downloadEntityReq")
+    public ResponseMsg<Object> downloadEntityReq(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
+        try {
+            if (null == dre || StringHelper.isEmpty(dre.getPwd())) {
+                return fail("瀵嗙爜涓嶈兘涓虹┖");
+            }
+            if (null == dre.getEntities() || dre.getEntities().isEmpty()) {
+                return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
+            }
+            if (!DownloadService.decryptPwd(dre)) {
+                return fail("瀵嗙爜瑙e瘑澶辫触", null);
+            }
+            if (StringHelper.isPwdInvalid(dre.getPwd())) {
+                return fail("瀵嗙爜涓嶇鍚堣姹�");
+            }
+
+            UserEntity ue = tokenService.getCurrentUser(req);
+            String guid = dataLibService.zipDbData(ue, dre.getEntities().get(0), dre.getFilter(), dre.getPwd());
 
             return success(guid);
         } catch (Exception ex) {
@@ -518,24 +563,6 @@
     public ResponseMsg<Object> selectProject() {
         try {
             List<KeyValueEntity> list = baseQueryService.selectProject();
-
-            return success(list);
-        } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "鏌ヨ瀛楀吀琛ㄥ苟缁熻璁板綍")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
-            @ApiImplicitParam(name = "dirs", value = "鐩綍ID", dataType = "String", paramType = "query", example = "2,5,309"),
-            @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1")
-    })
-    @GetMapping(value = "/selectTabCount")
-    public ResponseMsg<Object> selectTabCount(String name, String dirs, Integer depid) {
-        try {
-            List<DictEntity> list = baseQueryService.selectTabCount(name, dirs, depid);
 
             return success(list);
         } catch (Exception ex) {

--
Gitblit v1.9.3