From fc2173606fd7b8dc3e3a6b5fec7f82871e5fdc43 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 17 五月 2023 16:47:39 +0800
Subject: [PATCH] 文件解析告警数据导出
---
src/main/java/com/whyc/alarm/Fbs5100Alarm.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/alarm/Fbs5100Alarm.java b/src/main/java/com/whyc/alarm/Fbs5100Alarm.java
index 40c671c..94d014c 100644
--- a/src/main/java/com/whyc/alarm/Fbs5100Alarm.java
+++ b/src/main/java/com/whyc/alarm/Fbs5100Alarm.java
@@ -1,5 +1,6 @@
package com.whyc.alarm;
+import com.whyc.dto.AlarmFactoryDto;
import com.whyc.dto.Fbs5100ComBase;
import com.whyc.dto.Fbs5100DateTime;
@@ -32,7 +33,9 @@
public int SYNCode[] = new int[2]; //AA AA
public int AlarmItem; //鍛婅绫诲瀷
+ public String AlarmItemName; //鍛婅鍚嶇О
public int AlarmType; //1-瓒呭嚭涓婇檺 鎴� 浜х敓鍛婅 2-瓒呭嚭涓嬮檺
+ public String AlarmTypeName; //1-瓒呭嚭涓婇檺 鎴� 浜х敓鍛婅 2-瓒呭嚭涓嬮檺
public float AlarmValue; //鍛婅鍊�
public Fbs5100DateTime StartTime; //鍛婅寮�濮嬫椂闂�
public Fbs5100DateTime EndTime; //鏆傛湭鍚敤锛屼笉瑕佹樉绀�
@@ -42,7 +45,7 @@
StartTime = new Fbs5100DateTime();
EndTime = new Fbs5100DateTime();
}
-
+
public boolean putByteBuffer(final byte[] buf)
{
@@ -58,7 +61,9 @@
tmpbuf.position(0);
AlarmItem = Fbs5100ComBase.changeByteToInt(tmpbuf.get()); //鍛婅绫诲瀷
+ AlarmItemName=AlarmFactoryDto.getAlmName(AlarmItem);
AlarmType = Fbs5100ComBase.changeByteToInt(tmpbuf.get()); //1-瓒呭嚭涓婇檺 鎴� 浜х敓鍛婅 2-瓒呭嚭涓嬮檺
+ AlarmTypeName=AlarmFactoryDto.getAlmType(AlarmType);
AlarmValue = (float)Fbs5100ComBase.changeShortToFloat(tmpbuf.getShort())/10; //鍛婅鍊�
StartTime.putByteBuffer(tmpbuf); //鍛婅寮�濮嬫椂闂�
EndTime.putByteBuffer(tmpbuf); //鏆傛湭鍚敤锛屼笉瑕佹樉绀�
--
Gitblit v1.9.1