From ba1b39b4acc0b89fad9ce9f3bfb475d35ea047cb Mon Sep 17 00:00:00 2001
From: whyclxw <http://whyclxw@118.89.139.230:10101/r/~whyclxw/IdeaTest.git>
Date: 星期一, 18 十月 2021 15:25:41 +0800
Subject: [PATCH] fg平台重构电池告警模块第一次提交
---
src/main/java/com/whyc/controller/BattalarmDataController.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattalarmDataController.java b/src/main/java/com/whyc/controller/BattalarmDataController.java
index be88bc3..ba0cc47 100644
--- a/src/main/java/com/whyc/controller/BattalarmDataController.java
+++ b/src/main/java/com/whyc/controller/BattalarmDataController.java
@@ -3,6 +3,10 @@
import com.whyc.dto.Batt_Maint_Dealarm;
import com.whyc.dto.Page;
import com.whyc.dto.Response;
+import com.whyc.dto.paramter.AlarmPar;
+import com.whyc.dto.result.AlarmNumberRes;
+import com.whyc.dto.result.AlarmRes;
+import com.whyc.dto.result.AlarmStaticRes;
import com.whyc.pojo.BattalarmData;
import com.whyc.service.BattalarmDataService;
import io.swagger.annotations.Api;
@@ -31,16 +35,35 @@
public Response<List<BattalarmData>> getAllByPage(@RequestBody Page page){
return service.getAllByPage(page);
}
-
+ //娴嬭瘯
+ public Response<List<Batt_Maint_Dealarm>> test(@RequestBody BattalarmData battalarmData){
+ return service.test(battalarmData);
+ }
@PostMapping("/serchByCondition")
- @ApiOperation(value = "鐢垫睜鍛婅瀹炴椂鏌ヨ")
- public Response<List<Batt_Maint_Dealarm>> serchByCondition(@RequestBody Batt_Maint_Dealarm bmd){
- return service.serchByCondition(bmd);
+ @ApiOperation(value = "鐢垫睜鍛婅瀹炴椂璁板綍鏌ヨ")
+ public Response<List<AlarmRes>> serchByCondition(@RequestBody AlarmPar par){
+ return service.serchByCondition(par);
}
@PostMapping("/serchByInfo")
@ApiOperation(value = "鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ")
- public Response<List<Batt_Maint_Dealarm>> serchByInfo(@RequestBody BattalarmData battalarmData){
- return service.serchByInfo(battalarmData);
+ public Response<List<AlarmRes>> serchByInfo(@RequestBody AlarmPar par){
+ return service.serchByInfo(par);
+ }
+ @PostMapping("/serchAlm")
+ @ApiOperation(value = "鏌ヨ瀹炴椂鍛婅鏁�")
+ public Response<AlarmNumberRes> serchAlm(@RequestBody AlarmPar par){
+ return service.serchAlm(par);
+ }
+ @PostMapping("/cancelalarm")
+ @ApiOperation(value = "鍙栨秷鍛婅")
+ public Response cancelalarm(@RequestBody BattalarmData adata){
+ return service.cancelalarm(adata);
+ }
+
+ @PostMapping("/cancelalarmPro")
+ @ApiOperation(value = "鎵归噺鍙栨秷鍛婅")
+ public Response cancelalarmPro(@RequestBody List<BattalarmData> list){
+ return service.cancelalarmPro(list);
}
}
--
Gitblit v1.9.1