From 740d922328b38cbb30c5891cabd4216066141b49 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 14 Apr 2021 21:25:11 +0800
Subject: [PATCH] 新增导出数据模板，提供公共的实体类及解析器
---
blade-common/src/main/java/org/springblade/common/entity/ParceLev.java | 2 +-
blade-common/src/main/java/org/springblade/common/entity/AlarmExcel.java | 2 +-
blade-common/src/main/java/org/springblade/common/converter/SexConverter.java | 2 +-
blade-common/src/main/java/org/springblade/common/entity/AnimalHeatExcel.java | 6 ++++--
blade-common/pom.xml | 8 ++++++++
blade-common/src/main/java/org/springblade/common/converter/ListToStringConverter.java | 2 +-
blade-common/src/main/java/org/springblade/common/converter/LocalDateTimeConverter.java | 4 ++++
blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java | 4 ++--
blade-common/src/main/java/org/springblade/common/entity/ParcelKindExcel.java | 4 ++--
blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java | 3 ++-
10 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/blade-common/pom.xml b/blade-common/pom.xml
index ade6a30..b99eeab 100644
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@@ -28,6 +28,14 @@
<artifactId>blade-core-auto</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-starter-excel</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/report/converter/ListToStringConverter.java b/blade-common/src/main/java/org/springblade/common/converter/ListToStringConverter.java
similarity index 94%
rename from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/report/converter/ListToStringConverter.java
rename to blade-common/src/main/java/org/springblade/common/converter/ListToStringConverter.java
index b99d268..6b4c23a 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/report/converter/ListToStringConverter.java
+++ b/blade-common/src/main/java/org/springblade/common/converter/ListToStringConverter.java
@@ -1,4 +1,4 @@
-package org.springblade.jfpt.report.converter;
+package org.springblade.common.converter;
import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum;
diff --git a/blade-common/src/main/java/org/springblade/common/converter/LocalDateTimeConverter.java b/blade-common/src/main/java/org/springblade/common/converter/LocalDateTimeConverter.java
new file mode 100644
index 0000000..92db92e
--- /dev/null
+++ b/blade-common/src/main/java/org/springblade/common/converter/LocalDateTimeConverter.java
@@ -0,0 +1,4 @@
+package org.springblade.common.converter;
+
+public class LocalDateTimeConverter {
+}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/report/converter/SexConverter.java b/blade-common/src/main/java/org/springblade/common/converter/SexConverter.java
similarity index 94%
rename from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/report/converter/SexConverter.java
rename to blade-common/src/main/java/org/springblade/common/converter/SexConverter.java
index d6db501..2e2104f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/report/converter/SexConverter.java
+++ b/blade-common/src/main/java/org/springblade/common/converter/SexConverter.java
@@ -1,4 +1,4 @@
-package org.springblade.jfpt.report.converter;
+package org.springblade.common.converter;
import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum;
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmExcel.java b/blade-common/src/main/java/org/springblade/common/entity/AlarmExcel.java
similarity index 98%
rename from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmExcel.java
rename to blade-common/src/main/java/org/springblade/common/entity/AlarmExcel.java
index 8d00478..ca944c7 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmExcel.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/AlarmExcel.java
@@ -1,4 +1,4 @@
-package org.springblade.jfpt.alarm.vo;
+package org.springblade.common.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/vo/AnimalHeatExcel.java b/blade-common/src/main/java/org/springblade/common/entity/AnimalHeatExcel.java
similarity index 88%
rename from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/vo/AnimalHeatExcel.java
rename to blade-common/src/main/java/org/springblade/common/entity/AnimalHeatExcel.java
index 1f986f0..8139022 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/vo/AnimalHeatExcel.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/AnimalHeatExcel.java
@@ -1,4 +1,4 @@
-package org.springblade.jfpt.animalheat.vo;
+package org.springblade.common.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
@@ -47,5 +47,7 @@
@ExcelProperty("创建时间")
private Date createTime;// datetime DEFAULT NULL COMMENT '创建时间',
- //private Integer status;//状态 1为高温 0为正常 ，以37度为标准，大于37度为高温
+ @ColumnWidth(25)
+ @ExcelProperty("状态 1:异常 0:正常")
+ private Integer status;//状态 1为异常 0为正常 ，以37.3度为标准，大于37.3度为高温
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/HealthcodeExcel.java b/blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java
similarity index 94%
rename from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/HealthcodeExcel.java
rename to blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java
index 27f037f..ff94371 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/HealthcodeExcel.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java
@@ -1,4 +1,4 @@
-package org.springblade.jfpt.healthcode.vo;
+package org.springblade.common.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
@@ -50,3 +50,4 @@
private String dtime;
}
+
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ParceLev.java b/blade-common/src/main/java/org/springblade/common/entity/ParceLev.java
similarity index 86%
rename from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ParceLev.java
rename to blade-common/src/main/java/org/springblade/common/entity/ParceLev.java
index d5340ac..ccdb2c1 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ParceLev.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/ParceLev.java
@@ -1,4 +1,4 @@
-package org.springblade.jfpt.parcel.vo;
+package org.springblade.common.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ParcelExcel.java b/blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java
similarity index 91%
rename from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ParcelExcel.java
rename to blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java
index b7cc6ba..268d2d9 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ParcelExcel.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java
@@ -1,11 +1,11 @@
-package org.springblade.jfpt.parcel.vo;
+package org.springblade.common.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
-import org.springblade.jfpt.report.converter.ListToStringConverter;
+import org.springblade.common.converter.ListToStringConverter;
import java.util.List;
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ParcelKindExcel.java b/blade-common/src/main/java/org/springblade/common/entity/ParcelKindExcel.java
similarity index 90%
rename from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ParcelKindExcel.java
rename to blade-common/src/main/java/org/springblade/common/entity/ParcelKindExcel.java
index 455cf34..4e566ae 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ParcelKindExcel.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/ParcelKindExcel.java
@@ -1,11 +1,11 @@
-package org.springblade.jfpt.parcel.vo;
+package org.springblade.common.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
-import org.springblade.jfpt.report.converter.ListToStringConverter;
+import org.springblade.common.converter.ListToStringConverter;
import java.util.List;
--
Gitblit v1.9.3