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 ; }
@@ -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(" 阀门："); 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() ; } } 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); } }
