open
/
open-dbtool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、优化

Browse Source 
Former-commit-id: cc1eb57347bee85dca66c193cbf5c472e1c053b2
master
王兵 5 years ago
parent 109f799fb2
commit ad6d24757f
6 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File

2
src/main/resources/fxml/main.fxml
Unescape View File

@ -14,7 +14,7 @@
<?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.Pane?>
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.101" xmlns:fx="http://javafx.com/fxml/1" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.91" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="xyz.wbsite.dbtool.javafx.ctrl.MainController"> fx:controller="xyz.wbsite.dbtool.javafx.ctrl.MainController">
<top> <top>
<MenuBar BorderPane.alignment="CENTER"> <MenuBar BorderPane.alignment="CENTER">

2
src/main/resources/modules/SpringBoot/java/module/system/mgr/UserManagerImpl.java
Unescape View File

@ -84,7 +84,7 @@ public class UserManagerImpl implements UserManager {
} }
} }
{// 检查机构设置是否正确 if (StringUtil.isNotEmpty(request.getDeptCode())){// 检查机构设置是否正确
DeptFindRequest deptFindRequest = new DeptFindRequest(); DeptFindRequest deptFindRequest = new DeptFindRequest();
deptFindRequest.setDeptCode(request.getDeptCode()); deptFindRequest.setDeptCode(request.getDeptCode());
deptFindRequest.setPageSize(1); deptFindRequest.setPageSize(1);

2
src/main/resources/modules/SpringBoot/java/module/system/req/UserCreateRequest.java
Unescape View File

@ -54,8 +54,6 @@ public class UserCreateRequest extends BaseRequest {
/** /**
* 部门代码 * 部门代码
*/ */
@NotBlank(message = "[deptCode]部门代码不能为空")
@Length(min = 0, max = 50, message = "[deptCode]部门代码长度不合法(0-50)")
private String deptCode; private String deptCode;
private List<String> roleCodeList; private List<String> roleCodeList;

15
src/main/resources/modules/SpringBoot/java/module/system/req/UserUpdateRequest.java
Unescape View File

@ -49,15 +49,8 @@ public class UserUpdateRequest extends BaseUpdateRequest {
/** /**
* 部门代码 * 部门代码
*/ */
@Length(min = 0, max = 50, message = "[deptCode]部门代码长度不合法(0-50)")
private String deptCode; private String deptCode;
/**
* 部门名称
*/
@Length(min = 0, max = 100, message = "[deptName]部门名称长度不合法(0-100)")
private String deptName;
public Long getId() { public Long getId() {
return this.id; return this.id;
} }
@ -105,12 +98,4 @@ public class UserUpdateRequest extends BaseUpdateRequest {
public void setDeptCode(String deptCode) { public void setDeptCode(String deptCode) {
this.deptCode = deptCode; this.deptCode = deptCode;
} }
public String getDeptName() {
return this.deptName;
}
public void setDeptName(String deptName) {
this.deptName = deptName;
}
} }

5
src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl
Unescape View File

@ -213,7 +213,7 @@
{min: 1, max: 100, message: '用户账户长度在 1 到 100 个字符', trigger: 'blur'} {min: 1, max: 100, message: '用户账户长度在 1 到 100 个字符', trigger: 'blur'}
], ],
userCode: [ userCode: [
{min: 1, max: 50, message: '用户代码长度在 1 到 50 个字符', trigger: 'blur'} {min: 0, max: 50, message: '用户代码长度在 1 到 50 个字符', trigger: 'blur'}
], ],
userAlias: [ userAlias: [
{required: true, message: '用户别名不能为空', trigger: 'blur'}, {required: true, message: '用户别名不能为空', trigger: 'blur'},
@ -227,8 +227,7 @@
{required: true, message: '用户状态不能为空', trigger: 'blur'}, {required: true, message: '用户状态不能为空', trigger: 'blur'},
], ],
deptCode: [ deptCode: [
{required: true, message: '请选择部门', trigger: 'blur'}, {min: 0, max: 50, message: '部门代码长度在 1 到 50 个字符', trigger: 'blur'}
{min: 1, max: 50, message: '部门代码长度在 1 到 50 个字符', trigger: 'blur'}
], ],
roleCodeList: [] roleCodeList: []
}, },

64
src/main/resources/modules/SpringBoot/test/DataInit.java
Unescape View File

@ -111,15 +111,20 @@ public class DataInit {
{ {
List<Res> forDev = new ArrayList<>(); List<Res> forDev = new ArrayList<>();
{// 初始化开发角色特有资源 {// 初始化开发角色特有资源
forDev.add(createRes("DEV", "开发管理", "菜单", "DEV")); forDev.add(createRes("DEV", "开发管理菜单", "菜单", "DEV"));
forDev.add(createRes("DEV_RES", "资源管理", "网页", "/system/res.htm")); forDev.add(createRes("DEV_RES", "资源管理菜单", "菜单", "DEV_RES"));
forDev.add(createRes("DEV_RES_HTM", "资源管理页", "网页", "/system/res.htm"));
forDev.add(createRes("DEV_RES_CREATE", "资源新增", "请求", "/ajax/system/res/create")); forDev.add(createRes("DEV_RES_CREATE", "资源新增", "请求", "/ajax/system/res/create"));
forDev.add(createRes("DEV_RES_DELETE", "资源删除", "请求", "/ajax/system/res/delete")); forDev.add(createRes("DEV_RES_DELETE", "资源删除", "请求", "/ajax/system/res/delete"));
forDev.add(createRes("DEV_RES_UPDATE", "资源编辑", "请求", "/ajax/system/res/update")); forDev.add(createRes("DEV_RES_UPDATE", "资源编辑", "请求", "/ajax/system/res/update"));
forDev.add(createRes("DEV_RES_FIND", "资源查询", "请求", "/ajax/system/res/find")); forDev.add(createRes("DEV_RES_FIND", "资源查询", "请求", "/ajax/system/res/find"));
forDev.add(createRes("DEV_RES_GET", "资源获取", "请求", "/ajax/system/res/get")); forDev.add(createRes("DEV_RES_GET", "资源获取", "请求", "/ajax/system/res/get"));
forDev.add(createRes("DEV_TASK", "计划调度", "网页", "/system/schedule.htm"));
forDev.add(createRes("DEV_LOGERR", "错误日志", "网页", "/system/logErr.htm")); forDev.add(createRes("DEV_TASK", "计划调度菜单", "菜单", "DEV_TASK"));
forDev.add(createRes("DEV_TASK_HTM", "计划调度页", "网页", "/system/schedule.htm"));
forDev.add(createRes("DEV_LOGERR", "错误日志菜单", "菜单", "DEV_LOGERR"));
forDev.add(createRes("DEV_LOGERR_HTM", "错误日志管理页", "网页", "/system/logErr.htm"));
forDev.add(createRes("DEV_LOGERR_DELETE", "错误日志删除", "请求", "/ajax/system/logErr/delete")); forDev.add(createRes("DEV_LOGERR_DELETE", "错误日志删除", "请求", "/ajax/system/logErr/delete"));
forDev.add(createRes("DEV_LOGERR_UPDATE", "错误日志更新", "请求", "/ajax/system/logErr/update")); forDev.add(createRes("DEV_LOGERR_UPDATE", "错误日志更新", "请求", "/ajax/system/logErr/update"));
forDev.add(createRes("DEV_LOGERR_FIND", "错误日志查询", "请求", "/ajax/system/logErr/find")); forDev.add(createRes("DEV_LOGERR_FIND", "错误日志查询", "请求", "/ajax/system/logErr/find"));
@ -127,12 +132,10 @@ public class DataInit {
List<Res> forMgr = new ArrayList<>(); List<Res> forMgr = new ArrayList<>();
{// 初始化管理资源 {// 初始化管理资源
forMgr.add(createRes("SYS", "系统管理", "菜单", "SYS")); forMgr.add(createRes("SYS", "系统管理菜单", "菜单", "SYS"));
forMgr.add(createRes("SYS_INDEX_ROOT", "根页", "网页", "/"));
forMgr.add(createRes("SYS_INDEX", "主页", "网页", "/index.htm"));
forMgr.add(createRes("SYS_INDEX_HOME", "首页", "网页", "/home.htm"));
forMgr.add(createRes("SYS_DICT", "字典管理", "网页", "/system/dict.htm")); forMgr.add(createRes("SYS_DICT", "字典管理菜单", "菜单", "SYS_DICT"));
forMgr.add(createRes("SYS_DICT_HTM", "字典管理页", "网页", "/system/dict.htm"));
forMgr.add(createRes("SYS_DICT_CREATE", "字典新建", "请求", "/ajax/system/dict/create")); forMgr.add(createRes("SYS_DICT_CREATE", "字典新建", "请求", "/ajax/system/dict/create"));
forMgr.add(createRes("SYS_DICT_DELETE", "字典删除", "请求", "/ajax/system/dict/delete")); forMgr.add(createRes("SYS_DICT_DELETE", "字典删除", "请求", "/ajax/system/dict/delete"));
forMgr.add(createRes("SYS_DICT_UPDATE", "字典更新", "请求", "/ajax/system/dict/update")); forMgr.add(createRes("SYS_DICT_UPDATE", "字典更新", "请求", "/ajax/system/dict/update"));
@ -146,11 +149,9 @@ public class DataInit {
forMgr.add(createRes("SYS_DICT_ITEM_UPDATE", "字典项更新", "请求", "/ajax/system/dictItem/update")); forMgr.add(createRes("SYS_DICT_ITEM_UPDATE", "字典项更新", "请求", "/ajax/system/dictItem/update"));
forMgr.add(createRes("SYS_DICT_ITEM_FIND", "字典项查找", "请求", "/ajax/system/dictItem/find")); forMgr.add(createRes("SYS_DICT_ITEM_FIND", "字典项查找", "请求", "/ajax/system/dictItem/find"));
forMgr.add(createRes("SYS_DICT_ITEM_GET", "字典项获取", "请求", "/ajax/system/dictItem/get")); forMgr.add(createRes("SYS_DICT_ITEM_GET", "字典项获取", "请求", "/ajax/system/dictItem/get"));
forMgr.add(createRes("SYS_DICT_LOAD", "字典详情", "请求", "/ajax/system/dict/load"));
forMgr.add(createRes("SYS_RES_TREE", "资源树查询", "请求", "/ajax/system/res/tree"));
forMgr.add(createRes("SYS_USER", "用户管理", "网页", "/system/user.htm")); forMgr.add(createRes("SYS_USER", "用户管理菜单", "菜单", "SYS_USER"));
forMgr.add(createRes("SYS_USER_HTM", "用户管理页", "网页", "/system/user.htm"));
forMgr.add(createRes("SYS_USER_CREATE", "用户新增", "请求", "/ajax/system/user/create")); forMgr.add(createRes("SYS_USER_CREATE", "用户新增", "请求", "/ajax/system/user/create"));
forMgr.add(createRes("SYS_USER_DELETE", "用户删除", "请求", "/ajax/system/user/delete")); forMgr.add(createRes("SYS_USER_DELETE", "用户删除", "请求", "/ajax/system/user/delete"));
forMgr.add(createRes("SYS_USER_UPDATE", "用户更新", "请求", "/ajax/system/user/update")); forMgr.add(createRes("SYS_USER_UPDATE", "用户更新", "请求", "/ajax/system/user/update"));
@ -159,7 +160,8 @@ public class DataInit {
forMgr.add(createRes("SYS_USER_IMPORT", "用户导入", "请求", "/ajax/system/user/imports")); forMgr.add(createRes("SYS_USER_IMPORT", "用户导入", "请求", "/ajax/system/user/imports"));
forMgr.add(createRes("SYS_USER_EXPORT", "用户导出", "请求", "/ajax/system/user/exports")); forMgr.add(createRes("SYS_USER_EXPORT", "用户导出", "请求", "/ajax/system/user/exports"));
forMgr.add(createRes("SYS_DEPT", "机构管理", "网页", "/system/dept.htm")); forMgr.add(createRes("SYS_DEPT", "机构管理菜单", "菜单", "SYS_DEPT"));
forMgr.add(createRes("SYS_DEPT_HTM", "机构管理页", "网页", "/system/dept.htm"));
forMgr.add(createRes("SYS_DEPT_CREATE", "机构新增", "请求", "/ajax/system/dept/create")); forMgr.add(createRes("SYS_DEPT_CREATE", "机构新增", "请求", "/ajax/system/dept/create"));
forMgr.add(createRes("SYS_DEPT_DELETE", "机构删除", "请求", "/ajax/system/dept/delete")); forMgr.add(createRes("SYS_DEPT_DELETE", "机构删除", "请求", "/ajax/system/dept/delete"));
forMgr.add(createRes("SYS_DEPT_UPDATE", "机构更新", "请求", "/ajax/system/dept/update")); forMgr.add(createRes("SYS_DEPT_UPDATE", "机构更新", "请求", "/ajax/system/dept/update"));
@ -169,11 +171,13 @@ public class DataInit {
forMgr.add(createRes("SYS_DEPT_IMPORT", "机构导入", "请求", "/ajax/system/dept/imports")); forMgr.add(createRes("SYS_DEPT_IMPORT", "机构导入", "请求", "/ajax/system/dept/imports"));
forMgr.add(createRes("SYS_DEPT_EXPORT", "机构导出", "请求", "/ajax/system/dept/exports")); forMgr.add(createRes("SYS_DEPT_EXPORT", "机构导出", "请求", "/ajax/system/dept/exports"));
forMgr.add(createRes("SYS_FILE", "文件管理", "网页", "/system/file.htm")); forMgr.add(createRes("SYS_FILE", "文件管理菜单", "网页", "SYS_FILE"));
forMgr.add(createRes("SYS_FILE_HTM", "文件管理页", "网页", "/system/file.htm"));
forMgr.add(createRes("SYS_FILE_DELETE", "文件删除", "请求", "/ajax/system/file/delete")); forMgr.add(createRes("SYS_FILE_DELETE", "文件删除", "请求", "/ajax/system/file/delete"));
forMgr.add(createRes("SYS_FILE_FIND", "文件查询", "请求", "/ajax/system/file/find")); forMgr.add(createRes("SYS_FILE_FIND", "文件查询", "请求", "/ajax/system/file/find"));
forMgr.add(createRes("SYS_ROLE", "角色管理", "网页", "/system/role.htm")); forMgr.add(createRes("SYS_ROLE", "角色管理菜单", "网页", "SYS_ROLE"));
forMgr.add(createRes("SYS_ROLE_HTM", "角色管理页", "网页", "/system/role.htm"));
forMgr.add(createRes("SYS_ROLE_CREATE", "角色新增", "请求", "/ajax/system/role/create")); forMgr.add(createRes("SYS_ROLE_CREATE", "角色新增", "请求", "/ajax/system/role/create"));
forMgr.add(createRes("SYS_ROLE_DELETE", "角色删除", "请求", "/ajax/system/role/delete")); forMgr.add(createRes("SYS_ROLE_DELETE", "角色删除", "请求", "/ajax/system/role/delete"));
forMgr.add(createRes("SYS_ROLE_UPDATE", "角色更新", "请求", "/ajax/system/role/update")); forMgr.add(createRes("SYS_ROLE_UPDATE", "角色更新", "请求", "/ajax/system/role/update"));
@ -181,40 +185,52 @@ public class DataInit {
forMgr.add(createRes("SYS_ROLE_GET", "角色获取", "请求", "/ajax/system/role/get")); forMgr.add(createRes("SYS_ROLE_GET", "角色获取", "请求", "/ajax/system/role/get"));
forMgr.add(createRes("SYS_ROLE_RESCHECK", "角色资源分配", "请求", "/ajax/system/roleRes/check")); forMgr.add(createRes("SYS_ROLE_RESCHECK", "角色资源分配", "请求", "/ajax/system/roleRes/check"));
forMgr.add(createRes("SYS_ROLE_ROLERES", "角色资源关系查询", "请求", "/ajax/system/roleRes/find")); forMgr.add(createRes("SYS_ROLE_ROLERES", "角色资源关系查询", "请求", "/ajax/system/roleRes/find"));
forMgr.add(createRes("SYS_ROLE_RES_TREE", "资源树查询", "请求", "/ajax/system/res/tree"));
forMgr.add(createRes("SYS_TOKENS", "登录凭证管理", "网页", "/system/tokens.htm")); forMgr.add(createRes("SYS_TOKENS", "登录凭证管理菜单", "网页", "SYS_TOKENS"));
forMgr.add(createRes("SYS_TOKENS_HTM", "登录凭证管理页", "网页", "/system/tokens.htm"));
forMgr.add(createRes("SYS_TOKENS_FIND", "登录凭证查询", "请求", "/ajax/system/tokens/find")); forMgr.add(createRes("SYS_TOKENS_FIND", "登录凭证查询", "请求", "/ajax/system/tokens/find"));
forMgr.add(createRes("SYS_TOKENS_EXPORT", "凭证导出", "请求", "/ajax/system/tokens/exports")); forMgr.add(createRes("SYS_TOKENS_EXPORT", "凭证导出", "请求", "/ajax/system/tokens/exports"));
forMgr.add(createRes("SYS_TOKENS_LOGOUT", "凭证注销", "请求", "/ajax/system/tokens/logout")); forMgr.add(createRes("SYS_TOKENS_LOGOUT", "凭证注销", "请求", "/ajax/system/tokens/logout"));
<#list project.modules as module> <#list project.modules as module>
forMgr.add(createRes("WEB_${module.moduleName?upper_case}", "${module.moduleComment}菜单", "菜单", "WEB_${module.moduleName?upper_case}"));
<#list module.tables as table> <#list module.tables as table>
<#if table.html> <#if table.html>
forMgr.add(createRes("WEB_${table.tableName}", "${table.tableComment}管理", "网页", "/${module.moduleName}/${table.getFName()}.htm")); forMgr.add(createRes("WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}", "${table.tableComment}管理菜单", "菜单", "WEB_${table.tableName?upper_case}"));
forMgr.add(createRes("WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}_HTM", "${table.tableComment}管理页", "网页", "/${module.moduleName}/${table.getFName()}.htm"));
</#if> </#if>
<#if table.create> <#if table.create>
forMgr.add(createRes("WEB_${table.tableName}_CREATE", "${table.tableComment}新增", "请求", "/ajax/${module.moduleName}/${table.getFName()}/create")); forMgr.add(createRes("WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}_CREATE", "${table.tableComment}新增", "请求", "/ajax/${module.moduleName}/${table.getFName()}/create"));
</#if> </#if>
<#if table.delete> <#if table.delete>
forMgr.add(createRes("WEB_${table.tableName}_DELETE", "${table.tableComment}删除", "请求", "/ajax/${module.moduleName}/${table.getFName()}/delete")); forMgr.add(createRes("WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}_DELETE", "${table.tableComment}删除", "请求", "/ajax/${module.moduleName}/${table.getFName()}/delete"));
</#if> </#if>
<#if table.update> <#if table.update>
forMgr.add(createRes("WEB_${table.tableName}_UPDATE", "${table.tableComment}更新", "请求", "/ajax/${module.moduleName}/${table.getFName()}/update")); forMgr.add(createRes("WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}_UPDATE", "${table.tableComment}更新", "请求", "/ajax/${module.moduleName}/${table.getFName()}/update"));
</#if> </#if>
<#if table.find> <#if table.find>
forMgr.add(createRes("WEB_${table.tableName}_FIND", "${table.tableComment}查询", "请求", "/ajax/${module.moduleName}/${table.getFName()}/find")); forMgr.add(createRes("WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}_FIND", "${table.tableComment}查询", "请求", "/ajax/${module.moduleName}/${table.getFName()}/find"));
</#if> </#if>
<#if table.get> <#if table.get>
forMgr.add(createRes("WEB_${table.tableName}_GET", "${table.tableComment}获取", "请求", "/ajax/${module.moduleName}/${table.getFName()}/get")); forMgr.add(createRes("WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}_GET", "${table.tableComment}获取", "请求", "/ajax/${module.moduleName}/${table.getFName()}/get"));
</#if> </#if>
<#if table.search> <#if table.search>
forMgr.add(createRes("WEB_${table.tableName}_SEARCH", "${table.tableComment}搜索", "请求", "/ajax/${module.moduleName}/${table.getFName()}/search")); forMgr.add(createRes("WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}_SEARCH", "${table.tableComment}搜索", "请求", "/ajax/${module.moduleName}/${table.getFName()}/search"));
</#if> </#if>
</#list> </#list>
</#list> </#list>
} }
{// 公共资源
forMgr.add(createRes("SYS_DICT_LOAD", "字典详情", "请求", "/ajax/system/dict/load"));
forMgr.add(createRes("SYS_INDEX_ROOT", "根页", "网页", "/"));
forMgr.add(createRes("SYS_INDEX", "主页", "网页", "/index.htm"));
forMgr.add(createRes("SYS_INDEX_HOME", "首页", "网页", "/home.htm"));
}
{//初始化开发角色 {//初始化开发角色
Long roleId = createRole("developer", "开发", "开发"); Long roleId = createRole("developer", "开发", "开发");
for (Res res : forDev) { for (Res res : forDev) {

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.