From 6dba613b20244677543795eb91d18ce54d612c27 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 27 六月 2024 13:44:01 +0800
Subject: [PATCH] 靳总协议上行数据处理修改完善
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateHistory.java | 116 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 80 insertions(+), 36 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 273eed6..e15bc35 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
@@ -13,14 +13,14 @@
import java.util.Date;
/**
- * @Author liurunyu
- * @Date 2024/1/16 11:03
- * @LastEditTime 2024/1/16 11:03
+ * @Author: liurunyu
+ * @Date: 2024/5/20 20:20
* @Description
- */
+ */
+
/**
-* 鎺у埗鍣ㄦ姤璀︿笌鐘舵�侊紙鍘嗗彶锛�
-*/
+ * 鎺у埗鍣ㄦ姤璀︿笌鐘舵�侊紙鍘嗗彶锛�
+ */
@TableName(value="rm_alarm_state_history", autoResultMap = true)
@Data
@Builder
@@ -29,8 +29,7 @@
@AllArgsConstructor
@Schema(name = "鎺у埗鍣ㄦ姤璀︿笌鐘舵�侊紙鍘嗗彶锛�")
public class RmAlarmStateHistory implements BaseEntity {
-
- public static final long serialVersionUID = 202401161104001L;
+ public static final long serialVersionUID = 202405202021001L;
/**
* 涓婚敭
*/
@@ -41,70 +40,115 @@
/**
* 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
*/
- @Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long controllerid;
+ public Long controllerId;
/**
* 鍙栨按鍙D锛堝閿級
*/
- @Schema(description = "鍙栨按鍙ｅ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long intakeid;
+ public Long intakeId;
/**
* 鎺у埗鍣ㄥ湴鍧�
*/
- @Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
- public String rtuaddr;
+ public String rtuAddr;
/**
* 涓婃姤鏃ユ湡鏃堕棿
*/
- @Schema(description = "涓婃姤鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date dt;
/**
- * 鎶ヨ-钃勭數姹犵數鍘�(1鎶ヨ锛�0姝ｅ父)
+ * 鎺у埗鍣ㄦ椂閽�
*/
- @Schema(description = "鎶ヨ-钃勭數姹犵數鍘�(1鎶ヨ锛�0姝ｅ父)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte bateryvolt;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ public Date rtuDt;
/**
- * 鎶ヨ-婕忔崯(1鎶ヨ锛�0姝ｅ父)
+ * 鐘舵��-闃�闂�/娉碉紙1鎵撳紑銆�0鍏抽棴锛�
*/
- @Schema(description = "鎶ヨ-钃勭數姹犵數鍘�(1鎶ヨ锛�0姝ｅ父)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte loss;
+ public Byte valveState;
/**
- * 鎶ヨ-浠〃(1鎶ヨ锛�0姝ｅ父)
+ * 鍓╀綑姘撮噺灏忎簬鎶ヨ涓婇檺鎶ヨ鎶ヨ锛�1锛氭姤璀︼紝 0锛氭甯革級
*/
- @Schema(description = "鎶ヨ-浠〃(1鎶ヨ锛�0姝ｅ父)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte meter;
+ public Byte alarmRemainWater;
/**
- * 鎶ヨ-闃�闂�(1鎶ヨ锛�0姝ｅ父)
+ * 鍓╀綑姘撮噺涓�0鍏虫车/闃�(1锛氬叧娉碉紝0锛氭甯�)
*/
- @Schema(description = "鎶ヨ-闃�闂�(1鎶ヨ锛�0姝ｅ父)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte valve;
+ public Byte alarm0WaterRemain;
/**
- * 鐘舵��-IC鍗″姛鑳斤紙1鏈夋晥銆�0鏃犳晥锛�
+ * 骞寸敤姘撮噺澶т簬闄愬埗姘撮噺鎶ヨ(1锛氭姤璀� 0锛氭甯�)
*/
- @Schema(description = "鐘舵��-IC鍗″姛鑳斤紙1鏈夋晥銆�0鏃犳晥锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte iccard;
+ public Byte alarmExceedYear;
/**
- * 鐘舵��-宸ヤ綔锛�1鍚姩銆�0鍋滄锛�
+ * 娴侀噺璁℃晠闅�(1锛氭姤璀︼紝0锛氭甯�)
*/
- @Schema(description = "鎶ヨ-浠〃(1鎶ヨ锛�0姝ｅ父)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte working;
+ public Byte alarmWaterMeterFault;
/**
- * 鐘舵��-闃�闂紙1鎵撳紑銆�0鍏抽棴锛�
+ * 婕忔崯(鍋锋按)鎶ヨ(1锛氭姤璀︼紝 0锛氭甯�)
*/
- @Schema(description = "鐘舵��-闃�闂紙1鎵撳紑銆�0鍏抽棴锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte valvestate;
+ public Byte alarmLoss;
+
+ /**
+ * 娴侀噺璁℃崯鍧�(姝ｅ父閫氳浣嗙灛鏃朵负0)鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarmWaterMeterBreak;
+
+ /**
+ * 鐢佃〃鏁呴殰鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarmEleMeterFault;
+
+ /**
+ * 鍓╀綑閲戦涓�0(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarm0MoneyRemain;
+
+ /**
+ * 鎺у埗鍣ㄥ唴闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarmInnerDoor;
+
+ /**
+ * 鎺у埗鍣ㄥ闂ㄦ墦寮�鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarmOuterDoor;
+
+ /**
+ * 浜ゆ祦缂洪」鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarmEleMiss;
+
+ /**
+ * 浜ゆ祦杩囨祦鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarmEleExceed;
+
+ /**
+ * 涓夌浉鐢垫瑺鍘嬫姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarmEleLowVolt;
+
+ /**
+ * IC鍗＄姸鎬�(1銆佹湁鏁堬紝0锛氭棤鏁�)
+ */
+ public Byte stateIcEnable;
+
+ /**
+ * 鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarmBatteryVolt;
+
+ /**
+ * 闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarmValve;
}
\ No newline at end of file
--
Gitblit v1.8.0