From 26fc652d33fb82a75d6ec7771ca50ee414b21723 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 11 一月 2022 16:58:47 +0800
Subject: [PATCH] update 统一代码间隔符
---
ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java | 80 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
index 7c4d631..cf612c9 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
@@ -24,48 +24,48 @@
@Slf4j
public class ExcelDictConvert implements Converter<Object> {
- @Override
- public Class<Object> supportJavaTypeKey() {
- return Object.class;
- }
+ @Override
+ public Class<Object> supportJavaTypeKey() {
+ return Object.class;
+ }
- @Override
- public CellDataTypeEnum supportExcelTypeKey() {
- return null;
- }
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return null;
+ }
- @Override
- public Object convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
- ExcelDictFormat anno = getAnnotation(contentProperty.getField());
- String type = anno.dictType();
- String label = cellData.getStringValue();
- String value;
- if (StringUtils.isBlank(type)) {
- value = ExcelUtil.reverseByExp(label, anno.readConverterExp(), anno.separator());
- } else {
- value = SpringUtils.getBean(DictService.class).getDictValue(type, label, anno.separator());
- }
- return Convert.convert(contentProperty.getField().getType(), value);
- }
+ @Override
+ public Object convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+ ExcelDictFormat anno = getAnnotation(contentProperty.getField());
+ String type = anno.dictType();
+ String label = cellData.getStringValue();
+ String value;
+ if (StringUtils.isBlank(type)) {
+ value = ExcelUtil.reverseByExp(label, anno.readConverterExp(), anno.separator());
+ } else {
+ value = SpringUtils.getBean(DictService.class).getDictValue(type, label, anno.separator());
+ }
+ return Convert.convert(contentProperty.getField().getType(), value);
+ }
- @Override
- public CellData<String> convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
- if (StringUtils.isNull(object)) {
- return new CellData<>("");
- }
- ExcelDictFormat anno = getAnnotation(contentProperty.getField());
- String type = anno.dictType();
- String value = Convert.toStr(object);
- String label;
- if (StringUtils.isBlank(type)) {
- label = ExcelUtil.convertByExp(value, anno.readConverterExp(), anno.separator());
- } else {
- label = SpringUtils.getBean(DictService.class).getDictLabel(type, value, anno.separator());
- }
- return new CellData<>(label);
- }
+ @Override
+ public CellData<String> convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+ if (StringUtils.isNull(object)) {
+ return new CellData<>("");
+ }
+ ExcelDictFormat anno = getAnnotation(contentProperty.getField());
+ String type = anno.dictType();
+ String value = Convert.toStr(object);
+ String label;
+ if (StringUtils.isBlank(type)) {
+ label = ExcelUtil.convertByExp(value, anno.readConverterExp(), anno.separator());
+ } else {
+ label = SpringUtils.getBean(DictService.class).getDictLabel(type, value, anno.separator());
+ }
+ return new CellData<>(label);
+ }
- private ExcelDictFormat getAnnotation(Field field) {
- return AnnotationUtil.getAnnotation(field, ExcelDictFormat.class);
- }
+ private ExcelDictFormat getAnnotation(Field field) {
+ return AnnotationUtil.getAnnotation(field, ExcelDictFormat.class);
+ }
}
--
Gitblit v1.9.3