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