From 970bc6b960117a15e6e7d87d0615ab0371b15708 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期三, 22 二月 2023 14:01:17 +0800
Subject: [PATCH] 20230221@xingjs@提交官网一张图相关内容接口

---
 src/main/java/com/lf/server/controller/all/BaseQueryController.java |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 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 7b830b5..96002cf 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -13,6 +13,7 @@
 import com.lf.server.entity.data.DictEntity;
 import com.lf.server.entity.data.DomainEntity;
 import com.lf.server.entity.data.DownloadEntity;
+import com.lf.server.entity.data.MetaEntity;
 import com.lf.server.entity.sys.AttachEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.AesHelper;
@@ -22,6 +23,7 @@
 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.MetaService;
 import com.lf.server.service.show.DataLibService;
 import com.lf.server.service.sys.AttachService;
 import com.lf.server.service.sys.DepService;
@@ -49,6 +51,9 @@
 
     @Autowired
     DepService depService;
+
+    @Autowired
+    MetaService metaService;
 
     @Autowired
     DataLibService dataLibService;
@@ -125,6 +130,37 @@
             IPage<Object> paged = baseMapper.selectPage(page, wrapper);
 
             return success(paged.getTotal(), paged.getRecords());
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏍规嵁鐖禝D鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "metaid", value = "鐖禝D", dataType = "String", paramType = "query", example = "0"),
+            @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 = "/selectPageAndCountByPid")
+    public ResponseMsg<List<MetaEntity>> selectPageAndCountByPid(Integer metaid, String name, Integer pageSize, Integer pageIndex) {
+        try {
+            if (pageSize < 1 || pageIndex < 1) {
+                return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+            }
+            if (null == metaid || metaid < 1) {
+                return fail("鐖禝D涓嶈兘涓虹┖涓斿ぇ浜�1", null);
+            }
+
+            int count = metaService.selectCountByPid(metaid, name);
+            if (count == 0) {
+                return success(0, null);
+            }
+
+            List<MetaEntity> rs = metaService.selectPageByPid(metaid, name, pageSize, pageSize * (pageIndex - 1));
+
+            return success(count, rs);
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
         }
@@ -470,7 +506,8 @@
             }
 
             UserEntity ue = tokenService.getCurrentUser(req);
-            String guid = dataLibService.createZipFile(ue, dre.getEntities(), dre.getWkt(), dre.getPwd());
+            String depcode = null == dre.getDepcodes() || dre.getDepcodes().isEmpty() ? null : dre.getDepcodes().get(0);
+            String guid = dataLibService.createZipFile(ue, dre.getEntities(), depcode, dre.getDirs(), dre.getWkt(), dre.getPwd());
 
             return success(guid);
         } catch (Exception ex) {
@@ -501,7 +538,8 @@
             }
 
             UserEntity ue = tokenService.getCurrentUser(req);
-            String guid = dataLibService.zipDbData(ue, dre.getEntities().get(0), dre.getFilter(), dre.getPwd());
+            String depcode = null == dre.getDepcodes() || dre.getDepcodes().isEmpty() ? null : dre.getDepcodes().get(0);
+            String guid = dataLibService.zipDbData(ue, dre.getEntities().get(0), depcode, dre.getDirs(), dre.getFilter(), dre.getPwd());
 
             return success(guid);
         } catch (Exception ex) {

--
Gitblit v1.9.3