From b67bd85fbe51486dcacf5a5e3b308e4a0f3e2e43 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期日, 24 四月 2022 18:35:42 +0800
Subject: [PATCH] bug修复

---
 dao/src/main/java/com/sandu/ximon/dao/domain/LightReportData.java |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 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 f2fa8f6..7115834 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,11 +1,16 @@
 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.sandu.ximon.dao.utils.LocalDateStringConverter;
 import lombok.Data;
 
 /**
@@ -19,78 +24,101 @@
      * 
      */
     @TableId(type = IdType.AUTO)
+
+    @ExcelProperty("id")
     private Long lightReportDataId;
 
     /**
      * 璁惧mac
      */
-    private String deviceMac;
+    @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;
 
     /**
-     * 浜害鐧惧垎姣旓紝0-100
+     * 鐏�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;
 
     /**
      * 鍒涘缓鏃堕棿
      */
+    @ExcelProperty(value = "鍒涘缓鏃堕棿",converter = LocalDateStringConverter.class)
     private LocalDateTime createTime;
 
     /**
      * 
      */
+    @ExcelProperty(value = "鏇存柊鏃堕棿",converter = LocalDateStringConverter.class)
     private LocalDateTime updateTime;
 
     @TableField(exist = false)
+    @ExcelIgnore
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

--
Gitblit v1.9.3