From 160e150009b51a39fa95d9462c3798ba28d51a09 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 15 八月 2023 08:49:47 +0800
Subject: [PATCH] 审批页面修改
---
src/main/java/com/whyc/controller/BattalarmDataController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattalarmDataController.java b/src/main/java/com/whyc/controller/BattalarmDataController.java
index 73a7af0..8b370a9 100644
--- a/src/main/java/com/whyc/controller/BattalarmDataController.java
+++ b/src/main/java/com/whyc/controller/BattalarmDataController.java
@@ -1,6 +1,6 @@
package com.whyc.controller;
-import com.whyc.dto.Batt_Maint_Dealarm;
+import com.whyc.dto.BattMaintDealarm;
import com.whyc.dto.Page;
import com.whyc.dto.Response;
import com.whyc.dto.paramter.AlarmPar;
@@ -17,7 +17,7 @@
import java.util.List;
-@Api(tags = "鐢垫睜鍛婅-瀹炴椂鍛婅")
+@Api(tags = "鍛婅绠＄悊-鐢垫睜鍛婅瀹炴椂鏌ヨ")
@RestController
@RequestMapping("Battalarm_dataAction")
public class BattalarmDataController {
@@ -25,9 +25,9 @@
@Autowired
private BattalarmDataService service;
- /*@GetMapping("/getAll")
- @ApiOperation(value = "鏌ヨ鎵�鏈夌殑瀹炴椂鍛婅")*/
- public Response<List<BattalarmData>> getAll(){
+ @GetMapping("/getAll")
+ @ApiOperation(value = "鏌ヨ鎵�鏈夌殑瀹炴椂鍛婅")
+ public Response getAll(){
return service.getAll();
}
@@ -37,7 +37,7 @@
return service.getAllByPage(page);
}
//娴嬭瘯
- public Response<List<Batt_Maint_Dealarm>> test(@RequestBody BattalarmData battalarmData){
+ public Response<List<BattMaintDealarm>> test(@RequestBody BattalarmData battalarmData){
return service.test(battalarmData);
}
@PostMapping("/serchByCondition")
@@ -111,7 +111,7 @@
@ApiOperation(value = "鑾峰彇搴曢儴鐢垫睜鍛婅",notes = "椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ鏈�鏂扮數姹犲憡璀�(鐢垫睜鍛婅鍜岃澶囧憡璀︾瓫閫夊嚭鏈�鏂扮殑浜旀潯)")
public Response getRealAlarm(){
UserInf userInf = ActionUtil.getUser();
- return service.getRealAlarm(userInf.getUId().intValue());
+ return service.getRealAlarm(userInf.getUId().intValue(), null);
}
--
Gitblit v1.9.1