From f5f8138f4f50eedd3598a9073956f0afa56e7139 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 27 十二月 2024 15:53:27 +0800
Subject: [PATCH] 增加部署武威市民勤系统
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java | 267 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 212 insertions(+), 55 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java
index 372fded..399cc59 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java
@@ -5,7 +5,10 @@
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.DataV1;
+import com.dy.common.mw.protocol.p206V2.DataV2;
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 +16,14 @@
import java.util.Date;
/**
- * @Author liurunyu
- * @Date 2024/1/16 10:39
- * @LastEditTime 2024/1/16 10:39
- * @Description 鎺у埗鍣ㄦ姤璀︿笌鐘舵�侊紙鏈�鏂帮級
- */
+ * @Author: liurunyu
+ * @Date: 2024/5/20 19:55
+ * @Description
+ */
+
+/**
+ * 鎺у埗鍣ㄦ姤璀︿笌鐘舵�侊紙鏈�鏂帮級
+ */
@TableName(value="rm_alarm_state_last", autoResultMap = true)
@Data
@Builder
@@ -26,92 +32,243 @@
@AllArgsConstructor
@Schema(name = "鎺у埗鍣ㄦ姤璀︿笌鐘舵�侊紙鏈�鏂帮級")
public class RmAlarmStateLast implements BaseEntity {
-
- public static final long serialVersionUID = 202401161041001L;
+ public static final long serialVersionUID = 202405202021002L;
/**
- * 涓婚敭
- */
- @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED)
+ * 涓婚敭
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
public Long id;
/**
- * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
- */
- @Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
+ */
@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.NOT_REQUIRED)
- public String rtuaddr;
+ * 鎺у埗鍣ㄥ湴鍧�
+ */
+ public String rtuAddr;
/**
- * 涓婃姤鏃ユ湡鏃堕棿
- */
- @Schema(description = "涓婃姤鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ * 涓婃姤鏃ユ湡鏃堕棿
+ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date dt;
/**
- * 鎺у埗鍣ㄦ椂閽�
- */
- @Schema(description = "鎺у埗鍣ㄦ椂閽�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ * 鎺у埗鍣ㄦ椂閽�
+ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date rtudt;
+ public Date rtuDt;
/**
- * 鎶ヨ-钃勭數姹犵數鍘�(1鎶ヨ锛�0姝ｅ父)
- */
- @Schema(description = "鎶ヨ-钃勭數姹犵數鍘�(1鎶ヨ锛�0姝ｅ父)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte bateryvolt;
+ * 鐘舵��-闃�闂�/娉碉紙0鎵撳紑銆�1鍏抽棴锛�
+ */
+ public Byte valveState;
/**
- * 鎶ヨ-婕忔崯(1鎶ヨ锛�0姝ｅ父)
- */
- @Schema(description = "鎶ヨ-钃勭數姹犵數鍘�(1鎶ヨ锛�0姝ｅ父)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte loss;
+ * 鍓╀綑姘撮噺灏忎簬鎶ヨ涓婇檺鎶ヨ鎶ヨ锛�1锛氭姤璀︼紝 0锛氭甯革級
+ */
+ public Byte alarmRemainWater;
/**
- * 鎶ヨ-浠〃(1鎶ヨ锛�0姝ｅ父)
- */
- @Schema(description = "鎶ヨ-浠〃(1鎶ヨ锛�0姝ｅ父)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte meter;
+ * 鍓╀綑姘撮噺涓�0鍏虫车/闃�(1锛氬叧娉碉紝0锛氭甯�)
+ */
+ public Byte alarm0WaterRemain;
/**
- * 鎶ヨ-闃�闂�(1鎶ヨ锛�0姝ｅ父)
- */
- @Schema(description = "鎶ヨ-闃�闂�(1鎶ヨ锛�0姝ｅ父)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte valve;
+ * 骞寸敤姘撮噺澶т簬闄愬埗姘撮噺鎶ヨ(1锛氭姤璀� 0锛氭甯�)
+ */
+ public Byte alarmExceedYear;
/**
- * 鐘舵��-IC鍗″姛鑳斤紙1鏈夋晥銆�0鏃犳晥锛�
- */
- @Schema(description = "鐘舵��-IC鍗″姛鑳斤紙1鏈夋晥銆�0鏃犳晥锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte iccard;
+ * 娴侀噺璁℃晠闅�(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarmWaterMeterFault;
/**
- * 鐘舵��-宸ヤ綔锛�1鍚姩銆�0鍋滄锛�
- */
- @Schema(description = "鎶ヨ-浠〃(1鎶ヨ锛�0姝ｅ父)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte working;
+ * 婕忔崯(鍋锋按)鎶ヨ(1锛氭姤璀︼紝 0锛氭甯�)
+ */
+ public Byte alarmLoss;
/**
- * 鐘舵��-闃�闂紙1鎵撳紑銆�0鍏抽棴锛�
- */
- @Schema(description = "鐘舵��-闃�闂紙1鎵撳紑銆�0鍏抽棴锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte valvestate;
+ * 娴侀噺璁℃崯鍧�(姝ｅ父閫氳浣嗙灛鏃朵负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 Long sendMsTime ;
+
+ public void valueFrom(DataV1 dV1, String rtuDt,
+ com.dy.common.mw.protocol.p206V1.upVos.DataAlarmVo alarmVo,
+ com.dy.common.mw.protocol.p206V1.upVos.DataStateVo stateVo) throws Exception{
+ this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.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锛氳搫鐢垫睜锛�
+ }
+
+ public void valueFrom(DataV2 dV2, String rtuDt,
+ com.dy.common.mw.protocol.p206V2.upVos.DataAlarmVo alarmVo,
+ com.dy.common.mw.protocol.p206V2.upVos.DataStateVo stateVo) throws Exception{
+ this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV2.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锛氳搫鐢垫睜锛�
+ }
+
+ public void updateFrom(DataV1 dV1, String rtuDt,
+ com.dy.common.mw.protocol.p206V1.upVos.DataAlarmVo alarmVo,
+ com.dy.common.mw.protocol.p206V1.upVos.DataStateVo stateVo) throws Exception{
+ this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt) ;
+ this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt) ;
+ if(alarmVo != null){
+ this.alarmBatteryVolt = alarmVo.batteryVolt ;
+ this.alarmLoss = alarmVo.loss ;
+ this.alarmWaterMeterBreak = alarmVo.meter ;
+ this.alarmValve = alarmVo.valve ;
+ }/*else{
+ this.alarmBatteryVolt = null ;
+ this.alarmLoss = null ;
+ this.alarmWaterMeterBreak = null ;
+ this.alarmValve = null ;
+ }*/
+ if(stateVo != null){
+ this.stateIcEnable = stateVo.icCard ;
+ this.valveState = stateVo.valveState;
+ this.powerType = stateVo.powerType;
+ //this.valveState = stateVo.valve ;
+ }/*else{
+ this.stateIcEnable = null ;
+ this.valveState = null ;
+ this.powerType = null ;
+ //this.valveState = null ;
+ }*/
+ }
+
+ public void updateFrom(DataV2 dV2, String rtuDt,
+ com.dy.common.mw.protocol.p206V2.upVos.DataAlarmVo alarmVo,
+ com.dy.common.mw.protocol.p206V2.upVos.DataStateVo stateVo) throws Exception{
+ this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV2.dt) ;
+ this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt) ;
+ if(alarmVo != null){
+ this.alarmBatteryVolt = alarmVo.batteryVolt ;
+ this.alarmLoss = alarmVo.loss ;
+ this.alarmWaterMeterBreak = alarmVo.meter ;
+ this.alarmValve = alarmVo.valve ;
+ }/*else{
+ this.alarmBatteryVolt = null ;
+ this.alarmLoss = null ;
+ this.alarmWaterMeterBreak = null ;
+ this.alarmValve = null ;
+ }*/
+ if(stateVo != null){
+ this.stateIcEnable = stateVo.icCard ;
+ this.valveState = stateVo.valveState;
+ this.powerType = stateVo.powerType;
+ //this.valveState = stateVo.valve ;
+ }/*else{
+ this.stateIcEnable = null ;
+ this.valveState = null ;
+ this.powerType = null ;
+ //this.valveState = null ;
+ }*/
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0