From 8e85ad8e022d2885c410d0654bce08e2a392b08f Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 14 四月 2025 09:15:55 +0800
Subject: [PATCH] 放电记录查询

---
 src/main/java/com/whyc/controller/BattTestInfController.java |   34 +++++++++++++++++++---------------
 1 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/whyc/controller/BattTestInfController.java b/src/main/java/com/whyc/controller/BattTestInfController.java
index 36426d6..549f556 100644
--- a/src/main/java/com/whyc/controller/BattTestInfController.java
+++ b/src/main/java/com/whyc/controller/BattTestInfController.java
@@ -4,7 +4,6 @@
 import com.whyc.dto.Response;
 import com.whyc.service.BattTestInfDataService;
 import com.whyc.service.BattTestInfService;
-import com.whyc.util.ActionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,30 +11,35 @@
 
 @RestController
 @Api(tags = "鐢垫睜缁勫厖鏀剧數璁板綍")
-@RequestMapping("tinf")
+@RequestMapping("battTestInf")
 public class BattTestInfController {
     @Autowired
     private BattTestInfService service;
     @Autowired
     private BattTestInfDataService dataService;
 
-    @ApiOperation("鏌ヨ鍏呮斁鐢佃褰�")
-    @GetMapping("getTinfHis")
-    public Response getTinfHis(@RequestParam int binfId
+    /*@ApiOperation("鏌ヨ鍒嗛〉-鐢垫睜缁勭殑鍏呮斁鐢佃褰�")
+    @GetMapping("getPageByBattGroupId")
+    public Response getPageByBattGroupId(@RequestParam int battGroupId
             , @RequestParam int pageNum, @RequestParam int pageSize){
-        Response res=service.getTinfHis(binfId,pageNum,pageSize);
-        return res;
+        return service.getPageByBattGroupId(battGroupId,pageNum,pageSize);
+    }*/
+
+    @GetMapping("getDischargePage")
+    public Response getDischargePage(@RequestParam int pageNum,@RequestParam int pageSize){
+        return service.getDischargePage(pageNum,pageSize);
     }
 
-    @ApiOperation("鏍规嵁鍏呮斁鐢佃褰曟煡璇㈠崟浣撴斁鐢靛巻鍙茶鎯�")
-    @GetMapping("getTDataHis")
-    public Response getTDataHis(@RequestParam int binfId,@RequestParam int testRecordCount){
-        Response res=dataService.getTDataHis(binfId,testRecordCount);
+    /*//鏍规嵁鍏呮斁鐢佃褰曟煡璇㈠崟浣撴斁鐢靛巻鍙茶鎯�
+    @ApiOperation("鏌ヨ鍗曟鏀剧數璁板綍璇︽儏")
+    @GetMapping("getByBattGroupIdAndTestRecordCount")
+    public Response getByBattGroupIdAndTestRecordCount(@RequestParam int battGroupId,@RequestParam int testRecordCount){
+        Response res=dataService.getByBattGroupIdAndTestRecordCount(battGroupId,testRecordCount);
         return res;
-    }
+    }*/
 
 
-    @PostMapping("searchGroupAssess")
+    /*@PostMapping("searchGroupAssess")
     @ApiOperation(value = "钃勭數姹犵粍鍚庤瘎浼�")
     public Response searchByCondition(@RequestParam int pageNum,@RequestParam int pageSize, @RequestBody ReportBattDTO tinf) {
         return service.searchGroupAssess(pageNum,pageSize,tinf,1001);
@@ -46,6 +50,6 @@
     @ApiOperation(value = "鐢垫睜鍗曚綋鎬ц兘璇勪及")
     public Response searchMonNumAssess(@RequestParam int binfId,@RequestParam int monNum){
         return service.searchMonNumAssess(binfId,monNum);
-    }
+    }*/
 
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1