From 21e81c418cf1a5f6a0382ac8e1cb60373a6fdf88 Mon Sep 17 00:00:00 2001
From: lizemin <lizemin@chinasofti.com>
Date: Tue, 23 Apr 2024 16:28:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/task/assignment.vue             | 14 +++--
 dbswitch-admin/pom.xml                        |  5 --
 .../admin/convert/AssignmentConvert.java      | 13 -----
 .../response/AssignmentsDataResponse.java     |  4 ++
 .../admin/service/AssignmentService.java      | 24 +--------
 .../dbswitch/admin/util/EasyexcelUtils.java   | 51 +++++++++++++++++++
 pom.xml                                       |  6 ---
 7 files changed, 66 insertions(+), 51 deletions(-)
 delete mode 100644 dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/convert/AssignmentConvert.java
 create mode 100644 dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/util/EasyexcelUtils.java

diff --git a/dbswitch-admin-ui/src/views/task/assignment.vue b/dbswitch-admin-ui/src/views/task/assignment.vue
index 3fccc919..a8f79b09 100644
--- a/dbswitch-admin-ui/src/views/task/assignment.vue
+++ b/dbswitch-admin-ui/src/views/task/assignment.vue
@@ -6,7 +6,7 @@
         </el-button>
         <el-button size="mini" icon="el-icon-video-pause" :disabled=isSelected plain @click="batchStop()">停止</el-button>
         <span style="color:#e9e9f3;">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
-        <el-button size="mini" plain>导入任务</el-button>
+        <el-button size="mini" plain @click="batchImport()">导入任务</el-button>
         <el-button size="mini" :disabled=isSelected plain @click="batchExport()">导出任务</el-button>
         <!--        <div class="right-add-button-group">-->
         <el-button class="right-add-button-group" type="primary"
@@ -286,7 +286,6 @@ export default {
         url: "/dbswitch/admin/api/v1/assignment/export?ids=" + this.idsSelected,
         responseType: 'blob',
       }).then(res => {
-        debugger
         if (200 === res.status) {
           this.downloadFile(res)
           this.$message({
@@ -301,6 +300,12 @@ export default {
         }
       });
     },
+    batchImport(){
+      this.$message({
+        message: '功能暂未开放，敬请期待！',
+        center: true
+      });
+    },
     downloadFile: function (resp) {
       const headers = resp.headers;
       const contentType = headers['content-type'];
@@ -313,11 +318,10 @@ export default {
           type: contentType
         });
 
-        const contentDisposition = resp.headers['Content-disposition'];
+        const contentDisposition = resp.headers['content-disposition'];
         let fileName = 'unknown';
         if (contentDisposition) {
-          debugger
-          fileName = window.decodeURI(resp.headers['Content-disposition'].split('=')[1]);
+          fileName = window.decodeURI(resp.headers['content-disposition'].split('=')[1]);
         }
         console.log('文件名称：', fileName);
         this.downFile(blob, fileName);
diff --git a/dbswitch-admin/pom.xml b/dbswitch-admin/pom.xml
index 7ec05d7c..9a89800f 100644
--- a/dbswitch-admin/pom.xml
+++ b/dbswitch-admin/pom.xml
@@ -118,11 +118,6 @@
       <artifactId>easyexcel</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.mapstruct</groupId>
-      <artifactId>mapstruct</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-collections4</artifactId>
diff --git a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/convert/AssignmentConvert.java b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/convert/AssignmentConvert.java
deleted file mode 100644
index ff2da32b..00000000
--- a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/convert/AssignmentConvert.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gitee.dbswitch.admin.convert;
-
-import com.gitee.dbswitch.admin.entity.AssignmentTaskEntity;
-import com.gitee.dbswitch.admin.model.response.AssignmentsDataResponse;
-
-/**
- * @author Li Zemin
- * @since 2024/4/22 9:44
- */
-//@Mapper
-public interface AssignmentConvert {
-	AssignmentsDataResponse toAssignmentsDataResponse(AssignmentTaskEntity assignmentTaskEntity);
-}
diff --git a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/model/response/AssignmentsDataResponse.java b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/model/response/AssignmentsDataResponse.java
index 405d5a05..ea3904eb 100644
--- a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/model/response/AssignmentsDataResponse.java
+++ b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/model/response/AssignmentsDataResponse.java
@@ -5,6 +5,9 @@ import java.util.Date;
 
 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;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gitee.dbswitch.admin.type.ScheduleModeEnum;
 
@@ -20,6 +23,7 @@ import lombok.Setter;
  **/
 @Getter
 @Setter
+@ColumnWidth(25)
 @EqualsAndHashCode
 public class AssignmentsDataResponse {
 
diff --git a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/AssignmentService.java b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/AssignmentService.java
index 2c861401..9020ddd3 100644
--- a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/AssignmentService.java
+++ b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/AssignmentService.java
@@ -50,6 +50,7 @@ import com.gitee.dbswitch.admin.model.response.AssignmentInfoResponse;
 import com.gitee.dbswitch.admin.model.response.AssignmentsDataResponse;
 import com.gitee.dbswitch.admin.type.JobStatusEnum;
 import com.gitee.dbswitch.admin.type.ScheduleModeEnum;
+import com.gitee.dbswitch.admin.util.EasyexcelUtils;
 import com.gitee.dbswitch.admin.util.PageUtils;
 import com.gitee.dbswitch.common.converter.ConverterFactory;
 import com.gitee.dbswitch.common.type.ProductTypeEnum;
@@ -80,9 +81,6 @@ public class AssignmentService {
 	@Resource
 	private AssignmentJobMapper assignmentJobMapper;
 
-//	@Resource
-//	private AssignmentConvert assignmentConvert;
-
 	@Transactional(rollbackFor = Exception.class)
 	public AssignmentInfoResponse createAssignment(AssigmentCreateRequest request) {
 		AssignmentTaskEntity assignment = request.toAssignmentTask();
@@ -359,11 +357,8 @@ public class AssignmentService {
 	public void exportAssignments(List<Long> ids, HttpServletResponse response) {
 		checkAssignmentAllExist(ids);
 		List<AssignmentsDataResponse> assignmentsDataResponses = new ArrayList<>();
-		// TODO 任务导出
 		for (Long id : ids) {
 			AssignmentTaskEntity assignmentTaskEntity = assignmentTaskDAO.getById(id);
-//			AssignmentsDataResponse assignmentsDataResponse =
-//					this.assignmentConvert.toAssignmentsDataResponse(assignmentTaskEntity);
 			AssignmentsDataResponse assignmentsDataResponse = ConverterFactory.getConverter(AssignmentsConverter.class)
 					.convert(assignmentTaskEntity);
 
@@ -392,22 +387,7 @@ public class AssignmentService {
 					assignmentJobEntity.getStatus();
 			assignmentsDataResponse.setRunStatus(JobStatusEnum.of(status).getName());
 			assignmentsDataResponses.add(assignmentsDataResponse);
-
-		}
-		try {
-			// 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
-//			response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-			response.setContentType("application/vnd.ms-excel");
-			response.setCharacterEncoding("utf-8");
-			// 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
-			String fileName = URLEncoder.encode("测试", "UTF-8").replaceAll("\\+", "%20");
-//			response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
-			response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
-			EasyExcel.write(response.getOutputStream(), AssignmentsDataResponse.class)
-					.sheet("模板")
-					.doWrite(assignmentsDataResponses);
-		} catch (IOException ex) {
-			throw new DbswitchException(ResultCode.ERROR_INTERNAL_ERROR, ex.getMessage());
 		}
+		EasyexcelUtils.write(response,AssignmentsDataResponse.class,assignmentsDataResponses,"任务管理","任务管理列表");
 	}
 }
diff --git a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/util/EasyexcelUtils.java b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/util/EasyexcelUtils.java
new file mode 100644
index 00000000..c94d8452
--- /dev/null
+++ b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/util/EasyexcelUtils.java
@@ -0,0 +1,51 @@
+// Copyright tang.  All rights reserved.
+// https://gitee.com/benbenyezi/dbswitch
+//
+// Use of this source code is governed by a BSD-style license
+//
+// Author: Li Zemin
+// Date : 2024/4/23 16:12
+/////////////////////////////////////////////////////////////
+package com.gitee.dbswitch.admin.util;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.excel.EasyExcel;
+import com.gitee.dbswitch.admin.common.exception.DbswitchException;
+import com.gitee.dbswitch.admin.common.response.ResultCode;
+
+/**
+ * excel工具类
+ *
+ * @author Li Zemin
+ * @since 2024/4/23 16:12
+ */
+public final class EasyexcelUtils {
+
+	public static <T> void write(HttpServletResponse response, Class<T> clazz, List<T> list, String fileName,
+	                             String sheetName) {
+
+		try {
+			// 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
+			// response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+			response.setContentType("application/vnd.ms-excel");
+			response.setCharacterEncoding("utf-8");
+			// 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
+			fileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
+			// response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+			response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+			response.setHeader("Cache-Control", "no-cache");
+			response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+			EasyExcel.write(response.getOutputStream(), clazz)
+					.sheet(sheetName)
+					.doWrite(list);
+		} catch (IOException ex) {
+			throw new DbswitchException(ResultCode.ERROR_INTERNAL_ERROR, ex.getMessage());
+		}
+
+	}
+}
diff --git a/pom.xml b/pom.xml
index 7fe820dc..475461b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,12 +134,6 @@
         <version>3.3.4</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.mapstruct</groupId>
-        <artifactId>mapstruct</artifactId>
-        <version>1.4.2.Final</version>
-      </dependency>
-
     </dependencies>
   </dependencyManagement>