refactor($POI): move annotation class

johnnymillergh · Sep 26, 2021 · 2729771 · 2729771
1 parent e0c08b7
commit 2729771
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/entity/RoleExcelBean.java b/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/entity/RoleExcelBean.java
@@ -1,7 +1,7 @@
 package com.jmsoftware.maf.authcenter.role.entity;
 
 import com.jmsoftware.maf.authcenter.role.entity.persistence.Role;
-import com.jmsoftware.maf.springcloudstarter.annotation.ExcelColumn;
+import com.jmsoftware.maf.springcloudstarter.poi.ExcelColumn;
 import lombok.Data;
 import lombok.val;
 

diff --git a/.../src/main/java/com/jmsoftware/maf/springcloudstarter/poi/AbstractExcelDataController.java b/.../src/main/java/com/jmsoftware/maf/springcloudstarter/poi/AbstractExcelDataController.java
@@ -1,6 +1,6 @@
 package com.jmsoftware.maf.springcloudstarter.poi;
 
-import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelWriter;
@@ -9,7 +9,6 @@
 import com.google.common.collect.Maps;
 import com.jmsoftware.maf.common.bean.ExcelImportResult;
 import com.jmsoftware.maf.common.bean.ResponseBodyBean;
-import com.jmsoftware.maf.springcloudstarter.annotation.ExcelColumn;
 import com.jmsoftware.maf.springcloudstarter.util.CaseConversionUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.Cleanup;
@@ -160,7 +159,7 @@ protected void initContext() {
         for (var index = 0; index < declaredFields.length; index++) {
             val declaredField = declaredFields[index];
             fieldNames[index] = declaredField.getName();
-            final ExcelColumn excelColumn = declaredField.getAnnotation(ExcelColumn.class);
+            val excelColumn = declaredField.getAnnotation(ExcelColumn.class);
             var columnName = excelColumn.name();
             if (StrUtil.isBlank(columnName)) {
                 columnName = CaseConversionUtil.convertToStartCase(StrUtil.toSymbolCase(declaredField.getName(), ' '));
@@ -328,8 +327,8 @@ private void handlePreviousException() {
 
     private void exeDatabaseOperation() {
         // if no error message (errorMessageList if empty) or not denyAll, then execute DB operation
-        if (CollectionUtil.isEmpty(this.errorMessageList.get()) || !this.denyAll) {
-            if (CollectionUtil.isNotEmpty(this.beanList.get())) {
+        if (CollUtil.isEmpty(this.errorMessageList.get()) || !this.denyAll) {
+            if (CollUtil.isNotEmpty(this.beanList.get())) {
                 this.setReturnMessageList("Starting - Import data…");
                 try {
                     this.executeDatabaseOperation(this.beanList.get());
@@ -445,7 +444,7 @@ private void uploadWorkbook() {
      */
     @SuppressWarnings("RedundantThrows")
     private void bindData(Workbook workbook) {
-        for (int index = 0; index < workbook.getNumberOfSheets(); index++) {
+        for (var index = 0; index < workbook.getNumberOfSheets(); index++) {
             val sheet = workbook.getSheetAt(index);
             val excelReader = new ExcelReader(workbook, index);
             excelReader.setHeaderAlias(this.importingFieldAliasMap);

diff --git a/...gcloudstarter/annotation/ExcelColumn.java → ...f/springcloudstarter/poi/ExcelColumn.java b/...gcloudstarter/annotation/ExcelColumn.java → ...f/springcloudstarter/poi/ExcelColumn.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.springcloudstarter.annotation;
+package com.jmsoftware.maf.springcloudstarter.poi;
 
 import org.apache.poi.ss.usermodel.CellType;