From bdaf974ab56bfba24018eee7b3e9f00aeefe9ac0 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 11 一月 2023 11:08:44 +0800
Subject: [PATCH] 告警接口更新
---
src/main/java/com/whyc/service/AlarmDataService.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/AlarmDataService.java b/src/main/java/com/whyc/service/AlarmDataService.java
index c5e881d..e8ed978 100644
--- a/src/main/java/com/whyc/service/AlarmDataService.java
+++ b/src/main/java/com/whyc/service/AlarmDataService.java
@@ -194,17 +194,30 @@
for (BattalarmData alarm : battAlarmList) {
String alarmName = AlarmDaoFactory.getAllAlarmName(alarm.getAlmSignalId());
String alarmStartTime = format.format(alarm.getAlmStartTime());
- alarmMsgBuilder.append(alarm.getStationName()).append(",鐢垫睜缁勭紪鍙蜂负").append(alarm.getBattgroupname()).append(",鍗曚綋涓�").append(alarm.getMonNum()).append(",鍦�").append(alarmStartTime).append("鍙戠敓浜�").append(alarmName).append("鍛婅;");
+ String stationName = alarm.getStationName();
+ String district = stationName.split("-")[2];
+ String stationNameUnion = stationName.substring(stationName.indexOf(district));
+
+ //alarmMsgBuilder.append(stationNameUnion).append(",鐢垫睜缁勭紪鍙蜂负").append(alarm.getBattgroupname()).append(",鍗曚綋涓�").append(alarm.getMonNum()).append(",鍦�").append(alarmStartTime).append("鍙戠敓浜�").append(alarmName).append("鍛婅;");
+ alarmMsgBuilder.append(stationNameUnion).append("鍙戠敓浜�").append(alarmName).append("鍛婅;");
}
for (DevalarmData alarm : devAlarmList) {
String alarmName = AlarmDaoFactory.getAllAlarmName(alarm.getAlmType());
String alarmStartTime = format.format(alarm.getAlmStartTime());
- alarmMsgBuilder.append(alarm.getStationName()).append(",璁惧缂栧彿涓�").append(alarm.getDevId()).append(",鍦�").append(alarmStartTime).append("鍙戠敓浜�").append(alarmName).append("鍛婅;");
+ String stationName = alarm.getStationName();
+ String district = stationName.split("-")[2];
+ String stationNameUnion = stationName.substring(stationName.indexOf(district));
+ //alarmMsgBuilder.append(stationNameUnion).append(",璁惧缂栧彿涓�").append(alarm.getDevId()).append(",鍦�").append(alarmStartTime).append("鍙戠敓浜�").append(alarmName).append("鍛婅;");
+ alarmMsgBuilder.append(stationNameUnion).append("鍙戠敓浜�").append(alarmName).append("鍛婅;");
}
for (PwrdevAlarm alarm : powerAlarmList) {
String alarmName = AlarmDaoFactory.getAllAlarmName(alarm.getAlmType());
String alarmStartTime = format.format(alarm.getAlmStartTime());
- alarmMsgBuilder.append(alarm.getStationName()).append(",鐢垫簮缂栧彿涓�").append(alarm.getPowerDeviceId()).append(",鍦�").append(alarmStartTime).append("鍙戠敓浜�").append(alarmName).append("鍛婅;");
+ String stationName = alarm.getStationName();
+ String district = stationName.split("-")[2];
+ String stationNameUnion = stationName.substring(stationName.indexOf(district));
+ //alarmMsgBuilder.append(stationNameUnion).append(",鐢垫簮缂栧彿涓�").append(alarm.getPowerDeviceId()).append(",鍦�").append(alarmStartTime).append("鍙戠敓浜�").append(alarmName).append("鍛婅;");
+ alarmMsgBuilder.append(stationNameUnion).append("鍙戠敓浜�").append(alarmName).append("鍛婅;");
}
File file = new File(unreadDirPath);
--
Gitblit v1.9.1