From 4342b12d28b15e61bbed4d4d5e64a6a2bacae952 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 27 二月 2024 12:56:11 +0800
Subject: [PATCH] 1、完善代码； 2、实现开闭上报处理
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java | 76 +++++++++++++++++--------------------
1 files changed, 35 insertions(+), 41 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveReport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
similarity index 69%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveReport.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
index f507c15..01cac87 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveReport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
@@ -1,6 +1,5 @@
package com.dy.pipIrrGlobal.pojoRm;
-
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -15,9 +14,9 @@
/**
* @Author liurunyu
- * @Date 2024/1/16 19:44
- * @LastEditTime 2024/1/16 19:44
- * @Description 鎺у埗鍣ㄥ紑鍏抽榾璁板綍
+ * @Date 2024/2/23 15:42
+ * @LastEditTime 2024/2/23 15:42
+ * @Description 鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁
*/
@TableName(value="rm_open_close_valve_report", autoResultMap = true)
@Data
@@ -25,148 +24,143 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "鎺у埗鍣ㄥ紑鍏抽榾璁板綍")
-public class RmOpenCloseValveReport implements BaseEntity {
+@Schema(name = "鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁")
+public class RmOpenCloseValveHistory implements BaseEntity {
- public static final long serialVersionUID = 202401161929001L;
+ public static final long serialVersionUID = 202402231450001L;
/**
* 涓婚敭
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
public Long id;
-
/**
* 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
*/
@Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long controllerid;
+ public Long controllerId;
/**
* 鍙栨按鍙ｅ疄浣揑D锛堝閿級
*/
@Schema(description = "鍙栨按鍙ｅ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long intakeid;
+ public Long intakeId;
/**
* 鎺у埗鍣ㄥ湴鍧�
*/
@Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
- public String rtuaddr;
+ public String rtuAddr;
/**
- * 寮�闃�鏁版嵁鎺ユ敹鏃堕棿
+ * 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
*/
- @Schema(description = "寮�闃�鏁版嵁鎺ユ敹鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Schema(description = "鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date opdt;
+ public Date opDt;
/**
* 寮�闃�绫诲瀷
*/
@Schema(description = "寮�闃�绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte optype;
+ public Byte opType;
/**
* 寮�闃�鏃剁疮璁℃祦閲�
*/
@Schema(description = "寮�闃�鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double optotalamount;
+ public Double opTotalAmount;
/**
* 寮�闃�IC鍗＄紪鍙�
*/
@Schema(description = "寮�闃�IC鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String opiccardno;
+ public String opIcCardNo;
/**
* 寮�闃�ic鍗″湴鍧�
*/
@Schema(description = "寮�闃�ic鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String opiccardaddr;
+ public String opIcCardAddr;
/**
* 寮�闃�鏃跺墿浣欓噾棰�
*/
@Schema(description = "寮�闃�鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double opremainmoney;
+ public Double opRemainMoney;
/**
* 寮�闃�鏃舵帶鍒跺櫒鏃堕挓
*/
@Schema(description = "寮�闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date opendt;
+ public Date openDt;
/**
* 鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
*/
- @Schema(description = "闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date cldt;
+ @Schema(description = "鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Date clDt;
/**
* 鍏抽榾绫诲瀷
*/
@Schema(description = "鍏抽榾绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte cltype;
+ public Byte clType;
/**
* 鍏抽榾鏃剁疮璁℃祦閲�
*/
@Schema(description = "鍏抽榾鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double cltotalamount;
+ public Double clTotalAmount;
/**
- * 鍏抽榾鏃禝C鍗＄紪鍙�
- */
+ * 鍏抽榾鏃禝C鍗＄紪鍙�
+ */
@Schema(description = "鍏抽榾鏃禝C鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String cliccardno;
+ public String clIcCardNo;
/**
* 鍏抽榾鏃禝C鍗″湴鍧�
*/
@Schema(description = "鍏抽榾鏃禝C鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String cliccardaddr;
+ public String clIcCardAddr;
/**
* 鍏抽榾鏃跺墿浣欓噾棰�
*/
@Schema(description = "鍏抽榾鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double clremainmoney;
+ public Double clRemainMoney;
/**
* 鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�
*/
- @Schema(description = "鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double clthisamount;
+ @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 Double clThisMoney;
/**
* 鍏抽榾鎶ヤ腑鏈鐢ㄦ按鏃堕暱锛堝垎閽燂級
*/
- @Schema(description = "鍏抽榾鎶ヤ腑鏈鐢ㄦ按鏃堕暱锛堝垎閽燂級", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Integer clthistime;
+ @Schema(description = "鍏抽榾鏃舵湰娆＄敤姘存椂闀匡紙鍒嗛挓锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer clThisTime;
/**
* 鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓
*/
@Schema(description = "鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date clopendt;
+ public Date clOpenDt;
/**
* 鍏抽榾鏃舵帶鍒跺櫒鏃堕挓
*/
@Schema(description = "鍏抽榾鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date closedt;
+ public Date closeDt;
}
\ No newline at end of file
--
Gitblit v1.8.0