From c2b79c30c9f8f782624e224c65f61efa98d90078 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 11 六月 2025 19:44:49 +0800
Subject: [PATCH] 电池电源告警参数修改

---
 src/main/java/com/whyc/controller/AlmParamController.java   |   17 +++++++++++++++--
 src/main/java/com/whyc/service/BattAlmparamService.java     |   11 ++++++-----
 src/main/java/com/whyc/service/PwrdevAlarmParamService.java |   11 ++++++-----
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/whyc/controller/AlmParamController.java b/src/main/java/com/whyc/controller/AlmParamController.java
index 04445f4..50a2e27 100644
--- a/src/main/java/com/whyc/controller/AlmParamController.java
+++ b/src/main/java/com/whyc/controller/AlmParamController.java
@@ -34,11 +34,17 @@
     private PwrdevAlarmParamService pwrAlmparamService;
 
 
-    @PostMapping("getBattAlmParam")
+    /*@PostMapping("getBattAlmParam")
     @ApiOperation("鑾峰彇鐢垫睜鍛婅鍙傛暟")
     public Response getBattAlmParam(@RequestBody AlmDto almDto){
         almDto.setUid(ActionUtil.getUser().getId());
         return battAlmparamService.getBattAlmParam(almDto);
+    }*/
+
+    @GetMapping("getBattAlmParam")
+    @ApiOperation("鑾峰彇鐢垫睜鍛婅鍙傛暟")
+    public Response getBattAlmParam(@RequestParam Integer battgroupId){
+        return battAlmparamService.getBattAlmParam(battgroupId);
     }
 
     @PostMapping("setBattAlmParam")
@@ -59,13 +65,20 @@
         return devAlmparamService.setDevAlmParam(almparamList);
     }
 
-    @PostMapping("getPwrAlmParam")
+    /*@PostMapping("getPwrAlmParam")
     @ApiOperation("鑾峰彇鐢垫簮鍛婅鍙傛暟")
     public Response getPwrAlmParam(@RequestBody AlmDto almDto){
         almDto.setUid(ActionUtil.getUser().getId());
         return pwrAlmparamService.getPwrAlmParam(almDto);
+    }*/
+
+    @GetMapping("getPwrAlmParam")
+    @ApiOperation("鑾峰彇鐢垫簮鍛婅鍙傛暟")
+    public Response getPwrAlmParam(@RequestParam Integer powerId){
+        return pwrAlmparamService.getPwrAlmParam(powerId);
     }
 
+
     @PostMapping("setPwrAlmParam")
     @ApiOperation("淇敼鐢垫簮鍛婅鍙傛暟")
     public Response setPwrAlmParam(@RequestBody List<PwrdevAlarmParam> almparamList){
diff --git a/src/main/java/com/whyc/service/BattAlmparamService.java b/src/main/java/com/whyc/service/BattAlmparamService.java
index 4802243..3059345 100644
--- a/src/main/java/com/whyc/service/BattAlmparamService.java
+++ b/src/main/java/com/whyc/service/BattAlmparamService.java
@@ -18,11 +18,12 @@
     @Autowired(required = false)
     private BattAlmparamMapper mapper;
     //鑾峰彇鐢垫睜鍛婅鍙傛暟
-    public Response getBattAlmParam(AlmDto almDto) {
-        PageHelper.startPage(almDto.getPageNum(),almDto.getPageSize());
-        List<BattAlmparam> list = mapper.getBattAlmParam(almDto);
-        PageInfo  pageInfo=new PageInfo(list);
-        return new Response().setII(1,list!=null,pageInfo,"鑾峰彇鐢垫睜鍛婅鍙傛暟");
+    public Response getBattAlmParam(Integer battgroupId) {
+        QueryWrapper wrapper=new QueryWrapper();
+        wrapper.eq("battgroup_id",battgroupId);
+        wrapper.orderByAsc("alm_id");
+        List<BattAlmparam> list = mapper.selectList(wrapper);
+        return new Response().setII(1,list!=null,list,"鑾峰彇鐢垫睜鍛婅鍙傛暟");
     }
     //淇敼鐢垫睜鍛婅鍙傛暟
     public Response setBattAlmParam(List<BattAlmparam> almparamList) {
diff --git a/src/main/java/com/whyc/service/PwrdevAlarmParamService.java b/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
index d96471c..b967edf 100644
--- a/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
+++ b/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
@@ -26,11 +26,12 @@
     private PwrdevAlarmParamMapper mapper;
 
     //鑾峰彇鐢垫簮鍛婅鍙傛暟
-    public Response getPwrAlmParam(AlmDto almDto) {
-        PageHelper.startPage(almDto.getPageNum(),almDto.getPageSize());
-        List<PwrdevAlarmParam> list = mapper.getPwrAlmParam(almDto);
-        PageInfo pageInfo=new PageInfo(list);
-        return new Response().setII(1,list!=null,pageInfo,"鑾峰彇鐢垫簮鍛婅鍙傛暟");
+    public Response getPwrAlmParam(Integer powerId) {
+        QueryWrapper wrapper=new QueryWrapper();
+        wrapper.eq("power_id",powerId);
+        wrapper.orderByAsc("alm_id");
+        List<PwrdevAlarmParam> list = mapper.selectList(wrapper);
+        return new Response().setII(1,list!=null,list,"鑾峰彇鐢垫簮鍛婅鍙傛暟");
     }
     //淇敼鐢垫簮鍛婅鍙傛暟
     public Response setPwrAlmParam(List<PwrdevAlarmParam> almparamList) {

--
Gitblit v1.9.1