From f6962c0ede2f18b8aaeaf69f84b39d459a5a59f4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 八月 2024 13:41:12 +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 | 83 +++++++++++++++++++++++++++++++++++++----
1 files changed, 75 insertions(+), 8 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 c86489c..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,6 +1,7 @@
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;
@@ -16,8 +17,6 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-
-import java.util.Date;
/**
* @Author: liurunyu
@@ -48,6 +47,20 @@
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
public Long id;
+
+ /**
+ * 鍐滄埛瀹炰綋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锛堝閿級
*/
@@ -213,7 +226,7 @@
/**
* 鏈浣跨敤鐢甸噺
*/
- public Double thisEle;
+ 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);
@@ -241,7 +254,26 @@
this.clOrderNo = null;//姹熸捣鍗忚鐗规湁
this.clEleTotalAmount = null;//姹熸捣鍗忚鐗规湁
this.clWaterRemainUser = null;//姹熸捣鍗忚鐗规湁
- this.thisEle = null;//姹熸捣鍗忚鐗规湁
+ this.clThisEle = 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 {
@@ -270,7 +302,7 @@
this.clOrderNo = null;//姹熸捣鍗忚鐗规湁
this.clEleTotalAmount = null;//姹熸捣鍗忚鐗规湁
this.clWaterRemainUser = null;//姹熸捣鍗忚鐗规湁
- this.thisEle = null;//姹熸捣鍗忚鐗规湁
+ this.clThisEle = null;//姹熸捣鍗忚鐗规湁
}
public void valueFrom85(DataV202404 dataV202404, DataCd85Vo cdData) throws Exception {
@@ -287,10 +319,10 @@
this.clOrderNo = cdData.orderNo;
this.clEleTotalAmount = cdData.eleTotalAmount;
this.clWaterRemainUser = cdData.waterRemain;
- this.thisEle = cdData.thisEle;
+ this.clThisEle = cdData.thisEle;
}
- public void updateFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo, boolean clearCloseValve) throws Exception {
+ 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;
@@ -298,7 +330,7 @@
this.opIcCardAddr = dataCd83OpenVo.icCardAddr;
this.opRemainMoney = dataCd83OpenVo.remainMoney;
this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt);
- if (clearCloseValve) {
+ if (clearCloseValve != null && clearCloseValve.booleanValue()) {
this.clDt = null;
this.clType = null;
this.clTotalAmount = null;
@@ -310,6 +342,41 @@
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