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/PwrdevAlarmHistoryController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/controller/PwrdevAlarmHistoryController.java b/src/main/java/com/whyc/controller/PwrdevAlarmHistoryController.java
index ca1f429..8ce409a 100644
--- a/src/main/java/com/whyc/controller/PwrdevAlarmHistoryController.java
+++ b/src/main/java/com/whyc/controller/PwrdevAlarmHistoryController.java
@@ -8,13 +8,14 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.text.ParseException;
import java.util.List;
-@Api(tags = "鐢垫簮鍛婅-鍘嗗彶鍛婅")
+@Api(tags = "鍛婅绠＄悊-鐢垫簮鍘嗗彶鍛婅")
@RestController
@RequestMapping("PwrdevAlarmHistoryAction")
-public class PwrdevAlarmHistoryController {
+public class PwrdevAlarmHistoryController extends BaseController{
@Autowired
private PwrdevAlarmHistoryService service;
@@ -22,8 +23,16 @@
//鐢垫簮鍘嗗彶鍛婅鏌ヨ
@ApiOperation(value = "鐢垫簮鍘嗗彶鍛婅鏌ヨ",notes = "almTypes,almSource,almStartTime,almStartTime1,pageCurr,pageSize,usrId,stationName1,stationName2,stationName3,stationName5")
@PostMapping("/getHistoryAllPage")
- public Response getHistoryAllPage(@RequestBody PwrdevAlarmHistory pwrH){
- return service.getHistoryAllPage(pwrH);
+ public Response getHistoryAllPage(@RequestBody PwrdevAlarmHistory param) throws ParseException {
+ //return service.getHistoryAllPage(pwrH);
+ return service.getPageInfo(param);
+ }
+
+ @PostMapping("levelList")
+ @ApiOperation(value = "鐢垫簮鍛婅鍘嗗彶璁板綍鏌ヨ-鍛婅绛夌骇鍒嗙被缁熻")
+ public Response getLevelList(@RequestBody List<Integer> almTypes) throws ParseException {
+ //return service.serchByInfo(par);
+ return service.getLevelList(almTypes);
}
//鐢垫睜鍘嗗彶鍛婅鍒犻櫎
@@ -42,8 +51,9 @@
//閫氳鐢垫簮鍘嗗彶鍛婅鏌ヨ
@ApiOperation(value = "閫氳鐢垫簮鍘嗗彶鍛婅鏌ヨ",notes = "almTypes,almSource,almStartTime,almStartTime1,pageCurr,pageSize,usrId,stationName1,stationName2,stationName3,stationName5")
@PostMapping("/getHistoryAllPage2")
- public Response getHistoryAllPage2(@RequestBody PwrdevAlarmHistory pwrH){
- return service.getHistoryAllPage2(pwrH);
+ public Response getHistoryAllPage2(@RequestBody PwrdevAlarmHistory param) throws ParseException {
+ //return service.getHistoryAllPage2(pwrH);
+ return service.getPageInfoForTX(param);
}
}
--
Gitblit v1.9.1