Skip to content

E
education
Commit 4d06918d authored by luzhuang's avatar luzhuang
Browse files
Options

menu

parent 605279f4
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 19 deletions
src/main/java/org/rcisoft/sys/menu/controller/SysMenuController.java
View file @ 4d06918d
......@@ -12,6 +12,7 @@ import org.rcisoft.core.model.PersistModel;
import org.rcisoft.core.result.Result;
import org.rcisoft.sys.menu.entity.SysMenu;
import org.rcisoft.sys.menu.service.SysMenuService;
import org.rcisoft.sys.user.bean.CurUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
......@@ -44,10 +45,22 @@ public class SysMenuController extends ResponseController {
// return sysMenuServiceImpl.queryMenuTreeForSelectedByRP(id);
// }
@ApiOperation(value="根据id 查询 menu", notes="根据id 查询 menu")
@ApiOperation(value = "根据id 查询 menu", notes = "根据id 查询 menu")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar", paramType = "path"),
@ApiImplicitParam(name = "modelId", value = "businessId", required = true, dataType = "varchar", paramType = "path")})
@GetMapping("/queryMenuById")
public Result queryMenu(CurUser curUser,String businessId,String modelId) {
return Result.builder(new PersistModel(1),
MessageConstant.MESSAGE_ALERT_SUCCESS,
MessageConstant.MESSAGE_ALERT_ERROR,
sysMenuServiceImpl.queryMenusById(curUser.getCorpId(),businessId,modelId));
}
@ApiOperation(value = "根据id 查询 menu", notes = "根据id 查询 menu")
@ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "Integer", paramType = "path")
@GetMapping("queryMenuById/{id}")
public Result queryMenuById(@PathVariable("id") String id){
public Result queryMenuById(@PathVariable("id") String id) {
SysMenu menu = sysMenuServiceImpl.queryMenuById(id);
return Result.builder(new PersistModel(1),
......@@ -57,16 +70,16 @@ public class SysMenuController extends ResponseController {
}
@ApiOperation(value="增加菜单code", notes="true:合法;false:不合法;不能有其它的输出")
@ApiOperation(value = "增加菜单code", notes = "true:合法;false:不合法;不能有其它的输出")
@ApiImplicitParam(name = "menuCode", value = "菜单编号", required = false, dataType = "varchar")
@PostMapping("queryMenuCodeValidate")
public String queryDeptCodeValidate(@RequestParam("menuCode") String menuCode){
public String queryDeptCodeValidate(@RequestParam("menuCode") String menuCode) {
return "true";
}
@ApiOperation(value="修改菜单", notes="修改菜单")
@ApiOperation(value = "修改菜单", notes = "修改菜单")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "Integer", paramType = "path"),
@ApiImplicitParam(name = "parentIds", value = "所有父级编号", required = false, dataType = "varchar"),
@ApiImplicitParam(name = "name", value = "名称", required = false, dataType = "varchar"),
......@@ -82,7 +95,7 @@ public class SysMenuController extends ResponseController {
@ApiImplicitParam(name = "modelId", value = "model ID in sys_model", required = false, dataType = "varchar"),
@ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
@PostMapping("adminLog/menuUpdate")
public Result menuUpdate(@Valid SysMenu menu, BindingResult br){
public Result menuUpdate(@Valid SysMenu menu, BindingResult br) {
PersistModel persistModel = sysMenuServiceImpl.mergeMenu(menu);
return Result.builder(persistModel,
MessageConstant.MESSAGE_ALERT_SUCCESS,
......@@ -90,10 +103,10 @@ public class SysMenuController extends ResponseController {
menu);
}
@ApiOperation(value="删除菜单", notes="根据id删除菜单")
@ApiOperation(value = "删除菜单", notes = "根据id删除菜单")
@ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "varchar", paramType = "path")
@PostMapping("adminLog/menuDelete/{id}")
public Result menuDelete(@PathVariable("id") String id){
public Result menuDelete(@PathVariable("id") String id) {
PersistModel persistModel = sysMenuServiceImpl.removeMenu(id);
return Result.builder(persistModel,
......@@ -103,9 +116,9 @@ public class SysMenuController extends ResponseController {
}
@ApiOperation(value="列出菜单", notes="列出菜单")
@ApiOperation(value = "列出菜单", notes = "列出菜单")
@GetMapping("/queryMenus")
public Result queryMenus(){
public Result queryMenus() {
List<SysMenu> menus = sysMenuServiceImpl.queryMenus();
return Result.builder(new PersistModel(1),
MessageConstant.MESSAGE_ALERT_SUCCESS,
......
src/main/java/org/rcisoft/sys/menu/dao/SysMenuRepository.java
View file @ 4d06918d
......@@ -31,7 +31,7 @@ public interface SysMenuRepository extends BaseMapper<SysMenu> {
" FROM " +
" s_menu m " +
" LEFT JOIN s_role_MENU rm ON m.BUSINESS_ID = rm.MENU_ID "+
" LEFT JOIN s_dept_role dr ON rm.ROLE_ID = dr.ROLE_ID "+
" LEFT JOIN s_dept_role dr ON rm.ROLE_ID = dr.ROLE_ID "+
" LEFT JOIN s_dept_role_user dru ON dr.BUSINESS_ID = dru.DEPT_ROLE_ID " +
" where m.DEL_FLAG = '0' and m.FLAG = '1' and dru.USER_ID = #{id} order by CASE_COUNT asc,SORT asc</script>")
@ResultMap(value = "BaseResultMap")
......@@ -39,25 +39,26 @@ public interface SysMenuRepository extends BaseMapper<SysMenu> {
//s_dept_role_user,,s_dept_role,,s_role_menu
/**
* 查询用户 menu
* 查询用户 menu 19-09-30
* @param corpId
* @param businessId
* @param modelId
* @return
*/
@Select("SELECT ur.user_id, rm.MENU_ID menu_id, sm.`NAME` menu_name, sm.PARENT_ID, sm.HREF href " +
@Select("SELECT DISTINCT ur.user_id, rm.MENU_ID menu_id, sm.`NAME` menu_name, sm.PARENT_ID, sm.HREF href " +
"FROM s_user su " +
"LEFT JOIN s_r_user_role ur ON ur.user_id = su.business_id" +
"LEFT JOIN s_role_menu rm ON ur.role_id = rm.role_id" +
"LEFT JOIN s_menu sm ON sm.business_id = rm.MENU_ID " +
"WHERE" +
"LEFT JOIN s_r_user_role ur ON ur.user_id = su.business_id " +
"LEFT JOIN s_role_menu rm ON ur.role_id = rm.role_id " +
"LEFT JOIN s_menu sm ON sm.business_id = rm.MENU_ID " +
"WHERE " +
"su.del_flag != 1 " +
"AND su.flag = 1 " +
"AND su.corp_id = #{corpId} " +
"AND su.business_id = #{businessId} " +
"AND sm.MODEL_ID = #{modelId}")
"AND sm.MODEL_ID = #{modelId} " +
"ORDER BY sm.SORT ")
@ResultMap(value = "ChildResultMap")
List<QueryMenuResDTO> queryMenus(@Param("corpId") String corpId,@Param("businessId") String businessId,@Param("corpId") String modelId );
List<QueryMenuResDTO> queryMenus(@Param("corpId") String corpId,@Param("businessId") String businessId,@Param("modelId") String modelId );
/**
......
src/main/java/org/rcisoft/sys/menu/service/SysMenuService.java
View file @ 4d06918d
......@@ -5,6 +5,7 @@ package org.rcisoft.sys.menu.service;
import org.rcisoft.common.model.CommonMenuModel;
import org.rcisoft.common.model.TreeViewModel;
import org.rcisoft.core.model.PersistModel;
import org.rcisoft.sys.menu.dto.QueryMenuResDTO;
import org.rcisoft.sys.menu.entity.SysMenu;
import java.util.List;
......@@ -59,4 +60,6 @@ public interface SysMenuService {
* @return
*/
List<SysMenu> queryMenus();
List<QueryMenuResDTO> queryMenusById(String corpId,String id,String modelId);
}
src/main/java/org/rcisoft/sys/menu/service/impl/SysMenuServiceImpl.java
View file @ 4d06918d
......@@ -11,6 +11,7 @@ import org.rcisoft.common.model.TreeViewModel;
import org.rcisoft.core.model.PersistModel;
import org.rcisoft.core.util.UserUtil;
import org.rcisoft.sys.menu.dao.SysMenuRepository;
import org.rcisoft.sys.menu.dto.QueryMenuResDTO;
import org.rcisoft.sys.menu.entity.SysMenu;
import org.rcisoft.sys.menu.service.SysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -127,6 +128,11 @@ public class SysMenuServiceImpl implements SysMenuService {
return menuRepository.selectAll();
}
@Override
public List<QueryMenuResDTO> queryMenusById(String corpId,String id,String modelId) {
return menuRepository.queryMenus(corpId,id,modelId);
}
/**
* 设置选中 active
* @param model
......
Markdown is supported
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