From 90b5e3ce5a1fade99c63db8a37bf86b1c090415c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 23 十二月 2022 11:22:43 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/show/DataLibController.java |   63 ++-----------------------------
 1 files changed, 4 insertions(+), 59 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 cebc837..5146b2f 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -62,24 +62,25 @@
     @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
             @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
             @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
     @GetMapping(value = "/selectByPageForMeta")
-    public ResponseMsg<List<MetaEntity>> selectByPageForMeta(Integer dirid, String name, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<MetaEntity>> selectByPageForMeta(Integer depid, Integer dirid, String name, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
             }
 
-            int count = metaService.selectCount(dirid, name);
+            int count = metaService.selectCount(depid, dirid, name);
             if (count == 0) {
                 return success(0, null);
             }
 
-            List<MetaEntity> rs = metaService.selectByPage(dirid, name, pageSize, pageSize * (pageIndex - 1));
+            List<MetaEntity> rs = metaService.selectByPage(depid, dirid, name, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
         } catch (Exception ex) {
@@ -125,27 +126,6 @@
             IPage<Object> paged = baseMapper.selectPage(page, wrapper);
 
             return success(paged.getTotal(), paged.getRecords());
-        } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "鏌ヨ瀛楁淇℃伅")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ns", value = "鍚嶇О绌洪棿", dataType = "String", paramType = "query", example = "bd"),
-            @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg25wAanp")
-    })
-    @GetMapping(value = "/selectTabFields")
-    public ResponseMsg<List<DictEntity>> selectTabFields(String ns, String tab) {
-        try {
-            if (StringHelper.isEmpty(ns) || StringHelper.isEmpty(tab)) {
-                return fail("鍚嶇О绌洪棿鍜岃〃鍚嶄笉鑳戒负绌�", null);
-            }
-
-            List<DictEntity> list = baseQueryService.selectFields(ns, tab);
-
-            return success(list);
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
         }
@@ -265,41 +245,6 @@
             WebHelper.download(filePath, de.getName(), res);
         } catch (Exception ex) {
             WebHelper.writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "璇锋眰DB鏁版嵁涓嬭浇")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
-    })
-    @ResponseBody
-    @PostMapping(value = "/downloadDbReq")
-    public ResponseMsg<Object> downloadDbReq(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
-        try {
-            if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
-                return fail("瀵嗙爜涓嶈兘涓虹┖");
-            }
-            if (null == reqEntity.getEntities() || reqEntity.getEntities().isEmpty()) {
-                return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
-            }
-            reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
-            if (StringHelper.isEmpty(reqEntity.getWkt())) {
-                return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
-            }
-            if (!downloadService.decryptPwd(reqEntity)) {
-                return fail("瀵嗙爜瑙e瘑澶辫触", null);
-            }
-            if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
-                return fail("瀵嗙爜涓嶇鍚堣姹�");
-            }
-
-            UserEntity ue = tokenService.getCurrentUser(req);
-            String guid = dataLibService.createZipFile(ue, reqEntity.getEntities(), reqEntity.getWkt(), reqEntity.getPwd());
-
-            return success(guid);
-        } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
         }
     }
 }

--
Gitblit v1.9.3