From fc320221d1972a3e799abc5eefd74946f8e93603 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 01 七月 2024 14:22:25 +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 | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 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 eb5cb35..91272a4 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,6 +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_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.*;
@@ -24,12 +28,13 @@
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏈�鏂版暟鎹�")
-public class RmOpenCloseValveLast {
+public class RmOpenCloseValveLast implements BaseEntity {
public static final long serialVersionUID = 202402231602001L;
/**
* 涓婚敭
*/
+ @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED)
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
public Long id;
@@ -38,6 +43,7 @@
* 鐢辨渶鏂版暟鎹寔鏈夊巻鍙叉暟鎹腑鐨勬渶鏂拌褰旾D锛屼互鏂逛究蹇�熸煡璇�
* json涓嶅簭鍒楀寲姝ゅ睘鎬э紝鍗充笉鍚戝墠绔〉闈㈠彂閫佸強鏄剧ず
*/
+ @Schema(hidden=true)
@JSONField(serialize = false)
public Long lastHistoryId;
@@ -64,7 +70,7 @@
/**
* 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
*/
- @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;
@@ -170,4 +176,49 @@
@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 ;
+ }
+
+ 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