From c807f0ed336fecbbea89eb040e28b6fa0046fb6f Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期六, 02 四月 2022 10:48:42 +0800
Subject: [PATCH] 单灯数据导出
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java | 2 +-
dao/src/main/java/com/sandu/ximon/dao/utils/LocalDateStringConverter.java | 2 +-
dao/src/main/java/com/sandu/ximon/dao/domain/LightReportData.java | 7 ++++---
3 files changed, 6 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 9ab8359..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
@@ -9,7 +9,8 @@
import java.io.Serializable;
import java.time.LocalDateTime;
-import javafx.util.converter.LocalDateStringConverter;
+
+import com.sandu.ximon.dao.utils.LocalDateStringConverter;
import lombok.Data;
/**
@@ -108,13 +109,13 @@
/**
* 鍒涘缓鏃堕棿
*/
-// @ExcelProperty(value = "鍒涘缓鏃堕棿",converter = LocalDateStringConverter.class)
+ @ExcelProperty(value = "鍒涘缓鏃堕棿",converter = LocalDateStringConverter.class)
private LocalDateTime createTime;
/**
*
*/
- @ExcelProperty("鏇存柊鏃堕棿")
+ @ExcelProperty(value = "鏇存柊鏃堕棿",converter = LocalDateStringConverter.class)
private LocalDateTime updateTime;
@TableField(exist = false)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/LocalDateStringConverter.java b/dao/src/main/java/com/sandu/ximon/dao/utils/LocalDateStringConverter.java
similarity index 97%
rename from ximon-admin/src/main/java/com/sandu/ximon/admin/security/LocalDateStringConverter.java
rename to dao/src/main/java/com/sandu/ximon/dao/utils/LocalDateStringConverter.java
index 087a08d..cb5b593 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/LocalDateStringConverter.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/utils/LocalDateStringConverter.java
@@ -1,4 +1,4 @@
-package com.sandu.ximon.admin.security;
+package com.sandu.ximon.dao.utils;
import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
index dfe8f31..3239d23 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
@@ -82,7 +82,7 @@
// excelWriter.fill(list, writeSheet);
// excelWriter.finish();
- EasyExcel.write(file, LightReportDataBo.class).sheet("妯℃澘").doWrite(list);
+ EasyExcel.write(file, LightReportDataBo.class).sheet("鍗曠伅鏁版嵁").doWrite(list);
String url = file.getPath().replace(properties.getUploadRootPath(), "");
return ResUtils.addPrefix(url);
--
Gitblit v1.9.3