From 854e951894deaa54b26590f8575474ed7a5f5b88 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 02 七月 2024 10:32:30 +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/RmOpenCloseValveLast.java | 147 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 144 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
index 949b6e1..11fb1aa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
@@ -5,7 +5,13 @@
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.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.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,9 +19,8 @@
import java.util.Date;
/**
- * @Author liurunyu
- * @Date 2024/2/23 16:00
- * @LastEditTime 2024/2/23 16:00
+ * @Author: liurunyu
+ * @Date: 2024/7/1 15:29
* @Description
*/
@TableName(value="rm_open_close_valve_last", autoResultMap = true)
@@ -102,6 +107,24 @@
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)
@@ -173,4 +196,122 @@
@Schema(description = "鍏抽榾鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Date closeDt;
+ /**
+ * 鍏抽榾璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+ */
+ public String clOrderNo;
+
+ /**
+ * 鐢佃〃绱鐢甸噺
+ */
+ public Double clEleTotalAmount;
+
+ /**
+ * 鐢ㄦ埛鍓╀綑姘撮噺
+ */
+ public Double clWaterRemainUser;
+
+ /**
+ * 鏈浣跨敤鐢甸噺
+ */
+ public Double thisEle;
+
+ 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.thisEle = 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.thisEle = 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.thisEle = 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) {
+ 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;
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0