代码生成 - 模板处理

This commit is contained in:
TinyAnts 2022-06-16 19:01:59 +08:00
parent 253441942f
commit 94fd5425f6
7 changed files with 466 additions and 115 deletions

View File

@ -1,5 +1,8 @@
package com.hxkj.common.constant;
import java.util.LinkedHashMap;
import java.util.Map;
public class GenConstants {
/** 单表(增删改查) */
@ -89,7 +92,7 @@ public class GenConstants {
public static final String QUERY_LIKE = "LIKE";
/** 相等查询 */
public static final String QUERY_EQ = "EQ";
public static final String QUERY_EQ = "=";
/** 需要 */
public static final Integer REQUIRE = 1;

View File

@ -1,4 +1,4 @@
package com.hxkj.admin.config;
package com.hxkj.generator.config;
public class GenConfig {

View File

@ -15,10 +15,8 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Map;
import java.util.zip.ZipOutputStream;
@RestController
@RequestMapping("/api/gen")
@ -46,11 +44,13 @@ public class GenController {
* 生成列表
*
* @author fzr
* @param pageParam 分页参数
* @param params 搜索参数
* @return Object
*/
@GetMapping("/list")
public Object list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
@RequestParam Map<String, String> params) {
PageResult<GenTableVo> list = iGenerateService.list(pageParam, params);
return AjaxResult.success(list);
}
@ -59,6 +59,7 @@ public class GenController {
* 生成详情
*
* @author fzr
* @param id 主键
* @return Object
*/
@GetMapping("/detail")
@ -75,7 +76,7 @@ public class GenController {
*/
@PostMapping("/importTable")
public Object importTable(String tables) {
Assert.notNull(tables, "tables参数缺失");
Assert.notNull(tables, "请选择要导出的表");
String[] tableNames = tables.split(",");
iGenerateService.importTable(tableNames);
return AjaxResult.success();
@ -85,6 +86,7 @@ public class GenController {
* 编辑表结构
*
* @author fzr
* @param genParam 参数
* @return Object
*/
@PostMapping("/editTable")
@ -97,6 +99,7 @@ public class GenController {
* 删除表结构
*
* @author fzr
* @param id 主键
* @return Object
*/
@PostMapping("/deleteTable")
@ -109,6 +112,7 @@ public class GenController {
* 同步表结构
*
* @author fzr
* @param id 主键
* @return Object
*/
@PostMapping("/syncTable")
@ -121,6 +125,7 @@ public class GenController {
* 预览代码
*
* @author fzr
* @param id 主键
* @return Object
*/
@GetMapping("/previewCode")
@ -132,23 +137,23 @@ public class GenController {
/**
* 生成代码
*
* @author fzr
* @return Object
* @param response 响应对象
* @param tables 表名
* @throws IOException 异常
*/
@GetMapping("/genCode")
public Object genCode(HttpServletResponse response, String tables) throws IOException {
public void genCode(HttpServletResponse response, String tables) throws IOException {
Assert.notNull(tables, "请选择要生成的表");
String[] tableNames = tables.split(",");
byte[] data = iGenerateService.downloadCode(tableNames);
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.setHeader("Content-Disposition", "attachment; filename=\"like.zip\"");
response.addHeader("Content-Length", "" + data.length);
response.setContentType("application/octet-stream; charset=UTF-8");
IOUtils.write(data, response.getOutputStream());
return null;
}
}

View File

@ -127,6 +127,7 @@ public class GenerateServiceImpl implements IGenerateService {
public Map<String, Object> detail(Integer id) {
Map<String, Object> maps = new LinkedHashMap<>();
GenTable genTable = genTableMapper.selectById(id);
Assert.notNull(genTable, "查询的数据不存在");
// 基本信息
Map<String, Object> base = new LinkedHashMap<>();
@ -329,6 +330,7 @@ public class GenerateServiceImpl implements IGenerateService {
* 预览代码
*
* @author fzr
* @param id 主键
* @return Map<String, String>
*/
@Override
@ -357,6 +359,13 @@ public class GenerateServiceImpl implements IGenerateService {
return map;
}
/**
* 下载代码
*
* @author fzr
* @param tableNames 表名集合
* @return byte[]
*/
@Override
public byte[] downloadCode(String[] tableNames) {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@ -374,7 +383,7 @@ public class GenerateServiceImpl implements IGenerateService {
* @param tableName 表名
* @param zip 压缩包
*/
public void genZipCode(String tableName, ZipOutputStream zip) {
private void genZipCode(String tableName, ZipOutputStream zip) {
// 查表信息
GenTable table = genTableMapper.selectOne(new QueryWrapper<GenTable>()
.eq("table_name", tableName)

View File

@ -10,7 +10,10 @@ import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.function.Function;
import java.util.stream.Collectors;
public class VelocityUtil {
@ -36,6 +39,17 @@ public class VelocityUtil {
* @return VelocityContext
*/
public static VelocityContext prepareContext(GenTable table, List<GenTableColumn> columns) {
// 处理变量字段
boolean isSearch = false;
List<String> fields = new LinkedList<>();
for (GenTableColumn column : columns) {
fields.add(column.getColumnName());
if (column.getIsQuery() == 1) {
isSearch = true;
}
}
// 设置模板变量
VelocityContext velocityContext = new VelocityContext();
velocityContext.put("genTpl", table.getGenTpl());
velocityContext.put("tableName", table.getTableName());
@ -48,6 +62,9 @@ public class VelocityUtil {
velocityContext.put("functionName", StringUtil.isNotEmpty(table.getFunctionName()) ? table.getFunctionName() : "【请填写功能名称】");
velocityContext.put("table", table);
velocityContext.put("columns", columns);
velocityContext.put("fields", fields);
velocityContext.put("isSearch", isSearch);
return velocityContext;
}
@ -59,12 +76,12 @@ public class VelocityUtil {
*/
public static List<String> getTemplateList(String genTpl) {
List<String> templates = new LinkedList<>();
templates.add("java/controller.java.vm");
templates.add("java/entity.java.vm");
templates.add("java/mapper.java.vm");
templates.add("java/service.java.vm");
// templates.add("java/controller.java.vm");
// templates.add("java/entity.java.vm");
// templates.add("java/mapper.java.vm");
// templates.add("java/service.java.vm");
templates.add("java/serviceImpl.java.vm");
templates.add("java/validate.java.vm");
// templates.add("java/validate.java.vm");
return templates;
}

View File

@ -51,16 +51,31 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByDesc(Arrays.asList("id", "sort"));
#if($column.isPk)
systemAdminMapper.setSearch(queryWrapper, params, new String[]{
"like:username:str",
"like:nickname:str",
"=:role:int"
#if($isSearch)
${entityName}Mapper.setSearch(queryWrapper, params, new String[]{
#foreach ($column in $columns)
#if($column.isQuery)
#if($column.queryType=="EQ")
#if($column.javaType=="String")
#if($column.javaField.equals($column.columnName))
"=:${column.javaField}:str",
#else
"=:${column.javaField}@${column.columnName}:str",
#end
#elseif($column.javaType=="Integer")
#if($column.javaField.equals($column.columnName))
"=:${column.javaField}:int",
#else
"=:${column.javaField}@${column.columnName}:int",
#end
#end
#end
#end
#end
});
#end
IPage<SystemAdminVo> iPage = systemAdminMapper.selectPage(new Page<>(page, limit), queryWrapper);
for (SystemAdminVo vo : iPage.getRecords()) {
vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime()));
@ -70,93 +85,4 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
return PageResult.iPageHandle(iPage);
}
/**
* ${functionName}详细
*
* @author ${authorName}
* @param id 主键
* @return SysAdmin
*/
@Override
public ${EntityName}Vo detail(Integer id) {
SystemAdmin sysAdmin = systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
.select(SystemAdmin.class, info->
!info.getColumn().equals("salt") &&
!info.getColumn().equals("password") &&
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(sysAdmin, "账号已不存在!");
SystemAdminVo vo = new SystemAdminVo();
BeanUtils.copyProperties(sysAdmin, vo);
vo.setDept(String.valueOf(vo.getDeptId()));
vo.setRole(String.valueOf(sysAdmin.getRole()));
vo.setAvatar(UrlUtil.toAbsoluteUrl(sysAdmin.getAvatar()));
vo.setCreateTime(TimeUtil.timestampToDate(sysAdmin.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(sysAdmin.getUpdateTime()));
vo.setLastLoginTime(TimeUtil.timestampToDate(sysAdmin.getLastLoginTime()));
return vo;
}
/**
* ${functionName}新增
*
* @author ${authorName}
* @param ${entityName}Param 参数
*/
@Override
public void add(${EntityName}Param ${entityName}Param) {
SystemAdmin model = new SystemAdmin();
#foreach ($column in $columns)
model.set${column.javaField}(${entityName}Param.get${column.javaField.toUpperCase()}());
#end
${entityName}Mapper.insert(model);
}
/**
* ${functionName}更新
*
* @author ${authorName}
* @param ${entityName}Param 参数
*/
@Override
public void edit(${EntityName}Param ${entityName}Param) {
SystemAdmin model = new SystemAdmin();
model.setId(systemAdminParam.getId());
model.setDeptId(systemAdminParam.getDeptId());
model.setPostId(systemAdminParam.getPostId());
model.setNickname(systemAdminParam.getNickname());
model.setUsername(systemAdminParam.getUsername());
model.setAvatar( UrlUtil.toRelativeUrl(systemAdminParam.getAvatar()));
model.setRole(systemAdminParam.getId() == 1 ? 0 : systemAdminParam.getRole());
model.setSort(systemAdminParam.getSort());
model.setIsMultipoint(systemAdminParam.getIsMultipoint());
model.setIsDisable(systemAdminParam.getIsDisable());
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemAdminMapper.updateById(model);
this.cacheAdminUserByUid(systemAdminParam.getId());
}
/**
* ${functionName}删除
*
* @author ${authorName}
* @param id 主键
*/
@Override
public void del(Integer id) {
SystemAdmin model = new SystemAdmin();
model.setId(id);
model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000);
systemAdminMapper.updateById(model);
}
}

View File

@ -1,2 +1,393 @@
$hello
ffff
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="模块标题" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入模块标题"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="方法名称" prop="method">
<el-input
v-model="queryParams.method"
placeholder="请输入方法名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="请求方式" prop="requestMethod">
<el-input
v-model="queryParams.requestMethod"
placeholder="请输入请求方式"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作人员" prop="operName">
<el-input
v-model="queryParams.operName"
placeholder="请输入操作人员"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="部门名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入部门名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="请求URL" prop="operUrl">
<el-input
v-model="queryParams.operUrl"
placeholder="请输入请求URL"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="主机地址" prop="operIp">
<el-input
v-model="queryParams.operIp"
placeholder="请输入主机地址"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作地点" prop="operLocation">
<el-input
v-model="queryParams.operLocation"
placeholder="请输入操作地点"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作时间" prop="operTime">
<el-date-picker clearable
v-model="queryParams.operTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择操作时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:log:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:log:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:log:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:log:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="日志主键" align="center" prop="operId" />
<el-table-column label="模块标题" align="center" prop="title" />
<el-table-column label="业务类型" align="center" prop="businessType" />
<el-table-column label="方法名称" align="center" prop="method" />
<el-table-column label="请求方式" align="center" prop="requestMethod" />
<el-table-column label="操作类别" align="center" prop="operatorType" />
<el-table-column label="操作人员" align="center" prop="operName" />
<el-table-column label="部门名称" align="center" prop="deptName" />
<el-table-column label="请求URL" align="center" prop="operUrl" />
<el-table-column label="主机地址" align="center" prop="operIp" />
<el-table-column label="操作地点" align="center" prop="operLocation" />
<el-table-column label="请求参数" align="center" prop="operParam" />
<el-table-column label="返回参数" align="center" prop="jsonResult" />
<el-table-column label="操作状态" align="center" prop="status" />
<el-table-column label="错误消息" align="center" prop="errorMsg" />
<el-table-column label="操作时间" align="center" prop="operTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.operTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:log:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:log:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改操作日志记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="模块标题" prop="title">
<el-input v-model="form.title" placeholder="请输入模块标题" />
</el-form-item>
<el-form-item label="方法名称" prop="method">
<el-input v-model="form.method" placeholder="请输入方法名称" />
</el-form-item>
<el-form-item label="请求方式" prop="requestMethod">
<el-input v-model="form.requestMethod" placeholder="请输入请求方式" />
</el-form-item>
<el-form-item label="操作人员" prop="operName">
<el-input v-model="form.operName" placeholder="请输入操作人员" />
</el-form-item>
<el-form-item label="部门名称" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入部门名称" />
</el-form-item>
<el-form-item label="请求URL" prop="operUrl">
<el-input v-model="form.operUrl" placeholder="请输入请求URL" />
</el-form-item>
<el-form-item label="主机地址" prop="operIp">
<el-input v-model="form.operIp" placeholder="请输入主机地址" />
</el-form-item>
<el-form-item label="操作地点" prop="operLocation">
<el-input v-model="form.operLocation" placeholder="请输入操作地点" />
</el-form-item>
<el-form-item label="请求参数" prop="operParam">
<el-input v-model="form.operParam" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="返回参数" prop="jsonResult">
<el-input v-model="form.jsonResult" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="错误消息" prop="errorMsg">
<el-input v-model="form.errorMsg" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="操作时间" prop="operTime">
<el-date-picker clearable
v-model="form.operTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择操作时间">
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listLog, getLog, delLog, addLog, updateLog } from "@/api/system/log";
export default {
name: "Log",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 操作日志记录表格数据
logList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
title: null,
businessType: null,
method: null,
requestMethod: null,
operatorType: null,
operName: null,
deptName: null,
operUrl: null,
operIp: null,
operLocation: null,
operParam: null,
jsonResult: null,
status: null,
errorMsg: null,
operTime: null
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询操作日志记录列表 */
getList() {
this.loading = true;
listLog(this.queryParams).then(response => {
this.logList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
operId: null,
title: null,
businessType: null,
method: null,
requestMethod: null,
operatorType: null,
operName: null,
deptName: null,
operUrl: null,
operIp: null,
operLocation: null,
operParam: null,
jsonResult: null,
status: 0,
errorMsg: null,
operTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.operId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加操作日志记录";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const operId = row.operId || this.ids
getLog(operId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改操作日志记录";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.operId != null) {
updateLog(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addLog(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const operIds = row.operId || this.ids;
this.$modal.confirm('是否确认删除操作日志记录编号为"' + operIds + '"的数据项?').then(function() {
return delLog(operIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/log/export', {
...this.queryParams
}, `log_${new Date().getTime()}.xlsx`)
}
}
};
</script>