From c3ca2f26a73dc5fc7dc6f652a159c2697abd53cf Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 05 十二月 2022 22:01:44 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/data/ProjectController.java |   40 +++++++++++++++++++++++-----------------
 src/main/java/com/lf/server/mapper/data/DirMapper.java             |    7 +++++++
 src/main/resources/mapper/data/DirMapper.xml                       |    4 ++++
 说明.txt                                                             |    3 +++
 src/main/java/com/lf/server/service/data/DirService.java           |    5 +++++
 5 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/data/ProjectController.java b/src/main/java/com/lf/server/controller/data/ProjectController.java
index ebb4474..a327c34 100644
--- a/src/main/java/com/lf/server/controller/data/ProjectController.java
+++ b/src/main/java/com/lf/server/controller/data/ProjectController.java
@@ -1,5 +1,8 @@
 package com.lf.server.controller.data;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lf.server.annotation.SysLog;
 import com.lf.server.controller.all.BaseController;
 import com.lf.server.entity.all.ResponseMsg;
@@ -24,9 +27,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 椤圭洰绠$悊
@@ -64,11 +65,12 @@
     }
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ鎵�鏈夌洰褰曟暟鎹�")
-    @GetMapping(value = "/selectDirAll")
-    public ResponseMsg<List<DirEntity>> selectDirAll() {
+    @ApiOperation(value = "鏌ヨ鏍圭洰褰�")
+    @GetMapping(value = "/selectDirRoot")
+    public ResponseMsg<List<DirEntity>> selectDirRoot() {
         try {
-            List<DirEntity> list = dirService.selectDirAll();
+            List<DirEntity> list = dirService.selectDirRoot();
+
             return success(list);
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
@@ -76,22 +78,26 @@
     }
 
     @SysLog()
-    @ApiOperation(value = "鏍规嵁鐩綍ID鏌ヨ")
+    @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "int", paramType = "query", example = "0")
+            @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1"),
+            @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
+            @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
-    @GetMapping(value = "/selectByDirid")
-    public ResponseMsg<BsprojectEntity> selectByDirid(int dirid) {
+    @GetMapping(value = "/selectByPageAndCount")
+    public ResponseMsg<Object> selectByPageAndCount(Integer dirid, Integer pageSize, Integer pageIndex) {
         try {
-            Map<String, Object> map = new HashMap<>(1);
-            map.put("dirid", dirid);
-
-            List<BsprojectEntity> list = bsprojectMapper.selectByMap(map);
-            if (null == list || list.isEmpty()) {
-                return success(null);
+            QueryWrapper<BsprojectEntity> wrapper = null;
+            if (null != dirid) {
+                wrapper = new QueryWrapper<>();
+                wrapper.eq("dirid", dirid);
             }
 
-            return success(list.get(0));
+            Page<BsprojectEntity> page = new Page<>(pageIndex, pageSize);
+            page.addOrder(OrderItem.asc("gid"));
+            Page paged = bsprojectMapper.selectPage(page, wrapper);
+
+            return success(paged.getTotal(), paged.getRecords());
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
         }
diff --git a/src/main/java/com/lf/server/mapper/data/DirMapper.java b/src/main/java/com/lf/server/mapper/data/DirMapper.java
index c1f986a..2f86605 100644
--- a/src/main/java/com/lf/server/mapper/data/DirMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/DirMapper.java
@@ -79,6 +79,13 @@
     public List<DirEntity> selectDirAll();
 
     /**
+     * 鏌ヨ鏍圭洰褰�
+     *
+     * @return
+     */
+    public List<DirEntity> selectDirRoot();
+
+    /**
      * 閫掑綊鏌ヨ
      *
      * @param name
diff --git a/src/main/java/com/lf/server/service/data/DirService.java b/src/main/java/com/lf/server/service/data/DirService.java
index c170b97..e12183d 100644
--- a/src/main/java/com/lf/server/service/data/DirService.java
+++ b/src/main/java/com/lf/server/service/data/DirService.java
@@ -59,6 +59,11 @@
     }
 
     @Override
+    public List<DirEntity> selectDirRoot() {
+        return dirMapper.selectDirRoot();
+    }
+
+    @Override
     public List<DirEntity> selectDirRecursive(String name) {
         return dirMapper.selectDirRecursive(name);
     }
diff --git a/src/main/resources/mapper/data/DirMapper.xml b/src/main/resources/mapper/data/DirMapper.xml
index 01ea475..a4b6bf9 100644
--- a/src/main/resources/mapper/data/DirMapper.xml
+++ b/src/main/resources/mapper/data/DirMapper.xml
@@ -18,6 +18,10 @@
         select * from lf.sys_dir order by order_num;
     </select>
 
+    <select id="selectDirRoot" resultType="com.lf.server.entity.data.DirEntity">
+        select * from lf.sys_dir where pid=0 order by order_num;
+    </select>
+
     <select id="selectDirRecursive" resultMap="resultMap" resultType="com.lf.server.entity.data.DirEntity">
         with recursive rs as(
             select * from lf.sys_dir where name=#{name}
diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt"
index ebd4109..9499266 100644
--- "a/\350\257\264\346\230\216.txt"
+++ "b/\350\257\264\346\230\216.txt"
@@ -59,6 +59,9 @@
 58.
 59.
 60.
+
+Access:
+https://blog.csdn.net/weixin_43407520/article/details/122165848
 -----------------------------------------------
 .寮�鍙戜笂浼爏hp鏂囦欢杞崲涓篔SON鏁版嵁鎺ュ彛
 .寮�鍙戣鍙朎xcel琛ㄦ牸鍔熻兘

--
Gitblit v1.9.3