Skip to content
GitLab
Commit 6de32c6d authored by trumansdo's avatar trumansdo
Browse files

改变目录结构，以防止ide混合打开前端项目，导致误操作改变前端项目的格式 


Signed-off-by: default avatartrumansdo <1012243881@qq.com>
parent afdf4eec
Expand all Hide whitespace changes
Inline Side-by-side
admin-console/src/main/java/com/ibeetl/admin/console/service/MenuConsoleService.java → plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/service/MenuConsoleService.java
View file @ 6de32c6d
package com.ibeetl.admin.console.service;
import com.ibeetl.admin.console.dao.MenuConsoleDao;
import com.ibeetl.admin.core.dao.CoreRoleMenuDao;
import com.ibeetl.admin.core.entity.CoreMenu;
import com.ibeetl.admin.core.rbac.tree.MenuItem;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.service.CorePlatformService;
import com.ibeetl.admin.core.util.PlatformException;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@Service
@Transactional
public class MenuConsoleService extends CoreBaseService<CoreMenu> {
@Autowired
MenuConsoleDao menuDao;
@Autowired
CoreRoleMenuDao roleMenuDao;
@Autowired
CorePlatformService platformService;
public void queryByCondtion(PageQuery<CoreMenu> query) {
menuDao.queryByCondtion(query);
queryListAfter(query.getList());
}
public Long saveMenu(CoreMenu menu) {
CoreMenu query = new CoreMenu();
query.setCode(menu.getCode());
long queryCount = menuDao.templateCount(query);
if (queryCount > 0) {
throw new PlatformException("菜单编码已存在");
}
menuDao.insert(menu, true);
platformService.clearMenuCache();
return menu.getId();
}
public void deleteMenu(Long menuId) {
deleteMenuId(menuId);
}
public void batchDeleteMenuId(List<Long> menuIds) {
for (Long id : menuIds) {
deleteMenuId(id);
}
platformService.clearMenuCache();
}
public void updateMenu(CoreMenu menu) {
menuDao.updateById(menu);
platformService.clearMenuCache();
}
public CoreMenu getMenu(Long menuId) {
CoreMenu menu = menuDao.unique(menuId);
platformService.clearMenuCache();
return menu;
}
private void deleteMenuId(Long menuId) {
MenuItem root = platformService.buildMenu();
MenuItem fun = root.findChild(menuId);
List<MenuItem> all = fun.findAllItem();
//也删除自身
all.add(fun);
realDeleteMenu(all);
}
private void realDeleteMenu(List<MenuItem> all) {
List<Long> ids = new ArrayList<>(all.size());
for (MenuItem item : all) {
ids.add(item.getId());
this.menuDao.deleteById(item.getId());
}
//删除角色和菜单的关系
roleMenuDao.deleteRoleMenu(ids);
}
}
package com.ibeetl.admin.console.service;
import com.ibeetl.admin.console.dao.MenuConsoleDao;
import com.ibeetl.admin.core.dao.CoreRoleMenuDao;
import com.ibeetl.admin.core.entity.CoreMenu;
import com.ibeetl.admin.core.rbac.tree.MenuItem;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.service.CorePlatformService;
import com.ibeetl.admin.core.util.PlatformException;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@Service
@Transactional
public class MenuConsoleService extends CoreBaseService<CoreMenu> {
@Autowired
MenuConsoleDao menuDao;
@Autowired
CoreRoleMenuDao roleMenuDao;
@Autowired
CorePlatformService platformService;
public void queryByCondtion(PageQuery<CoreMenu> query) {
menuDao.queryByCondtion(query);
queryListAfter(query.getList());
}
public Long saveMenu(CoreMenu menu) {
CoreMenu query = new CoreMenu();
query.setCode(menu.getCode());
long queryCount = menuDao.templateCount(query);
if (queryCount > 0) {
throw new PlatformException("菜单编码已存在");
}
menuDao.insert(menu, true);
platformService.clearMenuCache();
return menu.getId();
}
public void deleteMenu(Long menuId) {
deleteMenuId(menuId);
}
public void batchDeleteMenuId(List<Long> menuIds) {
for (Long id : menuIds) {
deleteMenuId(id);
}
platformService.clearMenuCache();
}
public void updateMenu(CoreMenu menu) {
menuDao.updateById(menu);
platformService.clearMenuCache();
}
public CoreMenu getMenu(Long menuId) {
CoreMenu menu = menuDao.unique(menuId);
platformService.clearMenuCache();
return menu;
}
private void deleteMenuId(Long menuId) {
MenuItem root = platformService.buildMenu();
MenuItem fun = root.findChild(menuId);
List<MenuItem> all = fun.findAllItem();
//也删除自身
all.add(fun);
realDeleteMenu(all);
}
private void realDeleteMenu(List<MenuItem> all) {
List<Long> ids = new ArrayList<>(all.size());
for (MenuItem item : all) {
ids.add(item.getId());
this.menuDao.deleteById(item.getId());
}
//删除角色和菜单的关系
roleMenuDao.deleteRoleMenu(ids);
}
}
admin-console/src/main/java/com/ibeetl/admin/console/web/AuditConsoleController.java → plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/AuditConsoleController.java
View file @ 6de32c6d
package com.ibeetl.admin.console.web;
package com.ibeetl.admin.console.web;
import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import com.ibeetl.admin.console.service.AuditConsoleService;
import com.ibeetl.admin.console.web.query.AuditQuery;
import com.ibeetl.admin.console.web.query.UserQuery;
import com.ibeetl.admin.core.annotation.Function;
import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.entity.CoreAudit;
import com.ibeetl.admin.core.util.AnnotationUtil;
import com.ibeetl.admin.core.web.JsonResult;
/**
* 用户管理接口
* @author xiandafu
*
*/
@Controller
public class AuditConsoleController {
private final Log log = LogFactory.getLog(this.getClass());
private static final String MODEL = "/admin/audit";
@Autowired
AuditConsoleService auditConsoleService;
/*页面*/
@GetMapping(MODEL + "/index.do")
@Function("trace")
public ModelAndView index() {
ModelAndView view = new ModelAndView("/admin/audit/index.html");
view.addObject("search", AuditQuery.class.getName());
return view;
}
/*Json*/
@PostMapping(MODEL + "/view.json")
@ResponseBody
@Function("trace")
public JsonResult<CoreAudit> view(Long id) {
CoreAudit audit = auditConsoleService.queryById(id);
return JsonResult.success(audit);
}
@RequestMapping(MODEL + "/list.json")
@Function("trace")
@ResponseBody
public JsonResult<PageQuery<CoreAudit>> list(AuditQuery condtion) {
PageQuery<CoreAudit> page = condtion.getPageQuery();
auditConsoleService.queryByCondtion(page);
return JsonResult.success(page);
}
@PostMapping(MODEL + "/list/condition.json")
@Function("trace")
@ResponseBody
public JsonResult<List<Map<String, Object>>> listCondtion() {
List<Map<String, Object>> list = AnnotationUtil.getInstance().getAnnotations(Query.class, AuditQuery.class);
return JsonResult.success(list);
}
}
import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import com.ibeetl.admin.console.service.AuditConsoleService;
import com.ibeetl.admin.console.web.query.AuditQuery;
import com.ibeetl.admin.console.web.query.UserQuery;
import com.ibeetl.admin.core.annotation.Function;
import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.entity.CoreAudit;
import com.ibeetl.admin.core.util.AnnotationUtil;
import com.ibeetl.admin.core.web.JsonResult;
/**
* 用户管理接口
* @author xiandafu
*
*/
@Controller
public class AuditConsoleController {
private final Log log = LogFactory.getLog(this.getClass());
private static final String MODEL = "/admin/audit";
@Autowired
AuditConsoleService auditConsoleService;
/*页面*/
@GetMapping(MODEL + "/index.do")
@Function("trace")
public ModelAndView index() {
ModelAndView view = new ModelAndView("/admin/audit/index.html");
view.addObject("search", AuditQuery.class.getName());
return view;
}
/*Json*/
@PostMapping(MODEL + "/view.json")
@ResponseBody
@Function("trace")
public JsonResult<CoreAudit> view(Long id) {
CoreAudit audit = auditConsoleService.queryById(id);
return JsonResult.success(audit);
}
@RequestMapping(MODEL + "/list.json")
@Function("trace")
@ResponseBody
public JsonResult<PageQuery<CoreAudit>> list(AuditQuery condtion) {
PageQuery<CoreAudit> page = condtion.getPageQuery();
auditConsoleService.queryByCondtion(page);
return JsonResult.success(page);
}
@PostMapping(MODEL + "/list/condition.json")
@Function("trace")
@ResponseBody
public JsonResult<List<Map<String, Object>>> listCondtion() {
List<Map<String, Object>> list = AnnotationUtil.getInstance().getAnnotations(Query.class, AuditQuery.class);
return JsonResult.success(list);
}
}
admin-console/src/main/java/com/ibeetl/admin/console/web/MenuController.java → plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/MenuController.java
View file @ 6de32c6d
package com.ibeetl.admin.console.web;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import com.ibeetl.admin.console.service.MenuConsoleService;
import com.ibeetl.admin.console.web.query.FunctionQuery;
import com.ibeetl.admin.console.web.query.MenuQuery;
import com.ibeetl.admin.core.annotation.Function;
import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.entity.CoreFunction;
import com.ibeetl.admin.core.entity.CoreMenu;
import com.ibeetl.admin.core.rbac.tree.MenuItem;
import com.ibeetl.admin.core.service.CorePlatformService;
import com.ibeetl.admin.core.util.AnnotationUtil;
import com.ibeetl.admin.core.util.ConvertUtil;
import com.ibeetl.admin.core.web.JsonResult;
/**
* @author lijiazhi
*/
@Controller
public class MenuController {
private static final String MODEL = "/admin/menu";
private final Log log = LogFactory.getLog(this.getClass());
@Autowired
MenuConsoleService menuService;
@Autowired
CorePlatformService platformService;
/*页面*/
@GetMapping(MODEL + "/index.do")
@Function("menu")
public ModelAndView index() {
ModelAndView view = new ModelAndView("/admin/menu/index.html");
view.addObject("search", MenuQuery.class.getName());
return view;
}
@GetMapping(MODEL + "/add.do")
@Function("menu.add")
public ModelAndView add() {
ModelAndView view = new ModelAndView("/admin/menu/add.html");
return view;
}
@GetMapping(MODEL + "/edit.do")
@Function("menu.edit")
public ModelAndView edit(Integer id) {
ModelAndView view = new ModelAndView("/admin/menu/edit.html");
CoreMenu menu = menuService.queryById(id);
view.addObject("menu", menu);
return view;
}
/*Json*/
/**
* 查询
* @param menu
* @return
*/
@PostMapping(MODEL + "/list/condition.json")
@Function("menu.query")
@ResponseBody
public JsonResult condition() {
List<Map<String, Object>> list = AnnotationUtil.getInstance().getAnnotations(Query.class, MenuQuery.class);
return JsonResult.success(list);
}
@PostMapping(MODEL + "/list.json")
@Function("menu.query")
@ResponseBody
public JsonResult<PageQuery> list(MenuQuery condtion) {
PageQuery page = condtion.getPageQuery();
menuService.queryByCondtion(page);
return JsonResult.success(page);
}
/**
* 添加
* @param menu
* @return
*/
@PostMapping(MODEL + "/save.json")
@Function("menu.save")
@ResponseBody
public JsonResult save(@Validated CoreMenu menu) {
menu.setCreateTime(new Date());
Long id = menuService.saveMenu(menu);
return JsonResult.success(id);
}
/**
* 更新
* @param fun
* @return
*/
@PostMapping(MODEL + "/update.json")
@Function("menu.update")
@ResponseBody
public JsonResult update(CoreMenu fun) {
menuService.updateMenu(fun);
return new JsonResult().success();
}
/**
* 根据id查询菜单信息
* @param id 菜单Id
* @return
*/
@PostMapping(MODEL + "/view.json")
@Function("menu.query")
@ResponseBody
public JsonResult<CoreMenu> view(Long id) {
CoreMenu fun = menuService.queryById(id);
MenuItem root = this.platformService.buildMenu();
MenuItem child = root.findChild(fun.getId());
CoreMenu parent = child.getParent().getData();
fun.set("parentMenuName", parent.getName());
return JsonResult.success(fun);
}
/**
* 删除
* @param id 菜单id
* @return
*/
@PostMapping(MODEL + "/delete.json")
@Function("menu.delete")
@ResponseBody
public JsonResult delete(Long id) {
menuService.deleteMenu(id);
return new JsonResult().success();
}
/**
* 批量删除
* @param ids 菜单id集合
* @return
*/
@PostMapping(MODEL + "/batchDel.json")
@Function("menu.delete")
@ResponseBody
public JsonResult delete(String ids) {
List<Long> dels = ConvertUtil.str2longs(ids);
menuService.batchDeleteMenuId(dels);
return new JsonResult().success();
}
}
package com.ibeetl.admin.console.web;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import com.ibeetl.admin.console.service.MenuConsoleService;
import com.ibeetl.admin.console.web.query.FunctionQuery;
import com.ibeetl.admin.console.web.query.MenuQuery;
import com.ibeetl.admin.core.annotation.Function;
import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.entity.CoreFunction;
import com.ibeetl.admin.core.entity.CoreMenu;
import com.ibeetl.admin.core.rbac.tree.MenuItem;
import com.ibeetl.admin.core.service.CorePlatformService;
import com.ibeetl.admin.core.util.AnnotationUtil;
import com.ibeetl.admin.core.util.ConvertUtil;
import com.ibeetl.admin.core.web.JsonResult;
/**
* @author lijiazhi
*/
@Controller
public class MenuController {
private static final String MODEL = "/admin/menu";
private final Log log = LogFactory.getLog(this.getClass());
@Autowired
MenuConsoleService menuService;
@Autowired
CorePlatformService platformService;
/*页面*/
@GetMapping(MODEL + "/index.do")
@Function("menu")
public ModelAndView index() {
ModelAndView view = new ModelAndView("/admin/menu/index.html");
view.addObject("search", MenuQuery.class.getName());
return view;
}
@GetMapping(MODEL + "/add.do")
@Function("menu.add")
public ModelAndView add() {
ModelAndView view = new ModelAndView("/admin/menu/add.html");
return view;
}
@GetMapping(MODEL + "/edit.do")
@Function("menu.edit")
public ModelAndView edit(Integer id) {
ModelAndView view = new ModelAndView("/admin/menu/edit.html");
CoreMenu menu = menuService.queryById(id);
view.addObject("menu", menu);
return view;
}
/*Json*/
/**
* 查询
* @param menu
* @return
*/
@PostMapping(MODEL + "/list/condition.json")
@Function("menu.query")
@ResponseBody
public JsonResult condition() {
List<Map<String, Object>> list = AnnotationUtil.getInstance().getAnnotations(Query.class, MenuQuery.class);
return JsonResult.success(list);
}
@PostMapping(MODEL + "/list.json")
@Function("menu.query")
@ResponseBody
public JsonResult<PageQuery> list(MenuQuery condtion) {
PageQuery page = condtion.getPageQuery();
menuService.queryByCondtion(page);
return JsonResult.success(page);
}
/**
* 添加
* @param menu
* @return
*/
@PostMapping(MODEL + "/save.json")
@Function("menu.save")
@ResponseBody
public JsonResult save(@Validated CoreMenu menu) {
menu.setCreateTime(new Date());
Long id = menuService.saveMenu(menu);
return JsonResult.success(id);
}
/**
* 更新
* @param fun
* @return
*/
@PostMapping(MODEL + "/update.json")
@Function("menu.update")
@ResponseBody
public JsonResult update(CoreMenu fun) {
menuService.updateMenu(fun);
return new JsonResult().success();
}
/**
* 根据id查询菜单信息
* @param id 菜单Id
* @return
*/
@PostMapping(MODEL + "/view.json")
@Function("menu.query")
@ResponseBody
public JsonResult<CoreMenu> view(Long id) {
CoreMenu fun = menuService.queryById(id);
MenuItem root = this.platformService.buildMenu();
MenuItem child = root.findChild(fun.getId());
CoreMenu parent = child.getParent().getData();
fun.set("parentMenuName", parent.getName());
return JsonResult.success(fun);
}
/**
* 删除
* @param id 菜单id
* @return
*/
@PostMapping(MODEL + "/delete.json")
@Function("menu.delete")
@ResponseBody
public JsonResult delete(Long id) {
menuService.deleteMenu(id);
return new JsonResult().success();
}
/**
* 批量删除
* @param ids 菜单id集合
* @return
*/
@PostMapping(MODEL + "/batchDel.json")
@Function("menu.delete")
@ResponseBody
public JsonResult delete(String ids) {
List<Long> dels = ConvertUtil.str2longs(ids);
menuService.batchDeleteMenuId(dels);
return new JsonResult().success();
}
}
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