From a15a8cfd7b01ce4bba6fe9fd876f6704ca23a12d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 07 一月 2025 16:40:32 +0800
Subject: [PATCH] 1、取水口用水日统计表中增加金额、次数字段； 2、优化或重写“累计流量超过指定值的取水口”、“累计流量低于指定值的取水口”、“指定时间段内用水量超过指定值的取水口”、“指定时间段内消费金额超过指定值的取水口”几个统计查询； 3、改“指定时间段内用水时长超过指定值的取水口”为“指定时间段内用水次数超过指定值的取水口”
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java | 76 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 insertions(+), 7 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 fe09f57..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,9 +5,8 @@
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.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;
@@ -160,8 +159,15 @@
*/
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) ;
+ /**
+ * 鍙戦�佹秷鎭椂鍒�
+ */
+ 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锛氭甯�)
@@ -183,8 +189,64 @@
this.powerType = stateVo==null?null:stateVo.powerType; //渚涚數鏂瑰紡锛�0: 220V锛�1锛氳搫鐢垫睜锛�
}
- public void updateFrom(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) ;
+ 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 ;
--
Gitblit v1.8.0