From bc940795faa161a988a7df3f27072bb426f17fdb Mon Sep 17 00:00:00 2001
From: LHN <31457034@qq.com>
Date: 星期三, 19 十月 2022 16:34:09 +0800
Subject: [PATCH] changes
---
dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java | 65 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java b/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java
index b8b02e8..e6bbe72 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java
@@ -1,30 +1,21 @@
package com.sandu.ximon.dao.domain;
-
-
-
-
-
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.sandu.ximon.dao.enums.OrderStatus;
-import com.sandu.ximon.dao.enums.OrderType;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
-import org.springframework.core.annotation.OrderUtils;
-
import java.io.Serializable;
-import java.util.Date;
/**
* C3璁㈠崟琛�
+ *
* @TableName c3_order
*/
-@TableName(value ="c3_order")
+@TableName(value = "c3_order")
@Data
public class C3mOrder implements Serializable {
-
public static String REQUEST_URL = "http://www.ximonsmart.com/charge/#/charge/";
/**
@@ -39,14 +30,29 @@
private Long poleId;
/**
+ * 瀵瑰簲鐨勭伅鏉嗚澶噈ac
+ */
+ private String poleMac;
+
+ /**
+ * 鐏潌鍚嶇О
+ */
+ private String poleName;
+
+ /**
* 鍏呯數妗㎝AC
*/
private String c3Mac;
/**
- * 瀵瑰簲鐨勭伅鏉嗚澶噈ac
+ * 鍏呯數妗╁悕绉�
*/
- private String poleMac;
+ private String c3Name;
+
+ /**
+ * udid
+ */
+ private String c3Udid;
/**
* 璁㈠崟鍟嗘埛鍙�
@@ -64,9 +70,9 @@
private Double totalAmount;
/**
- * 瀹炴敹閲戦
+ * 鍓╀綑閲戦
*/
- private Double receiptAmount;
+ private Double surplusAmount;
/**
* 閫�娆�
@@ -84,9 +90,15 @@
private Integer subscribeChargingCapacity;
/**
- * 瀹炲厖鐢甸噺
+ * 瀹炲厖鐢甸噺 鍓嶇鏄剧ず
*/
private Double actualChargingCapacity;
+
+ /**
+ * 瀹炲厖鐢甸噺 鍚庣璁＄畻鐢� 涓昏鐢ㄤ簬寮傚父鎯呭喌涓嬬殑鍏呯數鐢甸噺璁板綍
+ */
+ @JsonIgnore
+ private Double actualChargingCapacityHide;
/**
* 璁㈠崟鍒涘缓鏃堕棿鎴�
@@ -119,22 +131,23 @@
private Long stopChargingTimestamp;
/**
- * 璁㈠崟鐘舵�侊細// 鏈敮浠�(0)锛屽凡鏀粯(1),宸查��娆�(2),閫�娆句腑(3),閫�娆惧け璐�(4),璁㈠崟瀹屾垚(5)
+ * 璁㈠崟鐘舵�侊細// 宸叉敮浠�(1),宸查��娆�(3),閫�娆句腑(2),閫�娆惧け璐�5),璁㈠崟瀹屾垚(4)
*/
private Integer orderStatus;
- /**
- * 鍏呯數妗╁悕绉�
- */
- private String c3Name;
+
+ private String alreadyChargingTime;
/**
- * 鐏潌鍚嶇О
+ * 0 鍏呯數涓� 1鍏呯數缁撴潫
*/
- private String poleName;
+ private Integer chargingStates;
+
+ /**
+ * 鐢ㄦ埛鏍囪瘑
+ */
+ private String userCode;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
-
-
}
\ No newline at end of file
--
Gitblit v1.9.3