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> blade-common/src/main/java/org/springblade/common/converter/ListToStringConverter.java
File was renamed from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/report/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; blade-common/src/main/java/org/springblade/common/converter/LocalDateTimeConverter.java
New file @@ -0,0 +1,4 @@ package org.springblade.common.converter; public class LocalDateTimeConverter { } blade-common/src/main/java/org/springblade/common/converter/SexConverter.java
File was renamed from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/report/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; blade-common/src/main/java/org/springblade/common/entity/AlarmExcel.java
File was renamed from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/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; blade-common/src/main/java/org/springblade/common/entity/AnimalHeatExcel.java
File was renamed from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/vo/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度为高温 } blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java
File was renamed from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/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; }
File was renamed from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ParceLev.java @@ -1,4 +1,4 @@ package org.springblade.jfpt.parcel.vo; package org.springblade.common.entity; import lombok.AllArgsConstructor; import lombok.Data; blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java
File was renamed from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/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;
File was renamed from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/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;
