Skip to content
GitLab
Commit 12428193 authored by xiandafu's avatar xiandafu
Browse files

add menu

parent 0c282664
Hide whitespace changes
Inline Side-by-side
admin-console/src/main/java/com/ibeetl/admin/console/service/OrgConsoleService.java
View file @ 12428193
......@@ -81,7 +81,6 @@ public class OrgConsoleService extends BaseService<CoreOrg> {
throw new PlatformException("不能删除 "+child.getOrg().getName()+",还包含子机构");
}
}
return super.deleteById(ids);
}
......
admin-console/src/main/java/com/ibeetl/admin/console/web/OrgConsoleController.java
View file @ 12428193
......@@ -140,7 +140,7 @@ public class OrgConsoleController {
boolean success = orgConsoleService.updateTemplate(org);
if (success) {
platformService.clearOrgCache();
return JsonResult.successMessage("保存成功");
return JsonResult.successMessage("保存成功");
} else {
return JsonResult.failMessage("保存失败");
}
......@@ -162,10 +162,9 @@ public class OrgConsoleController {
if (ids.endsWith(",")) {
ids = StringUtils.substringBeforeLast(ids, ",");
}
List<Long> idList = ConvertUtil.str2longs(ids);
orgConsoleService.deleteById(idList);
this.platformService.clearOrgCache();
return new JsonResult().success();
}
......
admin-console/src/main/resources/templates/cms/blog/add.html 0 → 100644
View file @ 12428193
<!--# layout("/common/layout.html",{"jsBase":"/js/cms/blog/"}){ -->
<form class="layui-form layui-form-pane" id="addForm">
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" name="title" class="layui-input" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" name="content" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" name="createTime" class="layui-input input-date" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" name="createUserId" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" name="type" class="layui-input" >
</div>
</div>
</div>
</div>
<layui:submitButtons id="addButton" />
</form>
<!--#} -->
<script>
layui.use(['add'], function(){
var blogAdd = layui.add
blogAdd.init();
});
</script>
admin-console/src/main/resources/templates/cms/blog/edit.html 0 → 100644
View file @ 12428193
<!--# layout("/common/layout.html",{"jsBase":"/js/cms/blog/"}){ -->
<form class="layui-form layui-form-pane" id="updateForm">
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" id="title" name="title" value="${blog.title}" class="layui-input" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" id="content" name="content" value="${blog.content}" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" id="createTime" name="createTime" value="${blog.createTime,"yyyy-MM-dd"}" class="layui-input input-date" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" id="createUserId" name="createUserId" value="${blog.createUserId}" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" id="type" name="type" value="${blog.type}" class="layui-input" >
</div>
</div>
</div>
</div>
<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
<input type="hidden" name="id" value=${blog.id} />
<layui:submitButtons id="updateButton" />
</form>
<!--#} -->
<script>
layui.use(['edit'], function(){
var blogEdit = layui.edit
blogEdit.init();
});
</script>
admin-console/src/main/resources/templates/cms/blog/index.html 0 → 100644
View file @ 12428193
<!--#layout("/common/layout.html",{"jsBase":"/js/cms/blog/"}){ -->
<layui:searchForm formId="searchForm" condition="${search}">
</layui:searchForm>
<div class="layui-btn-group">
<layui:accessButton function="blog.add" action="add">增加</layui:accessButton>
<layui:accessButton function="blog.edit" action="edit">编辑</layui:accessButton>
<layui:accessButton function="blog.del" action="del">删除</layui:accessButton>
</div>
<table id="blogTable" lay-filter="blogTable"></table>
<!--#} -->
<script>
layui.use(['index'], function(){
var index = layui.index
index.init();
});
</script>
admin-console/src/main/resources/templates/cms/cmsBlog/add.html 0 → 100644
View file @ 12428193
<!--# layout("/common/layout.html",{"jsBase":"/js/cms/cmsBlog/"}){ -->
<form class="layui-form layui-form-pane" id="addForm">
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" name="title" class="layui-input" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" name="content" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" name="createTime" class="layui-input input-date" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" name="createUserId" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" name="type" class="layui-input" >
</div>
</div>
</div>
</div>
<layui:submitButtons id="addButton" />
</form>
<!--#} -->
<script>
layui.use(['add'], function(){
var cmsBlogAdd = layui.add
cmsBlogAdd.init();
});
</script>
admin-console/src/main/resources/templates/cms/cmsBlog/edit.html 0 → 100644
View file @ 12428193
<!--# layout("/common/layout.html",{"jsBase":"/js/cms/cmsBlog/"}){ -->
<form class="layui-form layui-form-pane" id="updateForm">
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" id="title" name="title" value="${cmsBlog.title}" class="layui-input" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" id="content" name="content" value="${cmsBlog.content}" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" id="createTime" name="createTime" value="${cmsBlog.createTime,"yyyy-MM-dd"}" class="layui-input input-date" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" id="createUserId" name="createUserId" value="${cmsBlog.createUserId}" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="text" id="type" name="type" value="${cmsBlog.type}" class="layui-input" >
</div>
</div>
</div>
</div>
<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
<input type="hidden" name="id" value=${cmsBlog.id} />
<layui:submitButtons id="updateButton" />
</form>
<!--#} -->
<script>
layui.use(['edit'], function(){
var cmsBlogEdit = layui.edit
cmsBlogEdit.init();
});
</script>
admin-console/src/main/resources/templates/cms/cmsBlog/index.html 0 → 100644
View file @ 12428193
<!--#layout("/common/layout.html",{"jsBase":"/js/cms/cmsBlog/"}){ -->
<layui:searchForm formId="searchForm" condition="${search}">
</layui:searchForm>
<div class="layui-btn-group">
<layui:accessButton function="cmsBlog.add" action="add">增加</layui:accessButton>
<layui:accessButton function="cmsBlog.edit" action="edit">编辑</layui:accessButton>
<layui:accessButton function="cmsBlog.del" action="del">删除</layui:accessButton>
</div>
<table id="cmsBlogTable" lay-filter="cmsBlogTable"></table>
<!--#} -->
<script>
layui.use(['index'], function(){
var index = layui.index
index.init();
});
</script>
admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java
View file @ 12428193
......@@ -107,7 +107,12 @@ public class CoreCodeGenService {
return e;
}
/**
*
* @param data
* @param urlBase
* @return 增删改查中的查
*/
public Long insertFunction(Entity data,String urlBase){
String preffix = urlBase.replace('/', '.');
String functionCode = preffix+"."+data.getCode();
......@@ -178,19 +183,21 @@ public class CoreCodeGenService {
public boolean insertMenu(Long functionId,Entity data,String urlBase){
CoreMenu query = new CoreMenu();
query.setCode("代码生成导航");
query.setType("MENU_N");
CoreMenu menu = this.sqlManager.templateOne(query);
if(menu==null) {
log.warn("未找到对应的父菜单:"+query.getCode());
return false ;
}
Long parentId = query.getId();
Long parentId = menu.getId();
CoreMenu newMenu = new CoreMenu();
newMenu.setCode(data.getName()+".Manager");
newMenu.setName(data.getName()+"管理");
newMenu.setParentMenuId(parentId);
newMenu.setFunctionId(functionId);
newMenu.setType("MENU_M");
//任意设置一个顺序
newMenu.setSeq(3);
this.sqlManager.insert(newMenu);
this.platformService.clearMenuCache();
return true;
......
admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java
View file @ 12428193
......@@ -208,12 +208,16 @@ public class CoreCodeGenController {
MdGen mdGen = new MdGen();
mdGen.make(target, entity);
if(entity.isAutoAddFunction()) {
if(entity.isAutoAddMenu()||entity.isAutoAddFunction()) {
//自动增加功能点
this.codeGenService.insertFunction(entity, urlBase);
long functionId = this.codeGenService.insertFunction(entity, urlBase);
if(entity.isAutoAddMenu()) {
this.codeGenService.insertMenu(functionId, entity, urlBase);
}
}
return JsonResult.success();
}
......@@ -285,9 +289,6 @@ public class CoreCodeGenController {
content.put(gen.getName(), code);
}
return JsonResult.success(content);
}
......
admin-core/src/main/resources/codeTemplate/md/entity.md
View file @ 12428193
......@@ -9,7 +9,7 @@ queryByCondition
from ${entity.tableName} t
where del_flag=0
\@//数据权限，该sql语句功能点
and #function("${entity.code}.query")#
#function("${entity.code}.query")#
@for(attr in entity.list){
@if(attr.showInQuery){
\@if(!isEmpty(${attr.name})){
......
admin-core/src/main/resources/templates/core/codeGen/edit.html
View file @ 12428193
......@@ -151,7 +151,7 @@
<div class="layui-input-inline">
<input type="checkbox"
name="entity.autoAddMenu"
lay-skin="primary" value="true" title="自动添加到菜单"/>
lay-skin="primary" value="true" title="添加到菜单"/>
</div>
</div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment