ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

支持根据数据源生成代码

This commit is contained in:
Ray Wang 2018-11-22 15:57:28 +08:00
parent 67e87bde94
commit 2039b4af8c
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/GenController.java
View File

@ -3,15 +3,15 @@ package com.ruoyi.web.controller.tool;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.enums.DataSourceType;
import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.support.Convert; import com.ruoyi.common.support.Convert;
@ -36,8 +36,9 @@ public class GenController extends BaseController
@RequiresPermissions("tool:gen:view") @RequiresPermissions("tool:gen:view")
@GetMapping() @GetMapping()
public String gen() public String gen(ModelMap mmap)
{ {
mmap.put("dataSource", DataSourceType.MASTER.name());
return prefix + "/gen"; return prefix + "/gen";
} }
@ -47,7 +48,9 @@ public class GenController extends BaseController
public TableDataInfo list(TableInfo tableInfo) public TableDataInfo list(TableInfo tableInfo)
{ {
startPage(); startPage();
DynamicDataSourceContextHolder.setDateSoureType((String) tableInfo.getParams().get("dataSource"));
List<TableInfo> list = genService.selectTableList(tableInfo); List<TableInfo> list = genService.selectTableList(tableInfo);
DynamicDataSourceContextHolder.clearDateSoureType();
return getDataTable(list); return getDataTable(list);
} }
@ -56,10 +59,12 @@ public class GenController extends BaseController
*/ */
@RequiresPermissions("tool:gen:code") @RequiresPermissions("tool:gen:code")
@Log(title = "代码生成", businessType = BusinessType.GENCODE) @Log(title = "代码生成", businessType = BusinessType.GENCODE)
@GetMapping("/genCode/{tableName}") @GetMapping("/genCode/{tableName}/{dataSource}")
public void genCode(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException public void genCode(HttpServletResponse response, @PathVariable("tableName") String tableName, @PathVariable("dataSource") String dataSource) throws IOException
{ {
DynamicDataSourceContextHolder.setDateSoureType(dataSource);
byte[] data = genService.generatorCode(tableName); byte[] data = genService.generatorCode(tableName);
DynamicDataSourceContextHolder.clearDateSoureType();
response.reset(); response.reset();
response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
response.addHeader("Content-Length", "" + data.length); response.addHeader("Content-Length", "" + data.length);
@ -75,10 +80,12 @@ public class GenController extends BaseController
@Log(title = "代码生成", businessType = BusinessType.GENCODE) @Log(title = "代码生成", businessType = BusinessType.GENCODE)
@GetMapping("/batchGenCode") @GetMapping("/batchGenCode")
@ResponseBody @ResponseBody
public void batchGenCode(HttpServletResponse response, String tables) throws IOException public void batchGenCode(HttpServletResponse response, String tables, String dataSource) throws IOException
{ {
String[] tableNames = Convert.toStrArray(tables); String[] tableNames = Convert.toStrArray(tables);
DynamicDataSourceContextHolder.setDateSoureType(dataSource);
byte[] data = genService.generatorCode(tableNames); byte[] data = genService.generatorCode(tableNames);
DynamicDataSourceContextHolder.clearDateSoureType();
response.reset(); response.reset();
response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
response.addHeader("Content-Length", "" + data.length); response.addHeader("Content-Length", "" + data.length);

9
ruoyi-admin/src/main/resources/templates/tool/gen/gen.html
View File

@ -22,6 +22,9 @@
<span>-</span> <span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li> </li>
<li>
数据源：<input type="text" id="dataSource" name="params[dataSource]" th:value="${dataSource}"/>
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@ -95,7 +98,7 @@
// 生成代码 // 生成代码
function genCode(tableName) { function genCode(tableName) {
$.modal.confirm("确定要生成" + tableName + "表代码吗？", function() { $.modal.confirm("确定要生成" + tableName + "表代码吗？", function() {
location.href = prefix + "/genCode/" + tableName; location.href = prefix + "/genCode/" + tableName + "/" + $("#dataSource").val();
layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 }); layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 });
}) })
} }
@ -107,8 +110,8 @@
$.modal.alertWarning("请选择要生成的数据"); $.modal.alertWarning("请选择要生成的数据");
return; return;
} }
$.modal.confirm("确认要生成选中的" + rows.length + "条数据吗?", function() { $.modal.confirm("确认要生成选中的" + rows.length + "条数据吗?", function() {
location.href = prefix + "/batchGenCode?tables=" + rows; location.href = prefix + "/batchGenCode?tables=" + rows + "&dataSource=" + $("#dataSource").val();
layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 }); layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 });
}); });
} }