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/RmOpenCloseValveHistory.java | 239 +++++++++++++++++++++++------------------------------------
1 files changed, 95 insertions(+), 144 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
index 0f0e31f..8cc409c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
@@ -5,10 +5,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-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.util.DateTime;
+import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@@ -16,201 +13,155 @@
import java.util.Date;
/**
- * @author ZhuBaoMin
- * @date 2024-06-17 11:27
- * @LastEditTime 2024-06-17 11:27
- * @Description
+ * @Author liurunyu
+ * @Date 2024/2/23 15:42
+ * @LastEditTime 2024/2/23 15:42
+ * @Description 鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁
*/
-
-/**
- * 寮�鍏抽榾鎶ュ巻鍙叉暟鎹〃
- */
-
-@TableName(value="rm_open_close_valve_history", autoResultMap = true)
+@TableName(value="rm_open_close_valve_report", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "寮�鍏抽榾鎶ュ巻鍙叉暟鎹〃")
-public class RmOpenCloseValveHistory {
- public static final long serialVersionUID = 202406171339001L;
+@Schema(name = "鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁")
+public class RmOpenCloseValveHistory implements BaseEntity {
+ public static final long serialVersionUID = 202402231450001L;
/**
* 涓婚敭
*/
+ @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED)
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
- private Long id;
-
+ public Long id;
/**
- * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
- */
+ * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
+ */
+ @Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- private Long controllerId;
+ public Long controllerId;
/**
- * 鍙栨按鍙ｅ疄浣揑D锛堝閿級
- */
+ * 鍙栨按鍙ｅ疄浣揑D锛堝閿級
+ */
+ @Schema(description = "鍙栨按鍙ｅ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- private Long intakeId;
+ public Long intakeId;
/**
- * 鎺у埗鍣ㄥ湴鍧�
- */
- private String rtuAddr;
+ * 鎺у埗鍣ㄥ湴鍧�
+ */
+ @Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
+ public String rtuAddr;
/**
- * 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
- */
+ * 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
+ */
+ @Schema(description = "鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date opDt;
+ public Date opDt;
/**
- * 寮�闃�鎺у埗鍣ㄦ椂閽�
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- 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浣嶆暟瀛楋級
- */
- private String opIcCardNo;
+ * 寮�闃�IC鍗＄紪鍙�
+ */
+ @Schema(description = "寮�闃�IC鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String opIcCardNo;
/**
- * 寮�闃�璁㈠崟鍙凤紙16浣嶆暟瀛楋級
- */
- private String opOrderNo;
+ * 寮�闃�ic鍗″湴鍧�
+ */
+ @Schema(description = "寮�闃�ic鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String opIcCardAddr;
/**
- * 寮�娉�/闃�鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- 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;
/**
- * 鍏虫车/闃�鏂瑰紡
- */
- private Byte opType;
+ * 鍏抽榾鏃禝C鍗＄紪鍙�
+ */
+ @Schema(description = "鍏抽榾鏃禝C鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String clIcCardNo;
/**
- * 鍏抽榾IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
- */
- private String clIcCardAddr;
+ * 鍏抽榾鏃禝C鍗″湴鍧�
+ */
+ @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;
/**
- * 寮�濮嬫椂闂�(鍒嗘椂鏃ユ湀)
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date startDt;
+ * 鍏抽榾鎶ヤ腑鏈娑堣垂閲戦
+ */
+ @Schema(description = "鍏抽榾鏃舵湰娆℃秷璐归噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double clThisMoney;
/**
- * 缁撴潫鏃堕棿(鍒嗘椂鏃ユ湀)
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- 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 void valueFrom84(DataV202404 dataV202404, DataCd84Vo cdData) throws Exception{
- this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);
- this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.opDt);
- this.opIcCardAddr = cdData.icCardAddr;;
- this.opIcCardNo = cdData.icCardNo;
- this.opOrderNo = cdData.orderNo;
- this.opWaterTotalAmount = cdData.waterTotalAmount;
- this.opEleTotalAmount = cdData.eleTotalAmount;
- this.opMoneyRemainUser = cdData.moneyRemainUser;
- this.opWaterRemainUser = cdData.waterRemainUser;
- }
-
- public void valueFrom85(DataV202404 dataV202404, DataCd85Vo cdData) throws Exception{
- this.startDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.startDt);
- this.endDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.endDt);
- this.opType = cdData.opType;
- this.clIcCardAddr = cdData.icCardAddr;
- this.clIcCardNo = cdData.icCardNo;
- this.clOrderNo = cdData.orderNo;
- this.clWaterTotalAmount = cdData.waterTotalAmount;
- this.clEleTotalAmount = cdData.eleTotalAmount;
- this.clMoneyRemainUser = cdData.moneyRemain;;
- this.clWaterRemainUser = cdData.waterRemain;
- this.thisEle = cdData.thisEle;
- this.thisWater = cdData.thisWater;
- this.thisMoney = cdData.thisMoney;
- this.thisDuration = cdData.thisDuration;;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0