From 9513fe9cc622eca5659cf055da1a1f315f80b555 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 27 二月 2023 10:51:41 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/all/BaseQueryController.java |   60 +++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 35 insertions(+), 25 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 dc471fc..b99a06e 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -10,10 +10,7 @@
 import com.lf.server.entity.ctrl.IdNameEntity;
 import com.lf.server.entity.ctrl.KeyValueEntity;
 import com.lf.server.entity.ctrl.TabEntity;
-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.data.*;
 import com.lf.server.entity.sys.AttachEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.AesHelper;
@@ -22,6 +19,7 @@
 import com.lf.server.mapper.all.BasicMapper;
 import com.lf.server.mapper.all.GeomBaseMapper;
 import com.lf.server.service.all.BaseQueryService;
+import com.lf.server.service.data.DirService;
 import com.lf.server.service.data.DownloadService;
 import com.lf.server.service.data.MetaService;
 import com.lf.server.service.show.DataLibService;
@@ -51,6 +49,9 @@
 
     @Autowired
     DepService depService;
+
+    @Autowired
+    DirService dirService;
 
     @Autowired
     MetaService metaService;
@@ -566,11 +567,11 @@
                 return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
 
-            int count = downloadService.selectCountForUser(ue.getCreateUser(), 4, name);
+            int count = downloadService.selectCountForUser(ue.getId(), 4, name);
             if (count == 0) {
                 return success(0, null);
             }
-            List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getCreateUser(), 4, name, pageSize, pageSize * (pageIndex - 1));
+            List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), 4, name, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
         } catch (Exception ex) {
@@ -579,24 +580,14 @@
     }
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ鍩虹鍦扮悊绫诲埆")
-    @GetMapping(value = "/selectBaseType")
-    public ResponseMsg<Object> selectBaseType() {
+    @ApiOperation(value = "鏌ヨ鐩綍绫诲埆")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "D")
+    })
+    @GetMapping(value = "/selectDirTypes")
+    public ResponseMsg<Object> selectDirTypes(String name) {
         try {
-            List<KeyValueEntity> list = baseQueryService.selectBaseType();
-
-            return success(list);
-        } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "鏌ヨ涓氬姟绫诲埆")
-    @GetMapping(value = "/selectBusinessType")
-    public ResponseMsg<Object> selectBusinessType() {
-        try {
-            List<KeyValueEntity> list = baseQueryService.selectBusinessType();
+            List<KeyValueEntity> list = baseQueryService.selectDirTypes(name);
 
             return success(list);
         } catch (Exception ex) {
@@ -606,14 +597,33 @@
 
     @SysLog()
     @ApiOperation(value = "鏌ヨ椤圭洰鍚嶇О")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "瑗�")
+    })
     @GetMapping(value = "/selectProject")
-    public ResponseMsg<Object> selectProject() {
+    public ResponseMsg<Object> selectProject(String name) {
         try {
-            List<KeyValueEntity> list = baseQueryService.selectProject();
+            List<DirEntity> list = dirService.selectProject(name);
 
             return success(list);
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
         }
     }
+
+    @SysLog()
+    @ApiOperation(value = "鏍规嵁婧愭暟鎹甀D鏌ヨ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
+    })
+    @GetMapping(value = "/selectMetaById")
+    public ResponseMsg<MetaEntity> selectMetaById(int id) {
+        try {
+            MetaEntity entity = metaService.selectById(id);
+
+            return success(entity);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3