Excel分离

twelvet-projects · Aug 5, 2023 · ab70f10 · ab70f10
1 parent cc1a208
commit ab70f10
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -64,6 +64,7 @@
         <hutool.version>5.8.19</hutool.version>
         <redisson.version>3.20.0</redisson.version>
         <qiniu.version>7.13.0</qiniu.version>
+        <excel-spring-boot-starter.version>3.0.0</excel-spring-boot-starter.version>
 
         <docker.plugin.version>0.32.0</docker.plugin.version>
         <spring.checkstyle.plugin>0.0.39</spring.checkstyle.plugin>
@@ -185,6 +186,13 @@
                 <version>${swagger.core.version}</version>
             </dependency>
 
+            <!--Excel-->
+            <dependency>
+                <groupId>cn.twelvet.excel</groupId>
+                <artifactId>excel-spring-boot-starter</artifactId>
+                <version>${excel-spring-boot-starter.version}</version>
+            </dependency>
+
             <!--springdoc -->
             <dependency>
                 <groupId>org.springdoc</groupId>

diff --git a/twelvet-api/pom.xml b/twelvet-api/pom.xml
@@ -43,6 +43,12 @@
             <artifactId>twelvet-framework-swagger</artifactId>
         </dependency>
 
+        <!--Excel-->
+        <dependency>
+            <groupId>cn.twelvet.excel</groupId>
+            <artifactId>excel-spring-boot-starter</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/twelvet-server/pom.xml b/twelvet-server/pom.xml
@@ -65,6 +65,12 @@
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
+        <!--Excel-->
+        <dependency>
+            <groupId>cn.twelvet.excel</groupId>
+            <artifactId>excel-spring-boot-starter</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/twelvet-server/twelvet-server-gen/src/main/resources/vm/java/controller.java.vm b/twelvet-server/twelvet-server-gen/src/main/resources/vm/java/controller.java.vm
@@ -16,13 +16,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import com.twelvet.framework.log.annotation.Log;
 import com.twelvet.framework.log.enums.BusinessType;
-import org.springframework.security.access.prepost.PreAuthorize;
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
 import com.twelvet.framework.core.application.controller.TWTController;
 import com.twelvet.framework.core.application.domain.AjaxResult;
 import com.twelvet.framework.core.application.domain.JsonResult;
-import com.twelvet.framework.utils.poi.ExcelUtils;
+import cn.twelvet.excel.annotation.ResponseExcel;
 #if($table.crud || $table.sub)
 import com.twelvet.framework.jdbc.web.utils.PageUtils;
 #elseif($table.tree)
@@ -37,7 +37,7 @@ import com.twelvet.framework.jdbc.web.utils.PageUtils;
  */
 @Tag(description = "${ClassName}Controller", name = "${functionName}")
 @RestController
-@RequestMapping("/${businessName}")
+@RequestMapping("/${moduleName}/${businessName}")
 public class ${ClassName}Controller extends TWTController
 {
     @Autowired
@@ -47,7 +47,7 @@ public class ${ClassName}Controller extends TWTController
      * 查询${functionName}列表
      */
     @Operation(summary = "查询${functionName}列表")
-    @PreAuthorize("@role.hasPermi('${permissionPrefix}:list')")
+    @SaCheckPermission("${permissionPrefix}:list")
     @GetMapping("/pageQuery")
     #if($table.crud || $table.sub)
     public JsonResult<TableDataInfo> pageQuery(${ClassName} ${className})
@@ -67,22 +67,21 @@ public class ${ClassName}Controller extends TWTController
     /**
      * 导出${functionName}列表
      */
+    @ResponseExcel(name = "${functionName}")
     @Operation(summary = "导出${functionName}列表")
-    @PreAuthorize("@role.hasPermi('${permissionPrefix}:export')")
+    @SaCheckPermission("${permissionPrefix}:export")
     @Log(service = "${functionName}", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ${ClassName} ${className})
+    public List<${ClassName}> export(${ClassName} ${className})
     {
-        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
-        ExcelUtils<${ClassName}> util = new ExcelUtils<${ClassName}>(${ClassName}.class);
-        util.exportExcel(response, list, "${functionName}数据");
+        return ${className}Service.select${ClassName}List(${className});
     }
 
     /**
      * 获取${functionName}详细信息
      */
     @Operation(summary = "获取${functionName}详细信息")
-    @PreAuthorize("@role.hasPermi('${permissionPrefix}:query')")
+    @SaCheckPermission("${permissionPrefix}:query")
     @GetMapping(value = "/{${pkColumn.javaField}}")
     public JsonResult<${ClassName}> getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
     {
@@ -93,7 +92,7 @@ public class ${ClassName}Controller extends TWTController
      * 新增${functionName}
      */
     @Operation(summary = "新增${functionName}")
-    @PreAuthorize("@role.hasPermi('${permissionPrefix}:add')")
+    @SaCheckPermission("${permissionPrefix}:add")
     @Log(service = "${functionName}", businessType = BusinessType.INSERT)
     @PostMapping
     public JsonResult<String> add(@RequestBody ${ClassName} ${className})
@@ -105,7 +104,7 @@ public class ${ClassName}Controller extends TWTController
      * 修改${functionName}
      */
     @Operation(summary = "修改${functionName}")
-    @PreAuthorize("@role.hasPermi('${permissionPrefix}:edit')")
+    @SaCheckPermission("${permissionPrefix}:edit")
     @Log(service = "${functionName}", businessType = BusinessType.UPDATE)
     @PutMapping
     public JsonResult<String> edit(@RequestBody ${ClassName} ${className})
@@ -117,7 +116,7 @@ public class ${ClassName}Controller extends TWTController
      * 删除${functionName}
      */
     @Operation(summary = "删除${functionName}")
-    @PreAuthorize("@role.hasPermi('${permissionPrefix}:remove')")
+    @SaCheckPermission("${permissionPrefix}:remove")
     @Log(service = "${functionName}", businessType = BusinessType.DELETE)
     @DeleteMapping("/{${pkColumn.javaField}s}")
     public JsonResult<String> remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)

diff --git a/twelvet-server/twelvet-server-gen/src/main/resources/vm/java/domain.java.vm b/twelvet-server/twelvet-server-gen/src/main/resources/vm/java/domain.java.vm
@@ -3,7 +3,7 @@ package ${packageName}.domain;
 #foreach ($import in $importList)
 import ${import};
 #end
-import com.twelvet.framework.utils.annotation.excel.Excel;
+import com.alibaba.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;
@@ -43,12 +43,12 @@ public class ${ClassName} extends ${Entity} {
                 #set($comment=$column.columnComment)
             #end
             #if($parentheseIndex != -1)
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ExcelProperty(value ="${comment}($column.readConverterExp())")
             #elseif($column.javaType == 'Date')
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+    @ExcelProperty(value ="${comment}", width = 30, dateFormat = "yyyy-MM-dd")
             #else
-    @Excel(name = "${comment}")
+    @ExcelProperty(value ="${comment}")
             #end
         #end
     private $column.javaType $column.javaField;

diff --git a/twelvet-server/twelvet-server-gen/src/main/resources/vm/java/sub-domain.java.vm b/twelvet-server/twelvet-server-gen/src/main/resources/vm/java/sub-domain.java.vm
@@ -28,12 +28,12 @@ public class ${subClassName} extends BaseEntity
 #set($comment=$column.columnComment)
 #end
 #if($parentheseIndex != -1)
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ExcelProperty(value ="${comment}($column.readConverterExp())")
 #elseif($column.javaType == 'Date')
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+    @ExcelProperty(value ="${comment}", width = 30, dateFormat = "yyyy-MM-dd")
 #else
-    @Excel(name = "${comment}")
+    @ExcelProperty(value ="${comment}")
 #end
 #end
     private $column.javaType $column.javaField;