From 025946b59caea5422c751c9b2fc38db21c0a1d64 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 20 Apr 2021 20:46:58 +0800
Subject: [PATCH] 健康码，违禁品导出数据格式转换
---
blade-common/src/main/java/org/springblade/common/entity/AlarmExcel.java | 21 ++++++----
blade-common/src/main/java/org/springblade/common/converter/HealthcodeTypeConverter.java | 40 ++++++++++++++++++++
blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java | 3 +
blade-common/src/main/java/org/springblade/common/entity/ParcelKindExcel.java | 2
blade-common/src/main/java/org/springblade/common/converter/ParcelMarkConverter.java | 37 ++++++++++++++++++
blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java | 3 +
6 files changed, 95 insertions(+), 11 deletions(-)
diff --git a/blade-common/src/main/java/org/springblade/common/converter/HealthcodeTypeConverter.java b/blade-common/src/main/java/org/springblade/common/converter/HealthcodeTypeConverter.java
new file mode 100644
index 0000000..462cbbb
--- /dev/null
+++ b/blade-common/src/main/java/org/springblade/common/converter/HealthcodeTypeConverter.java
@@ -0,0 +1,40 @@
+package org.springblade.common.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import org.springframework.stereotype.Component;
+
+@Component
+public class HealthcodeTypeConverter implements Converter<String> {
+ @Override
+ public Class supportJavaTypeKey() {
+ return null;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return null;
+ }
+
+ @Override
+ public String convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+ return null;
+ }
+
+ @Override
+ public CellData convertToExcelData( String type, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+ if (type.equals("1")){
+ return new CellData("绿色健康码");
+ }
+ if (type.equals("2")){
+ return new CellData("黄色健康码");
+ }
+ if (type.equals("3")){
+ return new CellData("红色健康码");
+ }
+ return null;
+ }
+}
diff --git a/blade-common/src/main/java/org/springblade/common/converter/ParcelMarkConverter.java b/blade-common/src/main/java/org/springblade/common/converter/ParcelMarkConverter.java
new file mode 100644
index 0000000..f9327e9
--- /dev/null
+++ b/blade-common/src/main/java/org/springblade/common/converter/ParcelMarkConverter.java
@@ -0,0 +1,37 @@
+package org.springblade.common.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ParcelMarkConverter implements Converter<String> {
+ @Override
+ public Class supportJavaTypeKey() {
+ return null;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return null;
+ }
+
+ @Override
+ public String convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+ return null;
+ }
+
+ @Override
+ public CellData convertToExcelData( String type, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+ if (type.equals("1")){
+ return new CellData("违禁");
+ }
+ if (type.equals("0")){
+ return new CellData("非违禁");
+ }
+ return null;
+ }
+}
diff --git a/blade-common/src/main/java/org/springblade/common/entity/AlarmExcel.java b/blade-common/src/main/java/org/springblade/common/entity/AlarmExcel.java
index ca944c7..0347e13 100644
--- a/blade-common/src/main/java/org/springblade/common/entity/AlarmExcel.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/AlarmExcel.java
@@ -1,5 +1,6 @@
package org.springblade.common.entity;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -42,8 +43,9 @@
private String galarmPeople;
- @ColumnWidth(15)
- @ExcelProperty("性别(0:男,1:女)")
+// @ColumnWidth(15)
+// @ExcelProperty("性别(0:男,1:女)")
+ @ExcelIgnore
private String sex;
@@ -83,13 +85,15 @@
private String district;
- @ColumnWidth(10)
- @ExcelProperty("省份")
+// @ColumnWidth(10)
+// @ExcelProperty("省份")
+ @ExcelIgnore
private String province;
- @ColumnWidth(10)
- @ExcelProperty("地市")
+// @ColumnWidth(10)
+// @ExcelProperty("地市")
+ @ExcelIgnore
private String city;
@@ -117,8 +121,9 @@
private String wd;
- @ColumnWidth(10)
- @ExcelProperty("是否生成警单(0:否 1：是)")
+// @ColumnWidth(10)
+// @ExcelProperty("是否生成警单(0:否 1：是)")
+ @ExcelIgnore
private String jtype;
@ColumnWidth(20)
diff --git a/blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java b/blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java
index ff94371..8d27d3a 100644
--- a/blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java
@@ -5,6 +5,7 @@
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
+import org.springblade.common.converter.HealthcodeTypeConverter;
@Data
@@ -20,7 +21,7 @@
@ColumnWidth(15)
- @ExcelProperty("类型(1:绿色 2:黄色 3:红色)")
+ @ExcelProperty(value = "类型",converter = HealthcodeTypeConverter.class)
private String type;
diff --git a/blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java b/blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java
index 268d2d9..3d85628 100644
--- a/blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java
@@ -6,6 +6,7 @@
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
import org.springblade.common.converter.ListToStringConverter;
+import org.springblade.common.converter.ParcelMarkConverter;
import java.util.List;
@@ -48,7 +49,7 @@
private String samplingTime;
@ColumnWidth(20)
- @ExcelProperty("是否识别违禁, 1-违禁 0-非违禁")
+ @ExcelProperty(value = "是否识别违禁",converter = ParcelMarkConverter.class)
private String mechineMark;
@ColumnWidth(50)
diff --git a/blade-common/src/main/java/org/springblade/common/entity/ParcelKindExcel.java b/blade-common/src/main/java/org/springblade/common/entity/ParcelKindExcel.java
index 4e566ae..4a8ce69 100644
--- a/blade-common/src/main/java/org/springblade/common/entity/ParcelKindExcel.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/ParcelKindExcel.java
@@ -32,7 +32,7 @@
private String levName;
@ColumnWidth(30)
- @ExcelProperty(value = "违禁品坐标,list格式",converter = ListToStringConverter.class)
+ @ExcelProperty(value = "违禁品坐标",converter = ListToStringConverter.class)
private List<String> coords;
@ColumnWidth(30)
--
Gitblit v1.9.3