From 6be968854d7a134cf31b8af7b8ffb219da5cee55 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 16:36:40 +0800
Subject: [PATCH] p206V1.0.0协议与硬件联调,并修改完善代码。

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java |  543 ++++++++++++++++++++++++++----------------------------
 1 files changed, 261 insertions(+), 282 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 bf9fa43..25e7de2 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
@@ -1,380 +1,359 @@
 package com.dy.pipIrrGlobal.pojoRm;
 
+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.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.po.BaseEntity;
+import com.dy.common.util.DateTime;
+import com.dy.pipIrrGlobal.pojoPr.PrController;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
 import java.util.Date;
 
 /**
- * @author ZhuBaoMin
- * @date 2024-06-17 11:28
- * @LastEditTime 2024-06-17 11:28
+ * @Author: liurunyu
+ * @Date: 2024/7/1 15:29
  * @Description
  */
+@TableName(value="rm_open_close_valve_last", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏈�鏂版暟鎹�")
+public class RmOpenCloseValveLast  implements BaseEntity {
 
-/**
- * 寮�鍏抽榾鎶ユ渶鏂版暟鎹〃
- */
-public class RmOpenCloseValveLast {
     public static final long serialVersionUID = 202402231602001L;
     /**
      * 涓婚敭
      */
-    private Long id;
+    @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED)
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @TableId(type = IdType.INPUT)
+    public Long id;
+
+    /**
+     * 鐢辨渶鏂版暟鎹寔鏈夊巻鍙叉暟鎹腑鐨勬渶鏂拌褰旾D锛屼互鏂逛究蹇�熸煡璇�
+     * json涓嶅簭鍒楀寲姝ゅ睘鎬э紝鍗充笉鍚戝墠绔〉闈㈠彂閫佸強鏄剧ず
+     */
+    @Schema(hidden=true)
+    @JSONField(serialize = false)
+    public Long lastHistoryId;
 
     /**
      * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
      */
-    private Long controllerId;
+    @Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    public Long controllerId;
 
     /**
      * 鍙栨按鍙e疄浣揑D锛堝閿級
      */
-    private Long intakeId;
+    @Schema(description = "鍙栨按鍙e疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    public Long intakeId;
 
     /**
      * 鎺у埗鍣ㄥ湴鍧�
      */
-    private String rtuAddr;
+    @Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
+    public String rtuAddr;
 
     /**
      * 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
      */
-    private Date opDt;
+    @Schema(description = "寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date opDt;
 
     /**
-     * 寮�闃�鎺у埗鍣ㄦ椂閽�
+     * 寮�闃�绫诲瀷
      */
-    private Date opRtuDt;
+    @Schema(description = "寮�闃�绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Byte opType;
 
     /**
-     * IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
+     * 寮�闃�鏃剁疮璁℃祦閲�
      */
-    private String opIcCardAddr;
+    @Schema(description = "寮�闃�鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Double opTotalAmount;
 
     /**
-     * IC鍗$紪鍙凤紙17浣嶆暟瀛楋級
+     * 寮�闃�IC鍗$紪鍙�
      */
-    private String opIcCardNo;
+    @Schema(description = "寮�闃�IC鍗$紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public String opIcCardNo;
 
     /**
-     * 寮�闃�璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+     * 寮�闃�ic鍗″湴鍧�
      */
-    private String opOrderNo;
+    @Schema(description = "寮�闃�ic鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public String opIcCardAddr;
 
     /**
-     * 寮�娉�/闃�鏃堕棿
+     * 寮�闃�鏃跺墿浣欓噾棰�
      */
-    private Date openDt;
+    @Schema(description = "寮�闃�鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Double opRemainMoney;
 
     /**
-     * 寮�闃�姘磋〃绱姘撮噺
+     * 寮�闃�璁㈠崟鍙�
      */
-    private Double opWaterTotalAmount;
+    @Schema(description = "寮�闃�璁㈠崟鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public String opOrderNo;
 
     /**
-     * 寮�闃�鐢佃〃绱鐢甸噺
+     * 寮�闃�鏃剁數琛ㄧ疮璁$數閲�
      */
-    private Double opEleTotalAmount;
+    @Schema(description = "寮�闃�鏃剁數琛ㄧ疮璁$數閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Double opEleTotalAmount;
 
     /**
-     * 寮�闃�鐢ㄦ埛鍓╀綑閲戦
+     * 寮�闃�鏃剁敤姘存埛鍓╀綑姘撮噺
      */
-    private Double opMoneyRemainUser;
+    @Schema(description = "寮�闃�鏃剁敤姘存埛鍓╀綑姘撮噺", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Double opWaterRemainUser;
 
     /**
-     * 寮�闃�鐢ㄦ埛鍓╀綑姘撮噺
+     * 寮�闃�鏃舵帶鍒跺櫒鏃堕挓
      */
-    private Double opWaterRemainUser;
+    @Schema(description = "寮�闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Date openDt;
 
     /**
-     * 鍏虫车/闃�鏂瑰紡
+     * 鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
      */
-    private String opType;
+    @Schema(description = "鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Date clDt;
 
     /**
-     * 鍏抽榾IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
+     * 鍏抽榾绫诲瀷
      */
-    private String clIcCardAddr;
+    @Schema(description = "鍏抽榾绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Byte clType;
 
     /**
-     * 鍏抽榾IC鍗$紪鍙凤紙17浣嶆暟瀛楋級
+     * 鍏抽榾鏃剁疮璁℃祦閲�
      */
-    private String clIcCardNo;
+    @Schema(description = "鍏抽榾鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Double clTotalAmount;
+
+    /**
+     * 鍏抽榾鏃禝C鍗$紪鍙�
+     */
+    @Schema(description = "鍏抽榾鏃禝C鍗$紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public String clIcCardNo;
+
+    /**
+     * 鍏抽榾鏃禝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;
 
     /**
      * 鍏抽榾璁㈠崟鍙凤紙16浣嶆暟瀛楋級
      */
-    private String clOrderNo;
-
-    /**
-     * 寮�濮嬫椂闂�(鍒嗘椂鏃ユ湀)
-     */
-    private Date startDt;
-
-    /**
-     * 缁撴潫鏃堕棿(鍒嗘椂鏃ユ湀)
-     */
-    private Date endDt;
-
-    /**
-     * 姘磋〃绱娴侀噺
-     */
-    private Double clWaterTotalAmount;
+    public String clOrderNo;
 
     /**
      * 鐢佃〃绱鐢甸噺
      */
-    private Double clEleTotalAmount;
-
-    /**
-     * 鐢ㄦ埛鍓╀綑閲戦
-     */
-    private Double clMoneyRemainUser;
+    public Double clEleTotalAmount;
 
     /**
      * 鐢ㄦ埛鍓╀綑姘撮噺
      */
-    private Double clWaterRemainUser;
+    public Double clWaterRemainUser;
 
     /**
      * 鏈浣跨敤鐢甸噺
      */
-    private Double thisEle;
+    public Double clThisEle;
 
-    /**
-     * 鏈浣跨敤姘撮噺
-     */
-    private Double thisWater;
+    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);
 
-    /**
-     * 鏈浣跨敤閲戦
-     */
-    private Double thisMoney;
-
-    /**
-     * 鏈浣跨敤鏃堕棿闀�
-     */
-    private Integer thisDuration;
-
-    public Long getId() {
-        return id;
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    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 Long getControllerId() {
-        return controllerId;
+    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 setControllerId(Long controllerId) {
-        this.controllerId = controllerId;
+    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 Long getIntakeId() {
-        return intakeId;
+    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.clearCloseValue();
+        }
     }
 
-    public void setIntakeId(Long intakeId) {
-        this.intakeId = intakeId;
+    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.clearOpenValue();
+        }
     }
 
-    public String getRtuAddr() {
-        return rtuAddr;
-    }
+    public void clearCloseValue(){
+        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 setRtuAddr(String rtuAddr) {
-        this.rtuAddr = rtuAddr;
+        this.clOrderNo = null;//姹熸捣鍗忚鐗规湁
+        this.clEleTotalAmount = null;//姹熸捣鍗忚鐗规湁
+        this.clWaterRemainUser = null;//姹熸捣鍗忚鐗规湁
+        this.clThisEle = null;//姹熸捣鍗忚鐗规湁
     }
-
-    public Date getOpDt() {
-        return opDt;
-    }
-
-    public void setOpDt(Date opDt) {
-        this.opDt = opDt;
-    }
-
-    public Date getOpRtuDt() {
-        return opRtuDt;
-    }
-
-    public void setOpRtuDt(Date opRtuDt) {
-        this.opRtuDt = opRtuDt;
-    }
-
-    public String getOpIcCardAddr() {
-        return opIcCardAddr;
-    }
-
-    public void setOpIcCardAddr(String opIcCardAddr) {
-        this.opIcCardAddr = opIcCardAddr;
-    }
-
-    public String getOpIcCardNo() {
-        return opIcCardNo;
-    }
-
-    public void setOpIcCardNo(String opIcCardNo) {
-        this.opIcCardNo = opIcCardNo;
-    }
-
-    public String getOpOrderNo() {
-        return opOrderNo;
-    }
-
-    public void setOpOrderNo(String opOrderNo) {
-        this.opOrderNo = opOrderNo;
-    }
-
-    public Date getOpenDt() {
-        return openDt;
-    }
-
-    public void setOpenDt(Date openDt) {
-        this.openDt = openDt;
-    }
-
-    public Double getOpWaterTotalAmount() {
-        return opWaterTotalAmount;
-    }
-
-    public void setOpWaterTotalAmount(Double opWaterTotalAmount) {
-        this.opWaterTotalAmount = opWaterTotalAmount;
-    }
-
-    public Double getOpEleTotalAmount() {
-        return opEleTotalAmount;
-    }
-
-    public void setOpEleTotalAmount(Double opEleTotalAmount) {
-        this.opEleTotalAmount = opEleTotalAmount;
-    }
-
-    public Double getOpMoneyRemainUser() {
-        return opMoneyRemainUser;
-    }
-
-    public void setOpMoneyRemainUser(Double opMoneyRemainUser) {
-        this.opMoneyRemainUser = opMoneyRemainUser;
-    }
-
-    public Double getOpWaterRemainUser() {
-        return opWaterRemainUser;
-    }
-
-    public void setOpWaterRemainUser(Double opWaterRemainUser) {
-        this.opWaterRemainUser = opWaterRemainUser;
-    }
-
-    public String getOpType() {
-        return opType;
-    }
-
-    public void setOpType(String opType) {
-        this.opType = opType;
-    }
-
-    public String getClIcCardAddr() {
-        return clIcCardAddr;
-    }
-
-    public void setClIcCardAddr(String clIcCardAddr) {
-        this.clIcCardAddr = clIcCardAddr;
-    }
-
-    public String getClIcCardNo() {
-        return clIcCardNo;
-    }
-
-    public void setClIcCardNo(String clIcCardNo) {
-        this.clIcCardNo = clIcCardNo;
-    }
-
-    public String getClOrderNo() {
-        return clOrderNo;
-    }
-
-    public void setClOrderNo(String clOrderNo) {
-        this.clOrderNo = clOrderNo;
-    }
-
-    public Date getStartDt() {
-        return startDt;
-    }
-
-    public void setStartDt(Date startDt) {
-        this.startDt = startDt;
-    }
-
-    public Date getEndDt() {
-        return endDt;
-    }
-
-    public void setEndDt(Date endDt) {
-        this.endDt = endDt;
-    }
-
-    public Double getClWaterTotalAmount() {
-        return clWaterTotalAmount;
-    }
-
-    public void setClWaterTotalAmount(Double clWaterTotalAmount) {
-        this.clWaterTotalAmount = clWaterTotalAmount;
-    }
-
-    public Double getClEleTotalAmount() {
-        return clEleTotalAmount;
-    }
-
-    public void setClEleTotalAmount(Double clEleTotalAmount) {
-        this.clEleTotalAmount = clEleTotalAmount;
-    }
-
-    public Double getClMoneyRemainUser() {
-        return clMoneyRemainUser;
-    }
-
-    public void setClMoneyRemainUser(Double clMoneyRemainUser) {
-        this.clMoneyRemainUser = clMoneyRemainUser;
-    }
-
-    public Double getClWaterRemainUser() {
-        return clWaterRemainUser;
-    }
-
-    public void setClWaterRemainUser(Double clWaterRemainUser) {
-        this.clWaterRemainUser = clWaterRemainUser;
-    }
-
-    public Double getThisEle() {
-        return thisEle;
-    }
-
-    public void setThisEle(Double thisEle) {
-        this.thisEle = thisEle;
-    }
-
-    public Double getThisWater() {
-        return thisWater;
-    }
-
-    public void setThisWater(Double thisWater) {
-        this.thisWater = thisWater;
-    }
-
-    public Double getThisMoney() {
-        return thisMoney;
-    }
-
-    public void setThisMoney(Double thisMoney) {
-        this.thisMoney = thisMoney;
-    }
-
-    public Integer getThisDuration() {
-        return thisDuration;
-    }
-
-    public void setThisDuration(Integer thisDuration) {
-        this.thisDuration = thisDuration;
+    public void clearOpenValue(){
+        this.opDt = null ;
+        this.opType = null ;
+        this.opTotalAmount = null ;
+        this.opIcCardNo = null ;
+        this.opIcCardAddr = null ;
+        this.opRemainMoney = null ;
+        this.openDt = null ;
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0