From 85c49892c4f16720318a84d93152bc458d71e2d1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 07 二月 2023 17:00:08 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/data/MetaController.java |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index f64dd71..56dab7e 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -13,6 +13,7 @@
 import com.lf.server.entity.data.DictEntity;
 import com.lf.server.entity.data.DownloadEntity;
 import com.lf.server.entity.data.MetaEntity;
+import com.lf.server.entity.data.VerEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.ClassHelper;
 import com.lf.server.helper.Md5Helper;
@@ -22,6 +23,7 @@
 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.data.VerService;
 import com.lf.server.service.sys.DownlogService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.*;
@@ -58,28 +60,32 @@
     @Autowired
     DownloadService downloadService;
 
+    @Autowired
+    VerService verService;
+
     @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 = "1"),
+            @ApiImplicitParam(name = "verid", value = "鐗堟湰ID", dataType = "Integer", 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 = "/selectByPageAndCount")
-    public ResponseMsg<List<MetaEntity>> selectByPageAndCount(Integer depid, Integer dirid, String name, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<MetaEntity>> selectByPageAndCount(Integer depid, Integer dirid, Integer verid, String name, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
             }
 
-            int count = metaService.selectCount(depid, dirid, name);
+            int count = metaService.selectCount(depid, dirid, verid, name);
             if (count == 0) {
                 return success(0, null);
             }
 
-            List<MetaEntity> rs = metaService.selectByPage(depid, dirid, name, pageSize, pageSize * (pageIndex - 1));
+            List<MetaEntity> rs = metaService.selectByPage(depid, dirid, verid, name, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
         } catch (Exception ex) {
@@ -88,6 +94,29 @@
     }
 
     @SysLog()
+    @ApiOperation(value = "鏍规嵁鐩綍ID鏌ヨ鐗堟湰鍒楄〃")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query")
+    })
+    @GetMapping(value = "/selectVerByDirid")
+    public ResponseMsg<List<VerEntity>> selectVerByDirid(Integer dirid) {
+        try {
+            if (null == dirid || dirid < 0) {
+                dirid = 0;
+            }
+
+            List<VerEntity> list = verService.selectByDirid(dirid);
+            if (null == list || list.isEmpty()) {
+                list = verService.selectByDirid(0);
+            }
+
+            return success(list);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
+
+    @SysLog()
     @ApiOperation(value = "鏌ヨ鎵�鏈�")
     @GetMapping(value = "/selectAll")
     public ResponseMsg<List<MetaEntity>> selectAll() {

--
Gitblit v1.9.3