From 26d63d120e517624be6fcf70ae9620c3582a91dd Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 18 六月 2024 17:35:06 +0800
Subject: [PATCH] 2024-06-18 朱宝民 优化开关阀逻辑
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java | 393 +++++++++++++------------------------------------------
1 files changed, 94 insertions(+), 299 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..8950a0f 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,175 @@
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 ZhuBaoMin
- * @date 2024-06-17 11:28
- * @LastEditTime 2024-06-17 11:28
+ * @Author liurunyu
+ * @Date 2024/2/23 16:00
+ * @LastEditTime 2024/2/23 16:00
* @Description
*/
-
-/**
- * 寮�鍏抽榾鎶ユ渶鏂版暟鎹〃
- */
+@TableName(value="rm_open_close_valve_last", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏈�鏂版暟鎹�")
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;
/**
* 鍙栨按鍙ｅ疄浣揑D锛堝閿級
*/
- private Long intakeId;
+ @Schema(description = "鍙栨按鍙ｅ疄浣撳閿�", 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 Date openDt;
/**
- * 寮�闃�鐢佃〃绱鐢甸噺
+ * 鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
*/
- private Double opEleTotalAmount;
+ @Schema(description = "鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Date clDt;
/**
- * 寮�闃�鐢ㄦ埛鍓╀綑閲戦
+ * 鍏抽榾绫诲瀷
*/
- private Double opMoneyRemainUser;
+ @Schema(description = "鍏抽榾绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Byte clType;
/**
- * 寮�闃�鐢ㄦ埛鍓╀綑姘撮噺
+ * 鍏抽榾鏃剁疮璁℃祦閲�
*/
- private Double opWaterRemainUser;
+ @Schema(description = "鍏抽榾鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double clTotalAmount;
/**
- * 鍏虫车/闃�鏂瑰紡
+ * 鍏抽榾鏃禝C鍗＄紪鍙�
*/
- private String opType;
+ @Schema(description = "鍏抽榾鏃禝C鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String clIcCardNo;
/**
- * 鍏抽榾IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
+ * 鍏抽榾鏃禝C鍗″湴鍧�
*/
- private String clIcCardAddr;
+ @Schema(description = "鍏抽榾鏃禝C鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String clIcCardAddr;
/**
- * 鍏抽榾IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
+ * 鍏抽榾鏃跺墿浣欓噾棰�
*/
- private String clIcCardNo;
+ @Schema(description = "鍏抽榾鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double clRemainMoney;
/**
- * 鍏抽榾璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+ * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�
*/
- private String clOrderNo;
+ @Schema(description = "鍏抽榾鏃舵湰娆＄敤姘撮噺", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double clThisAmount;
/**
- * 寮�濮嬫椂闂�(鍒嗘椂鏃ユ湀)
+ * 鍏抽榾鎶ヤ腑鏈娑堣垂閲戦
*/
- private Date startDt;
+ @Schema(description = "鍏抽榾鏃舵湰娆℃秷璐归噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double clThisMoney;
/**
- * 缁撴潫鏃堕棿(鍒嗘椂鏃ユ湀)
+ * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按鏃堕暱锛堝垎閽燂級
*/
- private Date endDt;
+ @Schema(description = "鍏抽榾鏃舵湰娆＄敤姘存椂闀匡紙鍒嗛挓锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer clThisTime;
/**
- * 姘磋〃绱娴侀噺
+ * 鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓
*/
- private Double clWaterTotalAmount;
+ @Schema(description = "鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Date clOpenDt;
/**
- * 鐢佃〃绱鐢甸噺
+ * 鍏抽榾鏃舵帶鍒跺櫒鏃堕挓
*/
- private Double clEleTotalAmount;
+ @Schema(description = "鍏抽榾鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Date closeDt;
- /**
- * 鐢ㄦ埛鍓╀綑閲戦
- */
- 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