From 21059f67d3d3a170e7e5f493ff8bcbbc2885fdb1 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Fri, 19 Feb 2021 15:45:55 +0800 Subject: [PATCH] =?UTF-8?q?excel=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=90=88=E5=B9=B6=E5=B9=B6=E4=B8=94=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/api/v1/exa_excel.go | 99 ++++++++++++++++++ server/api/v1/exa_file_upload_download.go | 86 +-------------- server/cmd/information/system/api.go | 4 + server/cmd/information/system/casbin.go | 4 + server/initialize/router.go | 1 + server/model/exa_excel.go | 6 ++ .../request/exa_file_upload_and_download.go | 8 -- server/resource/excel/ExcelExport.xlsx | Bin 6647 -> 8902 bytes .../{exp_customer.go => exa_customer.go} | 0 server/router/exa_excel.go | 16 +++ ...oad.go => exa_file_upload_and_download.go} | 4 - web/src/api/excel.js | 85 +++++++++++++++ web/src/api/fileUploadAndDownload.js | 84 --------------- web/src/view/example/excel/excel.vue | 4 +- 14 files changed, 218 insertions(+), 183 deletions(-) create mode 100644 server/api/v1/exa_excel.go create mode 100644 server/model/exa_excel.go delete mode 100644 server/model/request/exa_file_upload_and_download.go rename server/router/{exp_customer.go => exa_customer.go} (100%) create mode 100644 server/router/exa_excel.go rename server/router/{exp_file_upload_and_download.go => exa_file_upload_and_download.go} (70%) create mode 100644 web/src/api/excel.js diff --git a/server/api/v1/exa_excel.go b/server/api/v1/exa_excel.go new file mode 100644 index 00000000..2aa70db5 --- /dev/null +++ b/server/api/v1/exa_excel.go @@ -0,0 +1,99 @@ +package v1 + +import ( + "gin-vue-admin/global" + "gin-vue-admin/model" + "gin-vue-admin/model/response" + "gin-vue-admin/service" + "gin-vue-admin/utils" + "github.com/gin-gonic/gin" + "go.uber.org/zap" +) + +// /excel/importExcel 接口，与upload接口作用类似，只是把文件存到resource/excel目录下，用于导入Excel时存放Excel文件(ExcelImport.xlsx) +// /excel/loadExcel接口，用于读取resource/excel目录下的文件((ExcelImport.xlsx)并加载为[]model.SysBaseMenu类型的示例数据 +// /excel/exportExcel 接口，用于读取前端传来的tableData，生成Excel文件并返回 +// /excel/downloadTemplate 接口，用于下载resource/excel目录下的 ExcelTemplate.xlsx 文件，作为导入的模板 + +// @Tags excel +// @Summary 导出Excel +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/octet-stream +// @Param data body model.ExcelInfo true "导出Excel文件信息" +// @Success 200 +// @Router /excel/exportExcel [post] +func ExportExcel(c *gin.Context) { + var excelInfo model.ExcelInfo + _ = c.ShouldBindJSON(&excelInfo) + filePath := global.GVA_CONFIG.Excel.Dir + excelInfo.FileName + err := service.ParseInfoList2Excel(excelInfo.InfoList, filePath) + if err != nil { + global.GVA_LOG.Error("转换Excel失败!", zap.Any("err", err)) + response.FailWithMessage("转换Excel失败", c) + return + } + c.Writer.Header().Add("success", "true") + c.File(filePath) +} + +// @Tags excel +// @Summary 导入Excel文件 +// @Security ApiKeyAuth +// @accept multipart/form-data +// @Produce application/json +// @Param file formData file true "导入Excel文件" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"导入成功"}" +// @Router /excel/importExcel [post] +func ImportExcel(c *gin.Context) { + _, header, err := c.Request.FormFile("file") + if err != nil { + global.GVA_LOG.Error("接收文件失败!", zap.Any("err", err)) + response.FailWithMessage("接收文件失败", c) + return + } + _ = c.SaveUploadedFile(header, global.GVA_CONFIG.Excel.Dir+"ExcelImport.xlsx") + response.OkWithMessage("导入成功", c) +} + +// @Tags excel +// @Summary 加载Excel数据 +// @Security ApiKeyAuth +// @Produce application/json +// @Success 200 {string} string "{"success":true,"data":{},"msg":"加载数据成功"}" +// @Router /excel/loadExcel [get] +func LoadExcel(c *gin.Context) { + menus, err := service.ParseExcel2InfoList() + if err != nil { + global.GVA_LOG.Error("加载数据失败", zap.Any("err", err)) + response.FailWithMessage("加载数据失败", c) + return + } + response.OkWithDetailed(response.PageResult{ + List: menus, + Total: int64(len(menus)), + Page: 1, + PageSize: 999, + }, "加载数据成功", c) +} + +// @Tags excel +// @Summary 下载模板 +// @Security ApiKeyAuth +// @accept multipart/form-data +// @Produce application/json +// @Param fileName query fileName true "模板名称" +// @Success 200 +// @Router /excel/downloadTemplate [get] +func DownloadTemplate(c *gin.Context) { + fileName := c.Query("fileName") + filePath := global.GVA_CONFIG.Excel.Dir + fileName + ok, err := utils.PathExists(filePath) + if !ok || err != nil { + global.GVA_LOG.Error("文件不存在", zap.Any("err", err)) + response.FailWithMessage("文件不存在", c) + return + } + c.Writer.Header().Add("success", "true") + c.File(filePath) +} diff --git a/server/api/v1/exa_file_upload_download.go b/server/api/v1/exa_file_upload_download.go index b3e6427f..ab007488 100644 --- a/server/api/v1/exa_file_upload_download.go +++ b/server/api/v1/exa_file_upload_download.go @@ -6,7 +6,6 @@ import ( "gin-vue-admin/model/request" "gin-vue-admin/model/response" "gin-vue-admin/service" - "gin-vue-admin/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) @@ -76,89 +75,6 @@ func GetFileList(c *gin.Context) { Total: total, Page: pageInfo.Page, PageSize: pageInfo.PageSize, - },"获取成功", c) + }, "获取成功", c) } } - -// @Tags ExaFileUploadAndDownload -// @Summary 导出Excel -// @Security ApiKeyAuth -// @accept application/json -// @Produce application/octet-stream -// @Param data body request.ExcelInfo true "导出Excel文件信息" -// @Success 200 -// @Router /fileUploadAndDownload/exportExcel [post] -func ExportExcel(c *gin.Context) { - var excelInfo request.ExcelInfo - c.ShouldBindJSON(&excelInfo) - filePath := global.GVA_CONFIG.Excel.Dir+excelInfo.FileName - err := service.ParseInfoList2Excel(excelInfo.InfoList, filePath) - if err != nil { - global.GVA_LOG.Error("转换Excel失败!", zap.Any("err", err)) - response.FailWithMessage("转换Excel失败", c) - return - } - c.Writer.Header().Add("success", "true") - c.File(filePath) -} - -// @Tags ExaFileUploadAndDownload -// @Summary 导入Excel文件 -// @Security ApiKeyAuth -// @accept multipart/form-data -// @Produce application/json -// @Param file formData file true "导入Excel文件" -// @Success 200 {string} string "{"success":true,"data":{},"msg":"导入成功"}" -// @Router /fileUploadAndDownload/importExcel [post] -func ImportExcel(c *gin.Context) { - _, header, err := c.Request.FormFile("file") - if err != nil { - global.GVA_LOG.Error("接收文件失败!", zap.Any("err", err)) - response.FailWithMessage("接收文件失败", c) - return - } - c.SaveUploadedFile(header, global.GVA_CONFIG.Excel.Dir+"ExcelImport.xlsx") - response.OkWithMessage("导入成功", c) -} - -// @Tags ExaFileUploadAndDownload -// @Summary 加载Excel数据 -// @Security ApiKeyAuth -// @Produce application/json -// @Success 200 {string} string "{"success":true,"data":{},"msg":"加载数据成功"}" -// @Router /fileUploadAndDownload/loadExcel [get] -func LoadExcel(c *gin.Context) { - menus, err := service.ParseExcel2InfoList() - if err != nil { - global.GVA_LOG.Error("加载数据失败", zap.Any("err", err)) - response.FailWithMessage("加载数据失败", c) - return - } - response.OkWithDetailed(response.PageResult{ - List: menus, - Total: int64(len(menus)), - Page: 1, - PageSize: 999, - },"加载数据成功", c) -} - -// @Tags ExaFileUploadAndDownload -// @Summary 下载模板 -// @Security ApiKeyAuth -// @accept multipart/form-data -// @Produce application/json -// @Param fileName query fileName true "模板名称" -// @Success 200 -// @Router /fileUploadAndDownload/downloadTemplate [get] -func DownloadTemplate(c *gin.Context) { - fileName := c.Query("fileName") - filePath := global.GVA_CONFIG.Excel.Dir+fileName - ok, err := utils.PathExists(filePath) - if !ok || err != nil { - global.GVA_LOG.Error("文件不存在", zap.Any("err", err)) - response.FailWithMessage("文件不存在", c) - return - } - c.Writer.Header().Add("success", "true") - c.File(filePath) -} \ No newline at end of file diff --git a/server/cmd/information/system/api.go b/server/cmd/information/system/api.go index 0461d6e8..27c430dc 100644 --- a/server/cmd/information/system/api.go +++ b/server/cmd/information/system/api.go @@ -93,6 +93,10 @@ var apis = []model.SysApi{ {global.GVA_MODEL{ID: 78, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/workflowProcess/getWorkflowMoveByID", "根据id获取当前节点详情和历史", "workflowProcess", "GET"}, {global.GVA_MODEL{ID: 79, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/workflowProcess/completeWorkflowMove", "提交工作流", "workflowProcess", "POST"}, {global.GVA_MODEL{ID: 80, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/autoCode/preview", "预览自动化代码", "autoCode", "POST"}, + {global.GVA_MODEL{ID: 81, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/excel/importExcel", "预览自动化代码", "autoCode", "POST"}, + {global.GVA_MODEL{ID: 82, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/excel/loadExcel", "预览自动化代码", "autoCode", "POST"}, + {global.GVA_MODEL{ID: 83, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/excel/exportExcel", "预览自动化代码", "autoCode", "POST"}, + {global.GVA_MODEL{ID: 84, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/excel/downloadTemplate", "预览自动化代码", "autoCode", "POST"}, } //@author: [SliverHorn](https://github.com/SliverHorn) diff --git a/server/cmd/information/system/casbin.go b/server/cmd/information/system/casbin.go index e71f3117..649b448f 100644 --- a/server/cmd/information/system/casbin.go +++ b/server/cmd/information/system/casbin.go @@ -92,6 +92,10 @@ var carbines = []gormadapter.CasbinRule{ {PType: "p", V0: "888", V1: "/workflowProcess/getMyStated", V2: "GET"}, {PType: "p", V0: "888", V1: "/workflowProcess/getMyNeed", V2: "GET"}, {PType: "p", V0: "888", V1: "/workflowProcess/getWorkflowMoveByID", V2: "GET"}, + {PType: "p", V0: "888", V1: "/excel/importExcel", V2: "POST"}, + {PType: "p", V0: "888", V1: "/excel/loadExcel", V2: "GET"}, + {PType: "p", V0: "888", V1: "/excel/exportExcel", V2: "POST"}, + {PType: "p", V0: "888", V1: "/excel/downloadTemplate", V2: "GET"}, {PType: "p", V0: "8881", V1: "/base/login", V2: "POST"}, {PType: "p", V0: "8881", V1: "/user/register", V2: "POST"}, {PType: "p", V0: "8881", V1: "/api/createApi", V2: "POST"}, diff --git a/server/initialize/router.go b/server/initialize/router.go index 32ce9896..de34b37e 100644 --- a/server/initialize/router.go +++ b/server/initialize/router.go @@ -47,6 +47,7 @@ func Routers() *gin.Engine { router.InitSysDictionaryDetailRouter(PrivateGroup) // 字典详情管理 router.InitFileUploadAndDownloadRouter(PrivateGroup) // 文件上传下载功能路由 router.InitWorkflowProcessRouter(PrivateGroup) // 工作流相关接口 + router.InitExcelRouter(PrivateGroup) // 表格导入导出 } global.GVA_LOG.Info("router register success") return Router diff --git a/server/model/exa_excel.go b/server/model/exa_excel.go new file mode 100644 index 00000000..c1d7f769 --- /dev/null +++ b/server/model/exa_excel.go @@ -0,0 +1,6 @@ +package model + +type ExcelInfo struct { + FileName string `json:"fileName"` + InfoList []SysBaseMenu `json:"infoList"` +} diff --git a/server/model/request/exa_file_upload_and_download.go b/server/model/request/exa_file_upload_and_download.go deleted file mode 100644 index c95cd83a..00000000 --- a/server/model/request/exa_file_upload_and_download.go +++ /dev/null @@ -1,8 +0,0 @@ -package request - -import "gin-vue-admin/model" - -type ExcelInfo struct { - FileName string `json:"fileName"` - InfoList []model.SysBaseMenu `json:"infoList"` -} \ No newline at end of file diff --git a/server/resource/excel/ExcelExport.xlsx b/server/resource/excel/ExcelExport.xlsx index 5b2ba1ca13ee3af5546a0682a207935ef7558619..4f757819ca5060f901b1ec916850423f3fa3af90 100644 GIT binary patch literal 8902 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 BAkP2* literal 6647 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 o)xU%5t~`I)y;~*ozg+cqv8pTGyG<16aIlw*UYD diff --git a/server/router/exp_customer.go b/server/router/exa_customer.go similarity index 100% rename from server/router/exp_customer.go rename to server/router/exa_customer.go diff --git a/server/router/exa_excel.go b/server/router/exa_excel.go new file mode 100644 index 00000000..0bd3d19d --- /dev/null +++ b/server/router/exa_excel.go @@ -0,0 +1,16 @@ +package router + +import ( + "gin-vue-admin/api/v1" + "github.com/gin-gonic/gin" +) + +func InitExcelRouter(Router *gin.RouterGroup) { + FileUploadAndDownloadGroup := Router.Group("excel") + { + FileUploadAndDownloadGroup.POST("/importExcel", v1.ImportExcel) // 导入Excel + FileUploadAndDownloadGroup.GET("/loadExcel", v1.LoadExcel) // 加载Excel数据 + FileUploadAndDownloadGroup.POST("/exportExcel", v1.ExportExcel) // 导出Excel + FileUploadAndDownloadGroup.GET("/downloadTemplate", v1.DownloadTemplate) // 下载模板文件 + } +} diff --git a/server/router/exp_file_upload_and_download.go b/server/router/exa_file_upload_and_download.go similarity index 70% rename from server/router/exp_file_upload_and_download.go rename to server/router/exa_file_upload_and_download.go index c8ed1fb8..de141d8c 100644 --- a/server/router/exp_file_upload_and_download.go +++ b/server/router/exa_file_upload_and_download.go @@ -15,9 +15,5 @@ func InitFileUploadAndDownloadRouter(Router *gin.RouterGroup) { FileUploadAndDownloadGroup.GET("/findFile", v1.FindFile) // 查询当前文件成功的切片 FileUploadAndDownloadGroup.POST("/breakpointContinueFinish", v1.BreakpointContinueFinish) // 查询当前文件成功的切片 FileUploadAndDownloadGroup.POST("/removeChunk", v1.RemoveChunk) // 查询当前文件成功的切片 - FileUploadAndDownloadGroup.POST("/importExcel", v1.ImportExcel) // 导入Excel - FileUploadAndDownloadGroup.GET("/loadExcel", v1.LoadExcel) // 加载Excel数据 - FileUploadAndDownloadGroup.POST("/exportExcel", v1.ExportExcel) // 导出Excel - FileUploadAndDownloadGroup.GET("/downloadTemplate", v1.DownloadTemplate) // 下载模板文件 } } diff --git a/web/src/api/excel.js b/web/src/api/excel.js new file mode 100644 index 00000000..3315f6ab --- /dev/null +++ b/web/src/api/excel.js @@ -0,0 +1,85 @@ +import service from '@/utils/request'; +import { Message } from 'element-ui'; + +const handleFileError = (res, fileName) => { + if (typeof(res.data) !== "undefined") { + if (res.data.type == "application/json") { + const reader = new FileReader(); + reader.onload = function() { + let message = JSON.parse(reader.result).msg; + Message({ + showClose: true, + message: message, + type: 'error' + }) + }; + reader.readAsText(new Blob([res.data])); + } + } else { + var downloadUrl = window.URL.createObjectURL(new Blob([res])); + var a = document.createElement('a'); + a.style.display = 'none'; + a.href = downloadUrl; + a.download = fileName; + var event = new MouseEvent("click"); + a.dispatchEvent(event); + } +} + +// @Tags excel +// @Summary 导出Excel +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/octet-stream +// @Param data body model.ExcelInfo true "导出Excel文件信息" +// @Success 200 +// @Router /excel/exportExcel [post] +export const exportExcel = (tableData, fileName) => { + service({ + url: "/excel/exportExcel", + method: 'post', + data: { + fileName: fileName, + infoList: tableData + }, + responseType: 'blob' + }).then((res) => { + handleFileError(res, fileName) + }) +} + +// @Tags excel +// @Summary 导入Excel文件 +// @Security ApiKeyAuth +// @accept multipart/form-data +// @Produce application/json +// @Param file formData file true "导入Excel文件" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"导入成功"}" +// @Router /excel/importExcel [post] +export const loadExcelData = () => { + return service({ + url: "/excel/loadExcel", + method: 'get' + }) +} + +// @Tags excel +// @Summary 下载模板 +// @Security ApiKeyAuth +// @accept multipart/form-data +// @Produce application/json +// @Param fileName query fileName true "模板名称" +// @Success 200 +// @Router /excel/downloadTemplate [get] +export const downloadTemplate = (fileName) => { + return service({ + url: "/excel/downloadTemplate", + method: 'get', + params: { + fileName: fileName + }, + responseType: 'blob' + }).then((res) => { + handleFileError(res, fileName) + }) +} \ No newline at end of file diff --git a/web/src/api/fileUploadAndDownload.js b/web/src/api/fileUploadAndDownload.js index 62e70c7b..492be034 100644 --- a/web/src/api/fileUploadAndDownload.js +++ b/web/src/api/fileUploadAndDownload.js @@ -1,30 +1,4 @@ import service from '@/utils/request'; -import { Message } from 'element-ui'; - -const handleFileError = (res, fileName) => { - if (typeof(res.data) !== "undefined") { - if (res.data.type == "application/json") { - const reader = new FileReader(); - reader.onload = function() { - let message = JSON.parse(reader.result).msg; - Message({ - showClose: true, - message: message, - type: 'error' - }) - }; - reader.readAsText(new Blob([res.data])); - } - } else { - var downloadUrl = window.URL.createObjectURL(new Blob([res])); - var a = document.createElement('a'); - a.style.display = 'none'; - a.href = downloadUrl; - a.download = fileName; - var event = new MouseEvent("click"); - a.dispatchEvent(event); - } -} // @Tags FileUploadAndDownload // @Summary 分页文件列表 @@ -55,62 +29,4 @@ export const deleteFile = (data) => { method: "post", data }) -} - -// @Tags ExaFileUploadAndDownload -// @Summary 导出Excel -// @Security ApiKeyAuth -// @accept application/json -// @Produce application/octet-stream -// @Param data body request.ExcelInfo true "导出Excel文件信息" -// @Success 200 -// @Router /fileUploadAndDownload/exportExcel [post] -export const exportExcel = (tableData, fileName) => { - service({ - url: "/fileUploadAndDownload/exportExcel", - method: 'post', - data: { - fileName: fileName, - infoList: tableData - }, - responseType: 'blob' - }).then((res)=>{ - handleFileError(res, fileName) - }) -} - -// @Tags ExaFileUploadAndDownload -// @Summary 导入Excel文件 -// @Security ApiKeyAuth -// @accept multipart/form-data -// @Produce application/json -// @Param file formData file true "导入Excel文件" -// @Success 200 {string} string "{"success":true,"data":{},"msg":"导入成功"}" -// @Router /fileUploadAndDownload/importExcel [post] -export const loadExcelData = () => { - return service({ - url: "/fileUploadAndDownload/loadExcel", - method: 'get' - }) -} - -// @Tags ExaFileUploadAndDownload -// @Summary 下载模板 -// @Security ApiKeyAuth -// @accept multipart/form-data -// @Produce application/json -// @Param fileName query fileName true "模板名称" -// @Success 200 -// @Router /fileUploadAndDownload/downloadTemplate [get] -export const downloadTemplate = (fileName) => { - return service({ - url: "/fileUploadAndDownload/downloadTemplate", - method: 'get', - params:{ - fileName: fileName - }, - responseType: 'blob' - }).then((res)=>{ - handleFileError(res, fileName) - }) } \ No newline at end of file diff --git a/web/src/view/example/excel/excel.vue b/web/src/view/example/excel/excel.vue index bb208cb7..c211eb89 100644 --- a/web/src/view/example/excel/excel.vue +++ b/web/src/view/example/excel/excel.vue @@ -3,7 +3,7 @@