✨ excel-spring-boot-starter v3.4.0

twelvet-projects · Dec 11, 2024 · 7ae3898 · 7ae3898
1 parent 72bf15c
commit 7ae3898
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 22 deletions.
diff --git a/data/twelvet_gen.sql b/data/twelvet_gen.sql
@@ -180,7 +180,7 @@ VALUES (7, 'SQL', '${backendPath}/${className}.sql', 'SQL',
         '2023-11-09 14:33:56', '2023-11-10 11:13:07', '0', 'admin', 'admin');
 INSERT INTO `gen_template`
 VALUES (8, '实体', '${backendPath}/src/main/java/${packagePath}/domain/${ClassName}.java', '实体',
-        'package ${packageName}.domain;\n\n#foreach ($import in $importList)\nimport ${import};\n#end\nimport com.alibaba.excel.annotation.ExcelProperty;\nimport com.twelvet.framework.core.application.domain.BaseEntity;\nimport org.apache.commons.lang3.builder.ToStringBuilder;\nimport org.apache.commons.lang3.builder.ToStringStyle;\n\nimport io.swagger.v3.oas.annotations.media.Schema;\n#if($table.crud || $table.sub)\n#elseif($table.tree)\nimport com.twelvet.framework.jdbc.web.domain.TreeEntity;\n#end\n\n/**\n * ${functionName}对象 ${tableName}\n *\n * @author ${author}\n * @WebSite twelvet.cn\n * @date ${datetime}\n */\n#if($table.crud || $table.sub)\n#set($Entity=\"BaseEntity\")\n#elseif($table.tree)\n#set($Entity=\"TreeEntity\")\n#end\n@Schema(description =\"${functionName}对象\")\npublic class ${ClassName} extends ${Entity} {\n\n    private static final long serialVersionUID = 1L;\n\n#foreach ($column in $columns)\n    #if(!$table.isSuperColumn($column.javaField))\n    /** $column.columnComment */\n    @Schema(description = \"$column.columnComment\")\n        #if($column.list)\n            #set($parentheseIndex=$column.columnComment.indexOf(\"（\"))\n            #if($parentheseIndex != -1)\n                #set($comment=$column.columnComment.substring(0, $parentheseIndex))\n            #else\n                #set($comment=$column.columnComment)\n            #end\n            #if($parentheseIndex != -1)\n    @ExcelProperty(value =\"${comment}($column.readConverterExp())\")\n            #elseif($column.javaType == \'Date\')\n    @JsonFormat(pattern = \"yyyy-MM-dd\")\n    @ExcelProperty(value =\"${comment}\", width = 30, dateFormat = \"yyyy-MM-dd\")\n            #else\n    @ExcelProperty(value =\"${comment}\")\n            #end\n        #end\n    private $column.javaType $column.javaField;\n\n    #end\n#end\n#if($table.sub)\n    /** $table.subTable.functionName信息 */\n    private List<${subClassName}> ${subclassName}List;\n\n#end\n#foreach ($column in $columns)\n#if(!$table.isSuperColumn($column.javaField))\n#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches(\"[A-Z]\"))\n#set($AttrName=$column.javaField)\n#else\n#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})\n#end\n    public void set${AttrName}($column.javaType $column.javaField)\n    {\n        this.$column.javaField = $column.javaField;\n    }\n\n    public $column.javaType get${AttrName}()\n    {\n        return $column.javaField;\n    }\n#end\n#end\n\n#if($table.sub)\n    public List<${subClassName}> get${subClassName}List()\n    {\n        return ${subclassName}List;\n    }\n\n    public void set${subClassName}List(List<${subClassName}> ${subclassName}List)\n    {\n        this.${subclassName}List = ${subclassName}List;\n    }\n\n#end\n    @Override\n    public String toString() {\n        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)\n#foreach ($column in $columns)\n#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches(\"[A-Z]\"))\n#set($AttrName=$column.javaField)\n#else\n#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})\n#end\n            .append(\"${column.javaField}\", get${AttrName}())\n#end\n#if($table.sub)\n            .append(\"${subclassName}List\", get${subClassName}List())\n#end\n            .toString();\n    }\n}\n',
+        'package ${packageName}.domain;\n\n#foreach ($import in $importList)\nimport ${import};\n#end\nimport cn.idev.excel.annotation.ExcelProperty;\nimport com.twelvet.framework.core.application.domain.BaseEntity;\nimport org.apache.commons.lang3.builder.ToStringBuilder;\nimport org.apache.commons.lang3.builder.ToStringStyle;\n\nimport io.swagger.v3.oas.annotations.media.Schema;\n#if($table.crud || $table.sub)\n#elseif($table.tree)\nimport com.twelvet.framework.jdbc.web.domain.TreeEntity;\n#end\n\n/**\n * ${functionName}对象 ${tableName}\n *\n * @author ${author}\n * @WebSite twelvet.cn\n * @date ${datetime}\n */\n#if($table.crud || $table.sub)\n#set($Entity=\"BaseEntity\")\n#elseif($table.tree)\n#set($Entity=\"TreeEntity\")\n#end\n@Schema(description =\"${functionName}对象\")\npublic class ${ClassName} extends ${Entity} {\n\n    private static final long serialVersionUID = 1L;\n\n#foreach ($column in $columns)\n    #if(!$table.isSuperColumn($column.javaField))\n    /** $column.columnComment */\n    @Schema(description = \"$column.columnComment\")\n        #if($column.list)\n            #set($parentheseIndex=$column.columnComment.indexOf(\"（\"))\n            #if($parentheseIndex != -1)\n                #set($comment=$column.columnComment.substring(0, $parentheseIndex))\n            #else\n                #set($comment=$column.columnComment)\n            #end\n            #if($parentheseIndex != -1)\n    @ExcelProperty(value =\"${comment}($column.readConverterExp())\")\n            #elseif($column.javaType == \'Date\')\n    @JsonFormat(pattern = \"yyyy-MM-dd\")\n    @ExcelProperty(value =\"${comment}\", width = 30, dateFormat = \"yyyy-MM-dd\")\n            #else\n    @ExcelProperty(value =\"${comment}\")\n            #end\n        #end\n    private $column.javaType $column.javaField;\n\n    #end\n#end\n#if($table.sub)\n    /** $table.subTable.functionName信息 */\n    private List<${subClassName}> ${subclassName}List;\n\n#end\n#foreach ($column in $columns)\n#if(!$table.isSuperColumn($column.javaField))\n#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches(\"[A-Z]\"))\n#set($AttrName=$column.javaField)\n#else\n#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})\n#end\n    public void set${AttrName}($column.javaType $column.javaField)\n    {\n        this.$column.javaField = $column.javaField;\n    }\n\n    public $column.javaType get${AttrName}()\n    {\n        return $column.javaField;\n    }\n#end\n#end\n\n#if($table.sub)\n    public List<${subClassName}> get${subClassName}List()\n    {\n        return ${subclassName}List;\n    }\n\n    public void set${subClassName}List(List<${subClassName}> ${subclassName}List)\n    {\n        this.${subclassName}List = ${subclassName}List;\n    }\n\n#end\n    @Override\n    public String toString() {\n        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)\n#foreach ($column in $columns)\n#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches(\"[A-Z]\"))\n#set($AttrName=$column.javaField)\n#else\n#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})\n#end\n            .append(\"${column.javaField}\", get${AttrName}())\n#end\n#if($table.sub)\n            .append(\"${subclassName}List\", get${subClassName}List())\n#end\n            .toString();\n    }\n}\n',
         '2023-11-09 14:52:04', '2023-11-10 16:18:52', '0', 'admin', 'admin');
 INSERT INTO `gen_template`
 VALUES (9, 'React页面', '${frontendPath}/react/pages/${moduleName}/${businessName}/index.tsx', 'React页面',

diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,7 @@
         <jasypt.version>3.0.5</jasypt.version>
 
         <xss-spring-boot-starter.version>3.1.5.1</xss-spring-boot-starter.version>
-        <excel-spring-boot-starter.version>3.3.1</excel-spring-boot-starter.version>
+        <excel-spring-boot-starter.version>3.4.0</excel-spring-boot-starter.version>
         <oss-spring-boot-starter.version>3.0.0</oss-spring-boot-starter.version>
         <idempotent-spring-boot-starter.version>0.4.0</idempotent-spring-boot-starter.version>
 

diff --git a/...ramework-core/src/main/java/com/twelvet/framework/core/application/domain/BaseEntity.java b/...ramework-core/src/main/java/com/twelvet/framework/core/application/domain/BaseEntity.java
@@ -1,8 +1,8 @@
 package com.twelvet.framework.core.application.domain;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import cn.idev.excel.annotation.ExcelIgnore;
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.write.style.ColumnWidth;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 

diff --git a/...ework/twelvet-framework-core/src/main/java/com/twelvet/system/api/domain/SysDictData.java b/...ework/twelvet-framework-core/src/main/java/com/twelvet/system/api/domain/SysDictData.java
@@ -1,6 +1,6 @@
 package com.twelvet.system.api.domain;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import com.twelvet.framework.core.constants.UserConstants;
 import io.swagger.v3.oas.annotations.media.Schema;

diff --git a/twelvet-gen/twelvet-gen-api/src/main/java/com/twelvet/gen/api/domain/GenDatasourceConf.java b/twelvet-gen/twelvet-gen-api/src/main/java/com/twelvet/gen/api/domain/GenDatasourceConf.java
@@ -1,6 +1,6 @@
 package com.twelvet.gen.api.domain;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.apache.commons.lang3.builder.ToStringBuilder;

diff --git a/twelvet-gen/twelvet-gen-api/src/main/java/com/twelvet/gen/api/domain/GenFieldType.java b/twelvet-gen/twelvet-gen-api/src/main/java/com/twelvet/gen/api/domain/GenFieldType.java
@@ -1,6 +1,6 @@
 package com.twelvet.gen.api.domain;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.apache.commons.lang3.builder.ToStringBuilder;

diff --git a/twelvet-gen/twelvet-gen-api/src/main/java/com/twelvet/gen/api/domain/GenGroup.java b/twelvet-gen/twelvet-gen-api/src/main/java/com/twelvet/gen/api/domain/GenGroup.java
@@ -1,6 +1,6 @@
 package com.twelvet.gen.api.domain;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.apache.commons.lang3.builder.ToStringBuilder;

diff --git a/twelvet-gen/twelvet-gen-api/src/main/java/com/twelvet/gen/api/domain/GenTemplate.java b/twelvet-gen/twelvet-gen-api/src/main/java/com/twelvet/gen/api/domain/GenTemplate.java
@@ -1,6 +1,6 @@
 package com.twelvet.gen.api.domain;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.apache.commons.lang3.builder.ToStringBuilder;

diff --git a/twelvet-gen/twelvet-gen-api/src/main/java/com/twelvet/gen/api/domain/dto/GenGroupDTO.java b/twelvet-gen/twelvet-gen-api/src/main/java/com/twelvet/gen/api/domain/dto/GenGroupDTO.java
@@ -1,6 +1,6 @@
 package com.twelvet.gen.api.domain.dto;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.apache.commons.lang3.builder.ToStringBuilder;

diff --git a/twelvet-gen/twelvet-gen-api/src/main/java/com/twelvet/gen/api/domain/vo/GenGroupVO.java b/twelvet-gen/twelvet-gen-api/src/main/java/com/twelvet/gen/api/domain/vo/GenGroupVO.java
@@ -1,6 +1,6 @@
 package com.twelvet.gen.api.domain.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.apache.commons.lang3.builder.ToStringBuilder;

diff --git a/twelvet-quartz/twelvet-quartz-api/src/main/java/com/twelvet/quartz/api/domain/SysJob.java b/twelvet-quartz/twelvet-quartz-api/src/main/java/com/twelvet/quartz/api/domain/SysJob.java
@@ -1,6 +1,6 @@
 package com.twelvet.quartz.api.domain;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import com.twelvet.framework.utils.CronUtils;

diff --git a/twelvet-quartz/twelvet-quartz-api/src/main/java/com/twelvet/quartz/api/domain/SysJobLog.java b/twelvet-quartz/twelvet-quartz-api/src/main/java/com/twelvet/quartz/api/domain/SysJobLog.java
@@ -1,7 +1,7 @@
 package com.twelvet.quartz.api.domain;
 
 import com.twelvet.framework.core.application.domain.BaseEntity;
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

diff --git a/twelvet-system/twelvet-system-api/src/main/java/com/twelvet/system/api/domain/I18n.java b/twelvet-system/twelvet-system-api/src/main/java/com/twelvet/system/api/domain/I18n.java
@@ -1,6 +1,6 @@
 package com.twelvet.system.api.domain;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

diff --git a/twelvet-system/twelvet-system-api/src/main/java/com/twelvet/system/api/domain/SysConfig.java b/twelvet-system/twelvet-system-api/src/main/java/com/twelvet/system/api/domain/SysConfig.java
@@ -1,6 +1,6 @@
 package com.twelvet.system.api.domain;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

diff --git a/...et-system/twelvet-system-api/src/main/java/com/twelvet/system/api/domain/SysDictType.java b/...et-system/twelvet-system-api/src/main/java/com/twelvet/system/api/domain/SysDictType.java
@@ -1,6 +1,6 @@
 package com.twelvet.system.api.domain;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.apache.commons.lang3.builder.ToStringBuilder;

diff --git a/...t-system/twelvet-system-api/src/main/java/com/twelvet/system/api/domain/SysLoginInfo.java b/...t-system/twelvet-system-api/src/main/java/com/twelvet/system/api/domain/SysLoginInfo.java
@@ -1,6 +1,6 @@
 package com.twelvet.system.api.domain;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;

diff --git a/...ystem/twelvet-system-api/src/main/java/com/twelvet/system/api/domain/SysOperationLog.java b/...ystem/twelvet-system-api/src/main/java/com/twelvet/system/api/domain/SysOperationLog.java
@@ -1,6 +1,6 @@
 package com.twelvet.system.api.domain;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;

diff --git a/twelvet-system/twelvet-system-api/src/main/java/com/twelvet/system/api/domain/SysPost.java b/twelvet-system/twelvet-system-api/src/main/java/com/twelvet/system/api/domain/SysPost.java
@@ -1,6 +1,6 @@
 package com.twelvet.system.api.domain;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

diff --git a/twelvet-system/twelvet-system-api/src/main/java/com/twelvet/system/api/domain/SysUser.java b/twelvet-system/twelvet-system-api/src/main/java/com/twelvet/system/api/domain/SysUser.java
@@ -1,7 +1,7 @@
 package com.twelvet.system.api.domain;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelIgnore;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.twelvet.framework.core.application.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Email;