From 76b0ffff1d0d483b1837cb0d5fdbb59339210c3a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 23 十月 2024 16:54:08 +0800
Subject: [PATCH] 在remote子模块实现的”远程监测“功能（查询列表附在线状态）
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateHistory.java | 149 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 114 insertions(+), 35 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 7701176..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.*;
@@ -13,11 +17,14 @@
import java.util.Date;
/**
- * @Author liurunyu
- * @Date 2024/1/16 11:03
- * @LastEditTime 2024/1/16 11:03
- * @Description 鎺у埗鍣ㄦ姤璀︿笌鐘舵�侊紙鍘嗗彶锛�
- */
+ * @Author: liurunyu
+ * @Date: 2024/5/20 20:20
+ * @Description
+ */
+
+/**
+ * 鎺у埗鍣ㄦ姤璀︿笌鐘舵�侊紙鍘嗗彶锛�
+ */
@TableName(value="rm_alarm_state_history", autoResultMap = true)
@Data
@Builder
@@ -26,8 +33,7 @@
@AllArgsConstructor
@Schema(name = "鎺у埗鍣ㄦ姤璀︿笌鐘舵�侊紙鍘嗗彶锛�")
public class RmAlarmStateHistory implements BaseEntity {
-
- public static final long serialVersionUID = 202401161104001L;
+ public static final long serialVersionUID = 202405202021001L;
/**
* 涓婚敭
*/
@@ -38,70 +44,143 @@
/**
* 鎺у埗鍣ㄥ疄浣揑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;
+
+ /**
+ * 渚涚數鏂瑰紡锛�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