From b25b814a949d2065a61fd3167206ffb51a57af65 Mon Sep 17 00:00:00 2001 From: whyclxw <810412026@qq.com> Date: 星期日, 28 四月 2024 15:31:09 +0800 Subject: [PATCH] 修改告警阈值重启线程 --- src/main/java/com/whyc/controller/BattalarmDataController.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/whyc/controller/BattalarmDataController.java b/src/main/java/com/whyc/controller/BattalarmDataController.java index ff7b915..674412c 100644 --- a/src/main/java/com/whyc/controller/BattalarmDataController.java +++ b/src/main/java/com/whyc/controller/BattalarmDataController.java @@ -20,14 +20,14 @@ @Api(tags = "鍛婅绠$悊-鐢垫睜鍛婅瀹炴椂鏌ヨ") @RestController @RequestMapping("Battalarm_dataAction") -public class BattalarmDataController { +public class BattalarmDataController extends BaseController{ @Autowired private BattalarmDataService service; - /*@GetMapping("/getAll") - @ApiOperation(value = "鏌ヨ鎵�鏈夌殑瀹炴椂鍛婅")*/ - public Response<List<BattalarmData>> getAll(){ + @GetMapping("/getAll") + @ApiOperation(value = "鏌ヨ鎵�鏈夌殑瀹炴椂鍛婅") + public Response getAll(){ return service.getAll(); } @@ -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