From f89c8d19d96fdbff3081ba4ac48ea3e72168bc59 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 20 五月 2022 15:52:44 +0800
Subject: [PATCH] 日志

---
 dao/src/main/java/com/sandu/ximon/dao/domain/LightReportData.java |   51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LightReportData.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LightReportData.java
index 101b032..f2bce66 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LightReportData.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/LightReportData.java
@@ -1,101 +1,142 @@
 package com.sandu.ximon.dao.domain;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.sandu.ximon.dao.utils.LocalDateStringConverter;
 import lombok.Data;
 
 /**
  * 鐏笂鎶ユ暟鎹〃
+ *
  * @TableName light_report_data
  */
-@TableName(value ="light_report_data")
+@TableName(value = "light_report_data")
 @Data
 public class LightReportData implements Serializable {
     /**
-     * 
+     *
      */
     @TableId(type = IdType.AUTO)
+
+    @ExcelProperty("id")
     private Long lightReportDataId;
 
     /**
      * 璁惧mac
      */
+    @ExcelProperty("璁惧mac")
     private String deviceCode;
 
     /**
      * 甯傜數鐢靛帇
      */
+    @ExcelProperty("甯傜數鐢靛帇")
     private Double voltage;
 
     /**
      * 甯傜數鐢垫祦
      */
+    @ExcelProperty("甯傜數鐢垫祦")
     private Double electricCurrent;
 
     /**
      * 璁惧娓╁害
      */
+    @ExcelProperty("璁惧娓╁害")
     private Double deviceTemperature;
 
     /**
      * 鍔熺巼鍥犵礌
      */
+    @ExcelProperty("鍔熺巼鍥犵礌")
     private Double powerFactor;
 
     /**
      * 鏈夊姛鍔熺巼
      */
+    @ExcelProperty("鏈夊姛鍔熺巼")
     private Double activePower;
 
     /**
      * 鏃犲姛鍔熺巼
      */
+    @ExcelProperty("鏃犲姛鍔熺巼")
     private Double reactivePower;
 
     /**
      * 鐏�1浜害鐧惧垎姣旓紝0-100
      */
+    @ExcelProperty("鐏�1浜害鐧惧垎姣旓紝0-100")
     private Integer lightPercent;
 
     /**
      * 鐏�2浜害鐧惧垎姣�
      */
+    @ExcelProperty("鐏�2浜害鐧惧垎姣�")
     private Integer light2Percent;
 
     /**
      * 鏈�杩戜竴娆′寒鐏椂闂�
      */
+    @ExcelProperty("鏈�杩戜竴娆′寒鐏椂闂�")
     private Long recentlyLightSec;
 
     /**
      * 鎬讳寒鐏椂闂�
      */
+    @ExcelProperty("鎬讳寒鐏椂闂�")
     private Long totalLightSec;
 
     /**
      * 鏈�杩戜竴娆＄敤鐢甸噺
      */
+    @ExcelProperty("鏈�杩戜竴娆＄敤鐢甸噺")
     private Double recentlyUsingPower;
 
     /**
      * 鎬荤敤鐢甸噺
      */
+    @ExcelProperty("鎬荤敤鐢甸噺")
     private Double totalUsingPower;
 
     /**
      * 鍒涘缓鏃堕棿
      */
-    private LocalDateTime createTime;
+    @ExcelProperty(value = "鍒涘缓鏃堕棿", converter = LocalDateStringConverter.class)
+    @JsonIgnore
+    private LocalDateTime createTime1;
 
     /**
-     * 
+     *
      */
-    private LocalDateTime updateTime;
+    @ExcelProperty(value = "鏇存柊鏃堕棿", converter = LocalDateStringConverter.class)
+    @JsonIgnore
+    private LocalDateTime updateTime1;
+
+    /**
+     * 鐢ㄤ簬鍓嶆灞曠ず
+     */
+    @TableField(exist = false)
+    private String updateTime;
+
+    /**
+     * 鐢ㄤ簬鍓嶆灞曠ず
+     */
+    @TableField(exist = false)
+    private String createTime;
+
 
     @TableField(exist = false)
+    @ExcelIgnore
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

--
Gitblit v1.9.3