From e16302f9d475c7cc4dd18c5abf1a23cb5502e362 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 28 五月 2025 14:57:56 +0800
Subject: [PATCH] 密码验证加-

---
 src/main/java/com/whyc/controller/BattalarmDataHistoryController.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/whyc/controller/BattalarmDataHistoryController.java b/src/main/java/com/whyc/controller/BattalarmDataHistoryController.java
index 1c9124b..d1b0192 100644
--- a/src/main/java/com/whyc/controller/BattalarmDataHistoryController.java
+++ b/src/main/java/com/whyc/controller/BattalarmDataHistoryController.java
@@ -12,12 +12,13 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.ParseException;
 import java.util.List;
 
-@Api(tags = "鐢垫睜鍛婅-鍘嗗彶鍛婅")
+@Api(tags = "鍛婅绠$悊-鐢垫睜鍛婅鍘嗗彶鏌ヨ")
 @RestController
 @RequestMapping("BattalarmDataHistoryAction")
-public class BattalarmDataHistoryController {
+public class BattalarmDataHistoryController extends BaseController{
 
     @Autowired
     private BattalarmDataHistoryService service;
@@ -25,9 +26,18 @@
 
     @PostMapping("/serchByInfo")
     @ApiOperation(value = "鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ")
-    public Response serchByInfo(@RequestBody AlarmPar par){
-        return service.serchByInfo(par);
+    public Response serchByInfo(@RequestBody AlarmPar param) throws ParseException, InterruptedException {
+        //return service.serchByInfo(par);
+        return service.getPageInfo(param);
     }
+
+    @PostMapping("levelList")
+    @ApiOperation(value = "鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ-鍛婅绛夌骇鍒嗙被缁熻")
+    public Response getLevelList() throws ParseException {
+        //return service.serchByInfo(par);
+        return service.getLevelList();
+    }
+
     @PostMapping("/delete")
     @ApiOperation(value = "鍒犻櫎鍘嗗彶鍛婅璁板綍")
     public Response<List<AlarmRes>> delete(@RequestBody List<Integer> list){

--
Gitblit v1.9.1