From faf02e3bad9fe25c60acf9a8be7e58122a4cec4a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 05 八月 2024 15:01:20 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java | 341 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 255 insertions(+), 86 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
index 433f9cc..85e6741 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
@@ -1,19 +1,28 @@
package com.dy.pipIrrGlobal.pojoRm;
+import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83CloseVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo;
+import com.dy.common.mw.protocol.p206V202404.DataV202404;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd84Vo;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd85Vo;
+import com.dy.common.util.DateTime;
+import java.util.Date;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
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.DataCd83OpenVo;
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.*;
-import java.util.Date;
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/1 15:28
+ * @Description
+ */
/**
* @Author liurunyu
@@ -38,176 +47,336 @@
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
public Long id;
+
/**
- * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
- */
+ * 鍐滄埛瀹炰綋ID锛堝閿級
+ */
+ @Schema(description = "鍐滄埛瀹炰綋澶栭敭", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long clientId;
+
+ /**
+ * 鍐滄埛濮撳悕
+ */
+ @Schema(description = "鍐滄埛濮撳悕", requiredMode = Schema.RequiredMode.REQUIRED)
+ public String clientName;
+
+ /**
+ * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
+ */
@Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long controllerId;
/**
- * 鍙栨按鍙ｅ疄浣揑D锛堝閿級
- */
+ * 鍙栨按鍙ｅ疄浣揑D锛堝閿級
+ */
@Schema(description = "鍙栨按鍙ｅ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long intakeId;
/**
- * 鎺у埗鍣ㄥ湴鍧�
- */
+ * 鎺у埗鍣ㄥ湴鍧�
+ */
@Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
public String rtuAddr;
/**
- * 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
- */
- @Schema(description = "鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ * 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
+ */
+ @Schema(description = "寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date opDt;
/**
- * 寮�闃�绫诲瀷
- */
+ * 寮�闃�绫诲瀷
+ */
@Schema(description = "寮�闃�绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Byte opType;
/**
- * 寮�闃�鏃剁疮璁℃祦閲�
- */
+ * 寮�闃�鏃剁疮璁℃祦閲�
+ */
@Schema(description = "寮�闃�鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Double opTotalAmount;
/**
- * 寮�闃�IC鍗＄紪鍙�
- */
+ * 寮�闃�IC鍗＄紪鍙�
+ */
@Schema(description = "寮�闃�IC鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public String opIcCardNo;
/**
- * 寮�闃�ic鍗″湴鍧�
- */
+ * 寮�闃�ic鍗″湴鍧�
+ */
@Schema(description = "寮�闃�ic鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public String opIcCardAddr;
/**
- * 寮�闃�鏃跺墿浣欓噾棰�
- */
+ * 寮�闃�鏃跺墿浣欓噾棰�
+ */
@Schema(description = "寮�闃�鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Double opRemainMoney;
/**
- * 寮�闃�鏃舵帶鍒跺櫒鏃堕挓
- */
+ * 寮�闃�璁㈠崟鍙�
+ */
+ @Schema(description = "寮�闃�璁㈠崟鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String opOrderNo;
+
+ /**
+ * 寮�闃�鏃剁數琛ㄧ疮璁＄數閲�
+ */
+ @Schema(description = "寮�闃�鏃剁數琛ㄧ疮璁＄數閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double opEleTotalAmount;
+
+ /**
+ * 寮�闃�鏃剁敤姘存埛鍓╀綑姘撮噺
+ */
+ @Schema(description = "寮�闃�鏃剁敤姘存埛鍓╀綑姘撮噺", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double opWaterRemainUser;
+
+ /**
+ * 寮�闃�鏃舵帶鍒跺櫒鏃堕挓
+ */
@Schema(description = "寮�闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Date openDt;
/**
- * 鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
- */
+ * 鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
+ */
@Schema(description = "鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Date clDt;
/**
- * 鍏抽榾绫诲瀷
- */
+ * 鍏抽榾绫诲瀷
+ */
@Schema(description = "鍏抽榾绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Byte clType;
/**
- * 鍏抽榾鏃剁疮璁℃祦閲�
- */
+ * 鍏抽榾鏃剁疮璁℃祦閲�
+ */
@Schema(description = "鍏抽榾鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Double clTotalAmount;
/**
- * 鍏抽榾鏃禝C鍗＄紪鍙�
- */
+ * 鍏抽榾鏃禝C鍗＄紪鍙�
+ */
@Schema(description = "鍏抽榾鏃禝C鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public String clIcCardNo;
/**
- * 鍏抽榾鏃禝C鍗″湴鍧�
- */
+ * 鍏抽榾鏃禝C鍗″湴鍧�
+ */
@Schema(description = "鍏抽榾鏃禝C鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public String clIcCardAddr;
/**
- * 鍏抽榾鏃跺墿浣欓噾棰�
- */
+ * 鍏抽榾鏃跺墿浣欓噾棰�
+ */
@Schema(description = "鍏抽榾鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Double clRemainMoney;
/**
- * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�
- */
+ * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�
+ */
@Schema(description = "鍏抽榾鏃舵湰娆＄敤姘撮噺", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Double clThisAmount;
/**
- * 鍏抽榾鎶ヤ腑鏈娑堣垂閲戦
- */
+ * 鍏抽榾鎶ヤ腑鏈娑堣垂閲戦
+ */
@Schema(description = "鍏抽榾鏃舵湰娆℃秷璐归噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Double clThisMoney;
/**
- * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按鏃堕暱锛堝垎閽燂級
- */
+ * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按鏃堕暱锛堝垎閽燂級
+ */
@Schema(description = "鍏抽榾鏃舵湰娆＄敤姘存椂闀匡紙鍒嗛挓锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Integer clThisTime;
/**
- * 鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓
- */
+ * 鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓
+ */
@Schema(description = "鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Date clOpenDt;
/**
- * 鍏抽榾鏃舵帶鍒跺櫒鏃堕挓
- */
+ * 鍏抽榾鏃舵帶鍒跺櫒鏃堕挓
+ */
@Schema(description = "鍏抽榾鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Date closeDt;
- public void valueFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo)throws Exception {
- this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt) ;
- this.opType = dataCd83OpenVo.type ;
- this.opTotalAmount = dataCd83OpenVo.totalAmount ;
- this.opIcCardNo = dataCd83OpenVo.icCardNo ;
- this.opIcCardAddr = dataCd83OpenVo.icCardAddr ;
- this.opRemainMoney = dataCd83OpenVo.remainMoney ;
- this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt) ;
- this.clDt = null ;
- this.clType = null ;
- this.clTotalAmount = null ;
- this.clIcCardNo = null ;
- this.clIcCardAddr = null ;
- this.clRemainMoney = null ;
- this.clThisAmount = null ;
- this.clThisMoney = null ;
- this.clThisTime = null ;
- this.clOpenDt = null ;
- this.closeDt = null ;
+ /**
+ * 鍏抽榾璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+ */
+ public String clOrderNo;
+
+ /**
+ * 鐢佃〃绱鐢甸噺
+ */
+ public Double clEleTotalAmount;
+
+ /**
+ * 鐢ㄦ埛鍓╀綑姘撮噺
+ */
+ public Double clWaterRemainUser;
+
+ /**
+ * 鏈浣跨敤鐢甸噺
+ */
+ public Double clThisEle;
+
+ public void valueFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo) throws Exception {
+ this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
+ this.opType = dataCd83OpenVo.type;
+ this.opTotalAmount = dataCd83OpenVo.totalAmount;
+ this.opIcCardNo = dataCd83OpenVo.icCardNo;
+ this.opIcCardAddr = dataCd83OpenVo.icCardAddr;
+ this.opRemainMoney = dataCd83OpenVo.remainMoney;
+ this.opOrderNo = null; //姹熸捣鍗忚鐗规湁
+ this.opEleTotalAmount = null; //姹熸捣鍗忚鐗规湁
+ this.opWaterRemainUser = null; //姹熸捣鍗忚鐗规湁
+ this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt);
+ this.clDt = null;
+ this.clType = null;
+ this.clTotalAmount = null;
+ this.clIcCardNo = null;
+ this.clIcCardAddr = null;
+ this.clRemainMoney = null;
+ this.clThisAmount = null;
+ this.clThisMoney = null;
+ this.clThisTime = null;
+ this.clOpenDt = null;
+ this.closeDt = null;
+
+ this.clOrderNo = null;//姹熸捣鍗忚鐗规湁
+ this.clEleTotalAmount = null;//姹熸捣鍗忚鐗规湁
+ this.clWaterRemainUser = null;//姹熸捣鍗忚鐗规湁
+ this.clThisEle = null;//姹熸捣鍗忚鐗规湁
}
- public void updateFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo, boolean clearCloseValve)throws Exception {
- this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt) ;
- this.opType = dataCd83OpenVo.type ;
- this.opTotalAmount = dataCd83OpenVo.totalAmount ;
- this.opIcCardNo = dataCd83OpenVo.icCardNo ;
- this.opIcCardAddr = dataCd83OpenVo.icCardAddr ;
- this.opRemainMoney = dataCd83OpenVo.remainMoney ;
- this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt) ;
- if(clearCloseValve){
- this.clDt = null ;
- this.clType = null ;
- this.clTotalAmount = null ;
- this.clIcCardNo = null ;
- this.clIcCardAddr = null ;
- this.clRemainMoney = null ;
- this.clThisAmount = null ;
- this.clThisMoney = null ;
- this.clThisTime = null ;
- this.clOpenDt = null ;
- this.closeDt = null ;
+ public void valueFrom(DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo) throws Exception {
+ this.clDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
+ this.clType = dataCd83CloseVo.type;
+ this.clTotalAmount = dataCd83CloseVo.totalAmount;
+ this.clIcCardNo = dataCd83CloseVo.icCardNo;
+ this.clIcCardAddr = dataCd83CloseVo.icCardAddr;
+ this.clRemainMoney = dataCd83CloseVo.remainMoney;
+ this.clThisAmount = dataCd83CloseVo.thisAmount;
+ this.clThisMoney = dataCd83CloseVo.thisMoney;
+ this.clThisTime = dataCd83CloseVo.thisTime;
+ this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);
+ this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt);
+
+ this.clOrderNo = null;//姹熸捣鍗忚鐗规湁
+ this.clEleTotalAmount = null;//姹熸捣鍗忚鐗规湁
+ this.clWaterRemainUser = null;//姹熸捣鍗忚鐗规湁
+ this.clThisEle = null;//姹熸捣鍗忚鐗规湁
+ }
+
+ public void valueFrom84(DataV202404 dataV202404, DataCd84Vo cdData) throws Exception {
+ this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);
+ this.opType = null;
+ this.opTotalAmount = cdData.waterTotalAmount;
+ this.opIcCardNo = cdData.icCardNo;
+ this.opIcCardAddr = cdData.icCardAddr;
+ this.opRemainMoney = cdData.moneyRemainUser;
+ this.opOrderNo = cdData.orderNo; //姹熸捣鍗忚鐗规湁
+ this.opEleTotalAmount = cdData.eleTotalAmount; //姹熸捣鍗忚鐗规湁
+ this.opWaterRemainUser = cdData.waterRemainUser; //姹熸捣鍗忚鐗规湁
+ this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.openDt);
+ this.clDt = null;
+ this.clType = null;
+ this.clTotalAmount = null;
+ this.clIcCardNo = null;
+ this.clIcCardAddr = null;
+ this.clRemainMoney = null;
+ this.clThisAmount = null;
+ this.clThisMoney = null;
+ this.clThisTime = null;
+ this.clOpenDt = null;
+ this.closeDt = null;
+
+ this.clOrderNo = null;//姹熸捣鍗忚鐗规湁
+ this.clEleTotalAmount = null;//姹熸捣鍗忚鐗规湁
+ this.clWaterRemainUser = null;//姹熸捣鍗忚鐗规湁
+ this.clThisEle = null;//姹熸捣鍗忚鐗规湁
+ }
+
+ public void valueFrom85(DataV202404 dataV202404, DataCd85Vo cdData) throws Exception {
+ this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.startDt);
+ this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.endDt);
+ this.opType = cdData.opType;
+ this.clIcCardAddr = cdData.icCardAddr;
+ this.clIcCardNo = cdData.icCardNo;
+ this.clTotalAmount = cdData.waterTotalAmount;
+ this.clRemainMoney = cdData.moneyRemain;
+ this.clThisAmount = cdData.thisWater;
+ this.clThisMoney = cdData.thisMoney;
+ this.clThisTime = cdData.thisDuration;
+ this.clOrderNo = cdData.orderNo;
+ this.clEleTotalAmount = cdData.eleTotalAmount;
+ this.clWaterRemainUser = cdData.waterRemain;
+ this.clThisEle = cdData.thisEle;
+ }
+
+ public void updateFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo, Boolean clearCloseValve) throws Exception {
+ this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
+ this.opType = dataCd83OpenVo.type;
+ this.opTotalAmount = dataCd83OpenVo.totalAmount;
+ this.opIcCardNo = dataCd83OpenVo.icCardNo;
+ this.opIcCardAddr = dataCd83OpenVo.icCardAddr;
+ this.opRemainMoney = dataCd83OpenVo.remainMoney;
+ this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt);
+ if (clearCloseValve != null && clearCloseValve.booleanValue()) {
+ this.clDt = null;
+ this.clType = null;
+ this.clTotalAmount = null;
+ this.clIcCardNo = null;
+ this.clIcCardAddr = null;
+ this.clRemainMoney = null;
+ this.clThisAmount = null;
+ this.clThisMoney = null;
+ this.clThisTime = null;
+ this.clOpenDt = null;
+ this.closeDt = null;
+
+ this.clOrderNo = null;//姹熸捣鍗忚鐗规湁
+ this.clEleTotalAmount = null;//姹熸捣鍗忚鐗规湁
+ this.clWaterRemainUser = null;//姹熸捣鍗忚鐗规湁
+ this.clThisEle = null;//姹熸捣鍗忚鐗规湁
+ }
+ }
+
+
+ public void updateFrom(DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo, boolean clearOpenValve) throws Exception {
+ this.clDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
+ this.clType = dataCd83CloseVo.type;
+ this.clTotalAmount = dataCd83CloseVo.totalAmount;
+ this.clIcCardNo = dataCd83CloseVo.icCardNo;
+ this.clIcCardAddr = dataCd83CloseVo.icCardAddr;
+ this.clRemainMoney = dataCd83CloseVo.remainMoney;
+ this.clThisAmount = dataCd83CloseVo.thisAmount;
+ this.clThisMoney = dataCd83CloseVo.thisMoney;
+ this.clThisTime = dataCd83CloseVo.thisTime;
+ this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);
+ this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt) ;
+
+ if(clearOpenValve){
+ this.opDt = null ;
+ this.opType = null ;
+ this.opTotalAmount = null ;
+ this.opIcCardNo = null ;
+ this.opIcCardAddr = null ;
+ this.opRemainMoney = null ;
+ this.openDt = null ;
+
+ this.clOrderNo = null;//姹熸捣鍗忚鐗规湁
+ this.clEleTotalAmount = null;//姹熸捣鍗忚鐗规湁
+ this.clWaterRemainUser = null;//姹熸捣鍗忚鐗规湁
+ this.clThisEle = null;//姹熸捣鍗忚鐗规湁
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0