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 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
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
--
Gitblit v1.9.1