From e223614a8488dcb22178ac3523678963ce68f589 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 26 九月 2022 17:13:45 +0800
Subject: [PATCH] 按照筛选条件查询数据库信息

---
 src/main/java/com/whyc/controller/FileParamController.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/controller/FileParamController.java b/src/main/java/com/whyc/controller/FileParamController.java
index e873632..326ac35 100644
--- a/src/main/java/com/whyc/controller/FileParamController.java
+++ b/src/main/java/com/whyc/controller/FileParamController.java
@@ -25,12 +25,14 @@
     public Response getMonVolStd(){
         return service.getMonVolStd();
     }
-    
+
     @ApiOperation("鎸夌収绛涢�夋潯浠舵煡璇㈡暟鎹簱淇℃伅")
     @GetMapping("getDataByCondition")
     public Response getDataByCondition(@RequestParam(required = false ,defaultValue = "1982-01-01 00:00:00") String startTime
                                        , @RequestParam(required = false,defaultValue = "2222-01-01 00:00:00") String endTime
-                                       , @RequestParam(required = false) int battVol)  {
+                                       , @RequestParam(required = false) int battVol
+                                       ,@RequestParam(required = false ,defaultValue = "1") int pageCurr
+                                        ,@RequestParam(required = false ,defaultValue = "10") int pageSize)  {
         Date testTime1= null;
         Date testTime2= null;
         try {
@@ -39,7 +41,7 @@
         } catch (ParseException e) {
             e.printStackTrace();
         }
-        return service.getDataByCondition(testTime1,testTime2,battVol);
+        return service.getDataByCondition(testTime1,testTime2,battVol,pageCurr,pageSize);
     }
 
     @ApiOperation("鍒嗙骇璇勪环-绯绘暟鍙婇槇鍊兼煡璇�")

--
Gitblit v1.9.1