From 3e93229314ae6072f7bd82a30fa647644b1d185a Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 15 十二月 2021 10:16:39 +0800
Subject: [PATCH] 细节调整

---
 dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampData.java |   82 ++++++++++++++++++++++++++++++-----------
 1 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampData.java b/dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampData.java
index b33f057..48a4338 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampData.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampData.java
@@ -1,58 +1,96 @@
 package com.sandu.ximon.dao.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDateTime;
-
+import lombok.Data;
 
 /**
- * 鍗曠伅鏁版嵁
+ * 鍗曠伅鐩戞帶鏁版嵁琛�
+ * @TableName single_lamp_data
  */
-
+@TableName(value ="single_lamp_data")
 @Data
 public class SingleLampData implements Serializable {
-
+    /**
+     * 
+     */
     @TableId(type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 
+     */
     private Long userId;
 
-    /*鐏潌鍚嶇О*/
+    /**
+     * 鐏潌鍚嶇О
+     */
     private String lampName;
 
-    /*甯傜數鐢靛帇*/
+    /**
+     * 甯傜數鐢靛帇
+     */
     private Double mainsVoltage;
 
-    /*甯傜數鐢垫祦*/
+    /**
+     * 甯傜數鐢垫祦
+     */
     private Double mainsCurrent;
 
-    /*璁惧娓╁害*/
+    /**
+     * 璁惧娓╁害
+     */
     private Double temperature;
 
-    /*鍔熺巼鍥犳暟*/
+    /**
+     * 鍔熺巼鍥犳暟
+     */
     private Double powerFactor;
 
-    /*鏈夊姛鍔熺巼*/
+    /**
+     * IMEI鍙�
+     */
+    private String imei;
+
+    /**
+     * ICCID鍙�
+     */
+    private String iccId;
+
+    /**
+     * 鏈夊姛鍔熺巼
+     */
     private Integer activePower;
 
-    /*鏈浜伅鏃堕棿*/
+    /**
+     * 鏈浜伅鏃堕棿
+     */
     private LocalDateTime lightingTime;
 
-    /*鏈鐢ㄧ數閲�*/
-    private Double electricityConsumption;
+    /**
+     * 鏈鐢ㄧ數閲�
+     */
+    private Double electricityEonsumption;
 
-    /*鎬荤敤鐢甸噺*/
-    private Double totalAlectricityConsumption;
+    /**
+     * 鎬荤敤鐢甸噺
+     */
+    private Double totalElectricityEonsumption;
 
-    /*鐏潌浜害*/
+    /**
+     * 鐏潌浜害
+     */
     private Double lightPoleBrightness;
 
-    /*鏇存柊鏃堕棿*/
+    /**
+     * 鏇存柊鏃堕棿
+     */
     private LocalDateTime updateTime;
 
-
-
-}
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

--
Gitblit v1.9.3