From e6f86688b8f6fa0d03cf88012f80759cd290af27 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 13 六月 2024 14:37:48 +0800
Subject: [PATCH] 1、靳总协议报警及状态解决完善代码； 2、报警及状态处理完善；
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java | 8 ++++----
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java | 6 +++---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java | 4 +++-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java | 4 ++--
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
index 8a5f836..0f0b19e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
@@ -15,11 +15,11 @@
byte b = bs[index] ;
index++ ;
avo.batteryVolt = (byte)(b & 0x2 >> 1) ;
- avo.loss = (byte)(b & 0x8 >> 3) ;
avo.meter = (byte)(b & 0x20 >> 5) ;
b = bs[index] ;
- avo.valve = (byte)(b & 0x20 >> 5) ;
+ avo.loss = (byte)(b & 0x2 >> 1) ;
+ avo.valve = (byte)(b & 0x4 >> 2) ;
return avo ;
}
@@ -28,8 +28,8 @@
byte b = bs[index] ;
index++ ;
avo.icCard = (byte)(b & 0x4 >> 2) ;
- avo.working = (byte)(b & 0x8 >> 3) ;
- avo.valve = (byte)(b & 0x20 >> 5) ;
+ avo.working = (byte)(b & 0x10 >> 4) ;
+ avo.powerType = (byte)(b & 0x40 >> 6) ;
return avo ;
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java
index c4cb401..983a152 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java
@@ -6,7 +6,7 @@
public class DataAlarmVo {
public Byte batteryVolt ;// 钃勭數姹犵數鍘�
public Byte loss ;//婕忔崯
- public Byte meter ;//浠〃
+ public Byte meter ;//娴侀噺璁℃晠闅�
public Byte valve ;//闃�闂�
public String toString(){
@@ -18,7 +18,7 @@
str.append(" 婕忔崯锛�");
str.append(loss==null?"":(loss==1?"鎶ヨ":"姝ｅ父"));
str.append("\n");
- str.append(" 浠〃锛�");
+ str.append(" 娴侀噺璁℃晠闅滐細");
str.append(meter==null?"":(meter==1?"鎶ヨ":"姝ｅ父"));
str.append("\n");
str.append(" 闃�闂細");
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java
index 33bf869..1e12bd4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java
@@ -6,7 +6,7 @@
public class DataStateVo {
public Byte icCard;// IC鍗″姛鑳�
public Byte working;//宸ヤ綔鐘舵��
- public Byte valve ;//闃�闂�
+ public Byte powerType ;//鐢垫簮鐘舵�侊紙0锛�220V渚涚數锛�1锛氱暅鐢垫睜渚涚數锛�
public String toString(){
StringBuilder str = new StringBuilder() ;
@@ -17,8 +17,8 @@
str.append(" 宸ヤ綔鐘舵�侊細");
str.append(working ==null?"":(working ==1?"鍚姩":"鍋滄"));
str.append("\n");
- str.append(" 闃�闂ㄧ姸鎬侊細");
- str.append(valve==null?"":(valve==1?"鎵撳紑":"鍏抽棴"));
+ str.append(" 鐢垫簮鐘舵�侊細");
+ str.append(powerType==null?"":(powerType==1?"鐣滅數姹犱緵鐢�":"220V渚涚數"));
return str.toString() ;
}
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
index cafed3b..3d80663 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
@@ -46,6 +46,7 @@
PrController controller = (PrController) objs[1];
this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1_0_1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
this.saveHistory(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1_0_1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
+ this.updateVirCardNoUseState(sv, controller, dataCd81Vo.stateVo) ;
}
} else if (cdObj instanceof DataCd84Vo) {
DataCd84Vo dataCd84Vo = (DataCd84Vo)cdObj ;
@@ -55,6 +56,7 @@
PrController controller = (PrController) objs[1];
this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1_0_1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
this.saveHistory(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1_0_1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
+ this.updateVirCardNoUseState(sv, controller, dataCd84Vo.stateVo) ;
}
} else if (cdObj instanceof DataCdC0Vo) {
DataCdC0Vo dataCdC0Vo = (DataCdC0Vo)cdObj ;
@@ -64,6 +66,7 @@
PrController controller = (PrController) objs[1];
this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1_0_1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
this.saveHistory(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1_0_1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
+ this.updateVirCardNoUseState(sv, controller, dataCdC0Vo.stateVo) ;
}
}
} catch (Exception e) {
@@ -109,7 +112,6 @@
sv.saveRmAlarmStateLast(po) ;
}else{
po = this.update(controller, po, rtuDt, dV1_0_1, alarmVo, stateVo) ;
- this.updateVirCardNoUseState(sv, controller, stateVo) ;
sv.updateRmAlarmStateLast(po);
}
}
--
Gitblit v1.8.0