From 074ac556eea1409ece8da33ce2d50c53cc6e4922 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 08 十二月 2020 16:07:40 +0800
Subject: [PATCH] 回显数据字典防止空值报错
---
src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java b/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
index 05f9414..9b57268 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
@@ -148,15 +148,39 @@
}
/**
- * 鐢熸垚浠ｇ爜
+ * 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
+ */
+ @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
+ @GetMapping("/download/{tableName}")
+ public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
+ {
+ byte[] data = genTableService.downloadCode(tableName);
+ genCode(response, data);
+ }
+
+ /**
+ * 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
*/
@PreAuthorize("@ss.hasPermi('tool:gen:code')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/genCode/{tableName}")
- public void genCode(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
+ public AjaxResult genCode(@PathVariable("tableName") String tableName)
{
- byte[] data = genTableService.generatorCode(tableName);
- genCode(response, data);
+ genTableService.generatorCode(tableName);
+ return AjaxResult.success();
+ }
+
+ /**
+ * 鍚屾鏁版嵁搴�
+ */
+ @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
+ @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
+ @GetMapping("/synchDb/{tableName}")
+ public AjaxResult synchDb(@PathVariable("tableName") String tableName)
+ {
+ genTableService.synchDb(tableName);
+ return AjaxResult.success();
}
/**
@@ -168,7 +192,7 @@
public void batchGenCode(HttpServletResponse response, String tables) throws IOException
{
String[] tableNames = Convert.toStrArray(tables);
- byte[] data = genTableService.generatorCode(tableNames);
+ byte[] data = genTableService.downloadCode(tableNames);
genCode(response, data);
}
@@ -178,6 +202,8 @@
private void genCode(HttpServletResponse response, byte[] data) throws IOException
{
response.reset();
+ response.addHeader("Access-Control-Allow-Origin", "*");
+ response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
response.addHeader("Content-Length", "" + data.length);
response.setContentType("application/octet-stream; charset=UTF-8");
--
Gitblit v1.9.3