From 925f925c2073d7ef0c827c1e9b97d3c008c8ff0e Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 27 十月 2022 15:53:44 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/data/DataQueryController.java |   47 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/data/DataQueryController.java b/src/main/java/com/lf/server/controller/data/DataQueryController.java
index e4d3915..084d0a3 100644
--- a/src/main/java/com/lf/server/controller/data/DataQueryController.java
+++ b/src/main/java/com/lf/server/controller/data/DataQueryController.java
@@ -1,5 +1,9 @@
 package com.lf.server.controller.data;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lf.server.aspect.SysLog;
 import com.lf.server.controller.all.BaseController;
 import com.lf.server.entity.all.ResponseMsg;
@@ -12,7 +16,6 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.lf.server.mapper.bd.*;
 
 import java.util.List;
 
@@ -27,48 +30,58 @@
     @SysLog()
     @ApiOperation(value = "鏌ヨ璁板綍鏁�")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "ns", value = "鍚嶇О绌洪棿", dataType = "String", paramType = "query", example = "bd"),
-            @ApiImplicitParam(name = "entity", value = "瀹炰綋鍚嶇О", dataType = "String", paramType = "query", example = "DlgAgnp")
+            @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp")
     })
     @GetMapping({"/selectCount"})
-    public ResponseMsg<Integer> selectCount(String ns, String entity) {
+    public ResponseMsg<Long> selectCount(String name) {
         try {
-            if (StringHelper.isEmpty(ns) || StringHelper.isEmpty(entity)) {
+            if (StringHelper.isEmpty(name)) {
                 return fail("鍚嶇О绌洪棿鍜屽疄浣撳悕绉颁笉鑳戒负绌�", null);
             }
 
-            String className = String.format("com.lf.server.mapper.%s.%sMapper", ns.trim(), entity.trim());
-            Object obj = ClassHelper.createInstance(className);
-            if (obj == null) {
+            Object obj = ClassHelper.getBean(name.trim() + "Mapper");
+            if (!(obj instanceof BaseMapper)) {
                 return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
             }
-            
 
+            BaseMapper baseMapper = (BaseMapper) obj;
+            long count = baseMapper.selectCount(null);
 
-
-            int count = 0;
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex.getMessage(), null);
         }
     }
 
     @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "ns", value = "鍚嶇О绌洪棿", dataType = "String", paramType = "query", example = "bd"),
-            @ApiImplicitParam(name = "entity", value = "瀹炰綋鍚嶇О", dataType = "String", paramType = "query", example = "DlgAgnp")
+            @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp"),
+            @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1"),
+            @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10")
     })
     @GetMapping(value = "/selectByPage")
-    public ResponseMsg<List<Object>> selectByPage(String ns, String entity, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<Object>> selectByPage(String name, Integer pageIndex, Integer pageSize) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
             }
+            if (StringHelper.isEmpty(name)) {
+                return fail("鍚嶇О绌洪棿鍜屽疄浣撳悕绉颁笉鑳戒负绌�", null);
+            }
 
-            List<Object> rs = null;
+            Object obj = ClassHelper.getBean(name.trim() + "Mapper");
+            if (!(obj instanceof BaseMapper)) {
+                return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+            }
 
-            return success(rs);
+            BaseMapper baseMapper = (BaseMapper) obj;
+            Page<Object> page = new Page<>(pageIndex, pageSize);
+            page.addOrder(OrderItem.asc("gid"));
+
+            IPage<Object> paged = baseMapper.selectPage(page, null);
+
+            return success(paged.getTotal(), paged.getRecords());
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
         }

--
Gitblit v1.9.3