From 52e7490e08cd4b591d8f81d9330b57ab5070773a Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 04 六月 2025 14:54:39 +0800
Subject: [PATCH] 添加告警名称
---
src/main/java/com/whyc/service/BattalarmDataService.java | 9 ++-
src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java | 3 +
src/main/java/com/whyc/service/DeviceStateService.java | 3 -
src/main/java/com/whyc/service/DevalarmDataService.java | 13 ++++
src/main/java/com/whyc/pojo/db_alarm/BattalarmData.java | 3 +
src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java | 3 +
src/main/java/com/whyc/constant/PowerAlarmEnum.java | 8 ++
src/main/java/com/whyc/controller/ConditionController.java | 23 ++++++-
src/main/java/com/whyc/constant/BattAlarmIdEnum.java | 43 +++++---------
src/main/java/com/whyc/constant/BattSingalIdEnum.java | 46 +++++++++------
src/main/java/com/whyc/service/PwrdevAlarmService.java | 11 +++
11 files changed, 109 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/whyc/constant/BattAlarmIdEnum.java b/src/main/java/com/whyc/constant/BattAlarmIdEnum.java
index 5eacc97..2edd1cb 100644
--- a/src/main/java/com/whyc/constant/BattAlarmIdEnum.java
+++ b/src/main/java/com/whyc/constant/BattAlarmIdEnum.java
@@ -4,34 +4,13 @@
import java.util.Map;
public enum BattAlarmIdEnum {
- ALARM_1(1,"鍦ㄧ嚎鐢靛帇涓婁笂闄愬憡璀�"),
- ALARM_2(2,"鍦ㄧ嚎鐢靛帇涓婇檺鍛婅"),
- ALARM_3(3,"鍦ㄧ嚎鐢靛帇涓嬮檺鍛婅"),
- ALARM_4(4,"鍦ㄧ嚎鐢靛帇涓嬩笅闄愬憡璀�"),
- ALARM_5(5,"缁勭鐢靛帇涓婁笂闄愬憡璀�"),
- ALARM_6(6,"缁勭鐢靛帇涓婇檺鍛婅"),
- ALARM_7(7,"缁勭鐢靛帇涓嬮檺鍛婅"),
- ALARM_8(8,"缁勭鐢靛帇涓嬩笅闄愬憡璀�"),
- ALARM_9(9,"鍏呯數鐢垫祦涓婁笂闄愬憡璀�"),
- ALARM_10(10,"鍏呯數鐢垫祦涓婇檺鍛婅"),
- ALARM_11(11,"鍏呯數鐢垫祦涓嬮檺鍛婅"),
- ALARM_12(12,"鍏呯數鐢垫祦涓嬩笅闄愬憡璀�"),
- ALARM_13(13,"鏀剧數鐢垫祦涓婁笂闄愬憡璀�"),
- ALARM_14(14,"鏀剧數鐢垫祦涓婇檺鍛婅"),
- ALARM_15(15,"鏀剧數鐢垫祦涓嬮檺鍛婅"),
- ALARM_16(16,"鏀剧數鐢垫祦涓嬩笅闄愬憡璀�"),
- ALARM_17(17,"鍗曚綋鐢靛帇涓婁笂闄愬憡璀�"),
- ALARM_18(18,"鍗曚綋鐢靛帇涓婇檺鍛婅"),
- ALARM_19(19,"鍗曚綋鐢靛帇涓嬮檺鍛婅"),
- ALARM_20(20,"鍗曚綋鐢靛帇涓嬩笅闄愬憡璀�"),
- ALARM_21(21,"鍗曚綋娓╁害涓婁笂闄愬憡璀�"),
- ALARM_22(22,"鍗曚綋娓╁害涓婇檺鍛婅"),
- ALARM_23(23,"鍗曚綋娓╁害涓嬮檺鍛婅"),
- ALARM_24(24,"鍗曚綋娓╁害涓嬩笅闄愬憡璀�"),
- ALARM_25(25,"鍗曚綋鍐呴樆涓婁笂闄愬憡璀�"),
- ALARM_26(26,"鍗曚綋鍐呴樆涓婇檺鍛婅"),
- ALARM_27(27,"鍗曚綋鍐呴樆涓嬮檺鍛婅"),
- ALARM_28(28,"鍗曚綋鍐呴樆涓嬩笅闄愬憡璀�"),
+ ALARM_119001(119001,"鍦ㄧ嚎鐢靛帇鍛婅"),
+ ALARM_119002(119002,"缁勭鐢靛帇鍛婅"),
+ ALARM_119003(119003,"鍏呯數鐢垫祦鍛婅"),
+ ALARM_119004(119004,"鏀剧數鐢垫祦鍛婅"),
+ ALARM_119005(119005,"鍗曚綋鐢靛帇鍛婅"),
+ ALARM_119006(119006,"鍗曚綋娓╁害鍛婅"),
+ ALARM_119007(119007,"鍗曚綋鍐呴樆鍛婅")
;
private Integer stateId;
@@ -61,4 +40,12 @@
}
return null;
}
+ public static Map<Integer,String> getOpInfo() {
+ Map<Integer,String> map=new HashMap<>();
+ for (BattAlarmIdEnum logOpEnum : BattAlarmIdEnum.values()) {
+ map.put(logOpEnum.getStateId(),logOpEnum.getStateName());
+ }
+ return map;
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/constant/BattSingalIdEnum.java b/src/main/java/com/whyc/constant/BattSingalIdEnum.java
index 6aaa0e8..aabc7e7 100644
--- a/src/main/java/com/whyc/constant/BattSingalIdEnum.java
+++ b/src/main/java/com/whyc/constant/BattSingalIdEnum.java
@@ -1,16 +1,34 @@
package com.whyc.constant;
-import java.util.HashMap;
-import java.util.Map;
-
public enum BattSingalIdEnum {
- ALARM_119001(119001,"鍦ㄧ嚎鐢靛帇鍛婅"),
- ALARM_119002(119002,"缁勭鐢靛帇鍛婅"),
- ALARM_119003(119003,"鍏呯數鐢垫祦鍛婅"),
- ALARM_119004(119004,"鏀剧數鐢垫祦鍛婅"),
- ALARM_119005(119005,"鍗曚綋鐢靛帇鍛婅"),
- ALARM_119006(119006,"鍗曚綋娓╁害鍛婅"),
- ALARM_119007(119007,"鍗曚綋鍐呴樆鍛婅")
+ ALARM_1(1,"鍦ㄧ嚎鐢靛帇涓婁笂闄愬憡璀�"),
+ ALARM_2(2,"鍦ㄧ嚎鐢靛帇涓婇檺鍛婅"),
+ ALARM_3(3,"鍦ㄧ嚎鐢靛帇涓嬮檺鍛婅"),
+ ALARM_4(4,"鍦ㄧ嚎鐢靛帇涓嬩笅闄愬憡璀�"),
+ ALARM_5(5,"缁勭鐢靛帇涓婁笂闄愬憡璀�"),
+ ALARM_6(6,"缁勭鐢靛帇涓婇檺鍛婅"),
+ ALARM_7(7,"缁勭鐢靛帇涓嬮檺鍛婅"),
+ ALARM_8(8,"缁勭鐢靛帇涓嬩笅闄愬憡璀�"),
+ ALARM_9(9,"鍏呯數鐢垫祦涓婁笂闄愬憡璀�"),
+ ALARM_10(10,"鍏呯數鐢垫祦涓婇檺鍛婅"),
+ ALARM_11(11,"鍏呯數鐢垫祦涓嬮檺鍛婅"),
+ ALARM_12(12,"鍏呯數鐢垫祦涓嬩笅闄愬憡璀�"),
+ ALARM_13(13,"鏀剧數鐢垫祦涓婁笂闄愬憡璀�"),
+ ALARM_14(14,"鏀剧數鐢垫祦涓婇檺鍛婅"),
+ ALARM_15(15,"鏀剧數鐢垫祦涓嬮檺鍛婅"),
+ ALARM_16(16,"鏀剧數鐢垫祦涓嬩笅闄愬憡璀�"),
+ ALARM_17(17,"鍗曚綋鐢靛帇涓婁笂闄愬憡璀�"),
+ ALARM_18(18,"鍗曚綋鐢靛帇涓婇檺鍛婅"),
+ ALARM_19(19,"鍗曚綋鐢靛帇涓嬮檺鍛婅"),
+ ALARM_20(20,"鍗曚綋鐢靛帇涓嬩笅闄愬憡璀�"),
+ ALARM_21(21,"鍗曚綋娓╁害涓婁笂闄愬憡璀�"),
+ ALARM_22(22,"鍗曚綋娓╁害涓婇檺鍛婅"),
+ ALARM_23(23,"鍗曚綋娓╁害涓嬮檺鍛婅"),
+ ALARM_24(24,"鍗曚綋娓╁害涓嬩笅闄愬憡璀�"),
+ ALARM_25(25,"鍗曚綋鍐呴樆涓婁笂闄愬憡璀�"),
+ ALARM_26(26,"鍗曚綋鍐呴樆涓婇檺鍛婅"),
+ ALARM_27(27,"鍗曚綋鍐呴樆涓嬮檺鍛婅"),
+ ALARM_28(28,"鍗曚綋鍐呴樆涓嬩笅闄愬憡璀�"),
;
private Integer stateId;
@@ -40,12 +58,4 @@
}
return null;
}
- public static Map<Integer,String> getOpInfo() {
- Map<Integer,String> map=new HashMap<>();
- for (BattSingalIdEnum logOpEnum : BattSingalIdEnum.values()) {
- map.put(logOpEnum.getStateId(),logOpEnum.getStateName());
- }
- return map;
- }
-
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/constant/PowerAlarmEnum.java b/src/main/java/com/whyc/constant/PowerAlarmEnum.java
index 4148d61..0837cea 100644
--- a/src/main/java/com/whyc/constant/PowerAlarmEnum.java
+++ b/src/main/java/com/whyc/constant/PowerAlarmEnum.java
@@ -181,4 +181,12 @@
}
return null;
}
+
+ public static Map<Integer,String> getOpInfo() {
+ Map<Integer,String> map=new HashMap<>();
+ for (PowerAlarmEnum logOpEnum : PowerAlarmEnum.values()) {
+ map.put(logOpEnum.getStateId(),logOpEnum.getStateName());
+ }
+ return map;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/controller/ConditionController.java b/src/main/java/com/whyc/controller/ConditionController.java
index 4f86974..de224d6 100644
--- a/src/main/java/com/whyc/controller/ConditionController.java
+++ b/src/main/java/com/whyc/controller/ConditionController.java
@@ -29,6 +29,12 @@
private BattalarmDataService almDataService;
@Autowired
+ private DevalarmDataService devAlmService;
+
+ @Autowired
+ private PwrdevAlarmService pwrAlmService;
+
+ @Autowired
private DeviceStateService deviceStateService;
@Autowired
@@ -141,9 +147,20 @@
}
@ApiOperation(value = "鑾峰彇鐢垫睜鍛婅绫诲瀷(涓嬫媺)")
- @GetMapping("getSingalIdIdType")
- public Response getSingalIdIdType(){
- return almDataService.getSingalIdType();
+ @GetMapping("getAlarmIdType")
+ public Response getAlarmIdType(){
+ return almDataService.getAlarmIdType();
+ }
+
+ @ApiOperation(value = "鑾峰彇璁惧鍛婅绫诲瀷(涓嬫媺)")
+ @GetMapping("getDevAlmIdType")
+ public Response getDevAlmIdType(){
+ return devAlmService.getDevAlmIdType();
+ }
+ @ApiOperation(value = "鑾峰彇鐢垫簮鍛婅绫诲瀷(涓嬫媺)")
+ @GetMapping("getPwrAlmIdType")
+ public Response getPwrAlmIdType(){
+ return pwrAlmService.getPwrAlmIdType();
}
@ApiOperation(value = "鑾峰彇璁惧宸ヤ綔绫诲瀷(涓嬫媺)")
diff --git a/src/main/java/com/whyc/pojo/db_alarm/BattalarmData.java b/src/main/java/com/whyc/pojo/db_alarm/BattalarmData.java
index a4aa3f4..a96c287 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/BattalarmData.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/BattalarmData.java
@@ -45,6 +45,9 @@
@ApiModelProperty(value = "鍛婅绫诲瀷")
private Integer almSignalId;
+ @TableField(exist = false)
+ private String almName;
+
@ApiModelProperty(value = "鍛婅绛夌骇")
private Integer almLevel;
diff --git a/src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java b/src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java
index 06d33de..3506084 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java
@@ -42,6 +42,9 @@
@ApiModelProperty(value = "鍛婅ID")
private Integer almId;
+ @TableField(exist = false)
+ private String almName;
+
@ApiModelProperty(value = "鍛婅绛夌骇")
private Integer almLevel;
diff --git a/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java b/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java
index cebb984..a06af94 100644
--- a/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java
+++ b/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java
@@ -39,6 +39,9 @@
@ApiModelProperty(value = "鍛婅ID")
private Integer almId;
+ @TableField(exist = false)
+ private String almName;
+
@ApiModelProperty(value = "鍛婅绛夌骇")
private Integer almLevel;
diff --git a/src/main/java/com/whyc/service/BattalarmDataService.java b/src/main/java/com/whyc/service/BattalarmDataService.java
index b03eb51..47d0a79 100644
--- a/src/main/java/com/whyc/service/BattalarmDataService.java
+++ b/src/main/java/com/whyc/service/BattalarmDataService.java
@@ -6,6 +6,7 @@
import com.github.pagehelper.PageInfo;
import com.whyc.constant.BattAlarmIdEnum;
import com.whyc.constant.BattSingalIdEnum;
+import com.whyc.constant.DevAlarmEnum;
import com.whyc.dto.Real.AlmDto;
import com.whyc.dto.Response;
import com.whyc.mapper.BattalarmDataMapper;
@@ -16,7 +17,6 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -28,6 +28,9 @@
public Response getBattAlmReal(AlmDto almDto) {
PageHelper.startPage(almDto.getPageNum(),almDto.getPageSize());
List<BattalarmData> list=mapper.getBattAlmReal(almDto);
+ list.forEach(data->{
+ data.setAlmName(BattSingalIdEnum.getValue(data.getAlmSignalId()));
+ });
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list!=null,pageInfo,"鑾峰彇鐢垫睜缁勫疄鏃跺憡璀︿俊鎭�");
}
@@ -51,8 +54,8 @@
return list!=null?list.size():0;
}
//鑾峰彇鐢垫睜鍛婅绫诲瀷(涓嬫媺)
- public Response getSingalIdType() {
- Map<Integer,String> map= BattSingalIdEnum.getOpInfo();
+ public Response getAlarmIdType() {
+ Map<Integer,String> map= BattAlarmIdEnum.getOpInfo();
return new Response().setII(1,true,map,"鑾峰彇鐢垫睜鍛婅绫诲瀷(涓嬫媺)");
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/DevalarmDataService.java b/src/main/java/com/whyc/service/DevalarmDataService.java
index 1a09dba..9dab506 100644
--- a/src/main/java/com/whyc/service/DevalarmDataService.java
+++ b/src/main/java/com/whyc/service/DevalarmDataService.java
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.whyc.constant.BattAlarmIdEnum;
+import com.whyc.constant.BattSingalIdEnum;
+import com.whyc.constant.DevAlarmEnum;
import com.whyc.dto.Real.AlmDto;
import com.whyc.dto.Response;
import com.whyc.mapper.DevalarmDataMapper;
-import com.whyc.pojo.db_alarm.BattalarmData;
import com.whyc.pojo.db_alarm.DevalarmData;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +18,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Map;
@Service
public class DevalarmDataService {
@@ -25,6 +28,9 @@
public Response getDevAlmReal(AlmDto almDto) {
PageHelper.startPage(almDto.getPageNum(),almDto.getPageSize());
List<DevalarmData> list=mapper.getDevAlmReal(almDto);
+ list.forEach(data->{
+ data.setAlmName(DevAlarmEnum.getValue(data.getAlmId()));
+ });
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list!=null,pageInfo,"鑾峰彇璁惧瀹炴椂鍛婅淇℃伅");
}
@@ -47,4 +53,9 @@
List<DevalarmData> list=mapper.selectList(wrapper);
return list!=null?list.size():0;
}
+ //鑾峰彇璁惧鍛婅绫诲瀷(涓嬫媺)
+ public Response getDevAlmIdType() {
+ Map<Integer,String> map= DevAlarmEnum.getOpInfo();
+ return new Response().setII(1,true,map,"鑾峰彇璁惧鍛婅绫诲瀷(涓嬫媺)");
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/DeviceStateService.java b/src/main/java/com/whyc/service/DeviceStateService.java
index 4fec398..ceead8b 100644
--- a/src/main/java/com/whyc/service/DeviceStateService.java
+++ b/src/main/java/com/whyc/service/DeviceStateService.java
@@ -3,13 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import com.whyc.constant.BattSingalIdEnum;
import com.whyc.constant.DevStateEnum;
import com.whyc.dto.Response;
import com.whyc.dto.Statistic.DeviceStateStic;
import com.whyc.mapper.DeviceStateMapper;
-import com.whyc.pojo.db_batt_testdata.BatttestdataInf;
-import com.whyc.pojo.db_ram_db.BattRtstate;
import com.whyc.pojo.db_ram_db.DeviceState;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/whyc/service/PwrdevAlarmService.java b/src/main/java/com/whyc/service/PwrdevAlarmService.java
index 5318eec..4c63cf8 100644
--- a/src/main/java/com/whyc/service/PwrdevAlarmService.java
+++ b/src/main/java/com/whyc/service/PwrdevAlarmService.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.whyc.constant.DevAlarmEnum;
+import com.whyc.constant.PowerAlarmEnum;
import com.whyc.dto.Real.AlmDto;
import com.whyc.dto.Response;
import com.whyc.mapper.PwrdevAlarmMapper;
@@ -16,6 +18,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Map;
@Service
public class PwrdevAlarmService {
@@ -25,6 +28,9 @@
public Response getPwrAlmReal(AlmDto almDto) {
PageHelper.startPage(almDto.getPageNum(),almDto.getPageSize());
List<PwrdevAlarm> list=mapper.getPwrAlmReal(almDto);
+ list.forEach(data->{
+ data.setAlmName(PowerAlarmEnum.getValue(data.getAlmId()));
+ });
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list!=null,pageInfo,"鑾峰彇鐢垫簮瀹炴椂鍛婅淇℃伅");
}
@@ -47,4 +53,9 @@
List<DevalarmData> list=mapper.selectList(wrapper);
return list!=null?list.size():0;
}
+ //鑾峰彇鐢垫簮鍛婅绫诲瀷(涓嬫媺)
+ public Response getPwrAlmIdType() {
+ Map<Integer,String> map= PowerAlarmEnum.getOpInfo();
+ return new Response().setII(1,true,map,"鑾峰彇璁惧鍛婅绫诲瀷(涓嬫媺)");
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1