From 1b899d65b9f9250c690f65673a974fdb3833582e Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 18 六月 2024 14:32:36 +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 | 393 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 299 insertions(+), 94 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 8950a0f..bf9fa43 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,175 +1,380 @@
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.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
import java.util.Date;
/**
- * @Author liurunyu
- * @Date 2024/2/23 16:00
- * @LastEditTime 2024/2/23 16:00
+ * @author ZhuBaoMin
+ * @date 2024-06-17 11:28
+ * @LastEditTime 2024-06-17 11:28
* @Description
*/
-@TableName(value="rm_open_close_valve_last", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏈�鏂版暟鎹�")
-public class RmOpenCloseValveLast {
+/**
+ * 寮�鍏抽榾鎶ユ渶鏂版暟鎹〃
+ */
+public class RmOpenCloseValveLast {
public static final long serialVersionUID = 202402231602001L;
/**
* 涓婚敭
*/
- @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;
+ private Long id;
/**
* 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
*/
- @Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long controllerId;
+ private Long controllerId;
/**
* 鍙栨按鍙ｅ疄浣揑D锛堝閿級
*/
- @Schema(description = "鍙栨按鍙ｅ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long intakeId;
+ private Long intakeId;
/**
* 鎺у埗鍣ㄥ湴鍧�
*/
- @Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
- public String rtuAddr;
+ private String rtuAddr;
/**
* 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
*/
- @Schema(description = "鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date opDt;
+ private Date opDt;
/**
- * 寮�闃�绫诲瀷
+ * 寮�闃�鎺у埗鍣ㄦ椂閽�
*/
- @Schema(description = "寮�闃�绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte opType;
+ private Date opRtuDt;
/**
- * 寮�闃�鏃剁疮璁℃祦閲�
+ * IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
*/
- @Schema(description = "寮�闃�鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double opTotalAmount;
+ private String opIcCardAddr;
/**
- * 寮�闃�IC鍗＄紪鍙�
+ * IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
*/
- @Schema(description = "寮�闃�IC鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String opIcCardNo;
+ private String opIcCardNo;
/**
- * 寮�闃�ic鍗″湴鍧�
+ * 寮�闃�璁㈠崟鍙凤紙16浣嶆暟瀛楋級
*/
- @Schema(description = "寮�闃�ic鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String opIcCardAddr;
+ private String opOrderNo;
/**
- * 寮�闃�鏃跺墿浣欓噾棰�
+ * 寮�娉�/闃�鏃堕棿
*/
- @Schema(description = "寮�闃�鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double opRemainMoney;
+ private Date openDt;
/**
- * 寮�闃�鏃舵帶鍒跺櫒鏃堕挓
+ * 寮�闃�姘磋〃绱姘撮噺
*/
- @Schema(description = "寮�闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date openDt;
+ private Double opWaterTotalAmount;
/**
- * 鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
+ * 寮�闃�鐢佃〃绱鐢甸噺
*/
- @Schema(description = "鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date clDt;
+ private Double opEleTotalAmount;
/**
- * 鍏抽榾绫诲瀷
+ * 寮�闃�鐢ㄦ埛鍓╀綑閲戦
*/
- @Schema(description = "鍏抽榾绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte clType;
+ private Double opMoneyRemainUser;
/**
- * 鍏抽榾鏃剁疮璁℃祦閲�
+ * 寮�闃�鐢ㄦ埛鍓╀綑姘撮噺
*/
- @Schema(description = "鍏抽榾鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double clTotalAmount;
+ private Double opWaterRemainUser;
/**
- * 鍏抽榾鏃禝C鍗＄紪鍙�
+ * 鍏虫车/闃�鏂瑰紡
*/
- @Schema(description = "鍏抽榾鏃禝C鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String clIcCardNo;
+ private String opType;
/**
- * 鍏抽榾鏃禝C鍗″湴鍧�
+ * 鍏抽榾IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
*/
- @Schema(description = "鍏抽榾鏃禝C鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String clIcCardAddr;
+ private String clIcCardAddr;
/**
- * 鍏抽榾鏃跺墿浣欓噾棰�
+ * 鍏抽榾IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
*/
- @Schema(description = "鍏抽榾鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double clRemainMoney;
+ private String clIcCardNo;
/**
- * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�
+ * 鍏抽榾璁㈠崟鍙凤紙16浣嶆暟瀛楋級
*/
- @Schema(description = "鍏抽榾鏃舵湰娆＄敤姘撮噺", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double clThisAmount;
+ private String clOrderNo;
/**
- * 鍏抽榾鎶ヤ腑鏈娑堣垂閲戦
+ * 寮�濮嬫椂闂�(鍒嗘椂鏃ユ湀)
*/
- @Schema(description = "鍏抽榾鏃舵湰娆℃秷璐归噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double clThisMoney;
+ private Date startDt;
/**
- * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按鏃堕暱锛堝垎閽燂級
+ * 缁撴潫鏃堕棿(鍒嗘椂鏃ユ湀)
*/
- @Schema(description = "鍏抽榾鏃舵湰娆＄敤姘存椂闀匡紙鍒嗛挓锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Integer clThisTime;
+ private Date endDt;
/**
- * 鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓
+ * 姘磋〃绱娴侀噺
*/
- @Schema(description = "鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date clOpenDt;
+ private Double clWaterTotalAmount;
/**
- * 鍏抽榾鏃舵帶鍒跺櫒鏃堕挓
+ * 鐢佃〃绱鐢甸噺
*/
- @Schema(description = "鍏抽榾鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date closeDt;
+ private Double clEleTotalAmount;
+ /**
+ * 鐢ㄦ埛鍓╀綑閲戦
+ */
+ private Double clMoneyRemainUser;
+
+ /**
+ * 鐢ㄦ埛鍓╀綑姘撮噺
+ */
+ private Double clWaterRemainUser;
+
+ /**
+ * 鏈浣跨敤鐢甸噺
+ */
+ private Double thisEle;
+
+ /**
+ * 鏈浣跨敤姘撮噺
+ */
+ private Double thisWater;
+
+ /**
+ * 鏈浣跨敤閲戦
+ */
+ private Double thisMoney;
+
+ /**
+ * 鏈浣跨敤鏃堕棿闀�
+ */
+ private Integer thisDuration;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getControllerId() {
+ return controllerId;
+ }
+
+ public void setControllerId(Long controllerId) {
+ this.controllerId = controllerId;
+ }
+
+ public Long getIntakeId() {
+ return intakeId;
+ }
+
+ public void setIntakeId(Long intakeId) {
+ this.intakeId = intakeId;
+ }
+
+ public String getRtuAddr() {
+ return rtuAddr;
+ }
+
+ public void setRtuAddr(String rtuAddr) {
+ this.rtuAddr = rtuAddr;
+ }
+
+ 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;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0