From 4fe7ea4fbdc0c45f14d1d8de77e3424f826ba909 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 28 六月 2024 21:39:12 +0800
Subject: [PATCH] 1、靳总协议上行数据处理修改完善; 2、上行数据处理任务修改完善.
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateHistory.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateHistory.java
index e15bc35..474690b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateHistory.java
@@ -5,7 +5,11 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataAlarmVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataStateVo;
import com.dy.common.po.BaseEntity;
+import com.dy.common.util.DateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@@ -151,4 +155,32 @@
*/
public Byte alarmValve;
+ /**
+ * 渚涚數鏂瑰紡锛�0: 220V锛�1锛氳搫鐢垫睜锛�
+ */
+ public Byte powerType;
+
+
+ public void valueFrom(DataV1_0_1 dV1_0_1, String rtuDt, DataAlarmVo alarmVo, DataStateVo stateVo) throws Exception{
+ this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt) ;
+ this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt) ;
+ this.valveState = stateVo==null?null:stateVo.valveState; //鐘舵��-闃�闂�/娉碉紙1鎵撳紑銆�0鍏抽棴
+ this.alarmRemainWater = (byte)0; //鍓╀綑姘撮噺鎶ヨ (1锛氬皬浜庢姤璀︿笂闄愭姤璀� 0锛氭甯�)
+ this.alarm0WaterRemain = (byte)0; //鍓╀綑姘撮噺涓�0鍏虫车/闃� (1锛氬墿浣欐按閲忎负0鍏虫车 0锛氭甯�)
+ this.alarmExceedYear = (byte)0; //骞寸敤姘撮噺澶т簬闄愬埗姘撮噺鎶ヨ(1锛氭姤璀� 0锛氭甯�)
+ this.alarmWaterMeterFault = alarmVo==null?null:alarmVo.meter; // 娴侀噺璁℃晠闅�(1锛氭姤璀︼紝0锛氭甯�)
+ this.alarmLoss = alarmVo==null?null:alarmVo.loss; // 婕忔崯(鍋锋按)鎶ヨ(1锛氭姤璀︼紝 0锛氭甯�)
+ this.alarmWaterMeterBreak = (byte)0; //娴侀噺璁℃崯鍧�(姝ｅ父閫氳浣嗙灛鏃朵负0)鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ this.alarmEleMeterFault = (byte)0; //鐢佃〃鏁呴殰鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ this.alarm0MoneyRemain = (byte)0; //鍓╀綑閲戦涓�0(1锛氭姤璀︼紝0锛氭甯�)
+ this.alarmInnerDoor = (byte)0; //鎺у埗鍣ㄥ唴闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ this.alarmOuterDoor = (byte)0; //鎺у埗鍣ㄥ闂ㄦ墦寮�鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ this.alarmEleMiss = (byte)0; //浜ゆ祦缂洪」鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ this.alarmEleExceed = (byte)0; //浜ゆ祦杩囨祦鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ this.alarmEleLowVolt = (byte)0; //涓夌浉鐢垫瑺鍘嬫姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ this.stateIcEnable = stateVo==null?null:stateVo.icCard; //IC鍗＄姸鎬�(1銆佹湁鏁堬紝0锛氭棤鏁�)
+ this.alarmBatteryVolt = alarmVo==null?null:alarmVo.batteryVolt; //鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
+ this.alarmValve = alarmVo==null?null:alarmVo.valve; //闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ this.powerType = stateVo==null?null:stateVo.powerType; //渚涚數鏂瑰紡锛�0: 220V锛�1锛氳搫鐢垫睜锛�
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0