From dc8008be8836c212f17fa29df7eac52a8fe716c4 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 03 七月 2024 15:46:21 +0800
Subject: [PATCH] 2024-07-03 朱宝民 小程序远程开阀支持扫码开阀
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java | 305 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 202 insertions(+), 103 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..c86489c 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
@@ -1,14 +1,18 @@
package com.dy.pipIrrGlobal.pojoRm;
+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.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 java.util.Date;
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.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 +20,296 @@
import java.util.Date;
/**
- * @author ZhuBaoMin
- * @date 2024-06-17 11:27
- * @LastEditTime 2024-06-17 11:27
+ * @Author: liurunyu
+ * @Date: 2024/7/1 15:28
* @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锛堝閿級
*/
+ @Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- private Long controllerId;
+ public Long controllerId;
/**
* 鍙栨按鍙ｅ疄浣揑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浣嶆暟瀛楋級
+ * 寮�闃�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;
/**
- * 寮�娉�/闃�鏃堕棿
+ * 寮�闃�鏃跺墿浣欓噾棰�
*/
- @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 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 Byte 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;
-
- /**
- * 寮�濮嬫椂闂�(鍒嗘椂鏃ユ湀)
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date startDt;
-
- /**
- * 缁撴潫鏃堕棿(鍒嗘椂鏃ユ湀)
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- 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 thisEle;
- /**
- * 鏈浣跨敤姘撮噺
- */
- 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);
+ 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;
- /**
- * 鏈浣跨敤閲戦
- */
- 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;
+ this.clOrderNo = null;//姹熸捣鍗忚鐗规湁
+ this.clEleTotalAmount = null;//姹熸捣鍗忚鐗规湁
+ this.clWaterRemainUser = null;//姹熸捣鍗忚鐗规湁
+ this.thisEle = null;//姹熸捣鍗忚鐗规湁
}
- 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);
+ 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.thisEle = null;//姹熸捣鍗忚鐗规湁
+ }
+
+ 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.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;;
+ }
+
+ 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