diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java index 8f4a61e1c5..80f82dff81 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java @@ -12,8 +12,10 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.OperMenuDTO; +import com.epmet.dto.result.MenuResourceDTO; import com.epmet.excel.OperMenuExcel; import com.epmet.service.OperMenuService; +import com.epmet.service.OperResourceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -36,6 +38,9 @@ public class OperMenuController { @Autowired private OperMenuService operMenuService; + @Autowired + private OperResourceService operResourceService; + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = operMenuService.page(params); @@ -45,6 +50,10 @@ public class OperMenuController { @GetMapping("{id}") public Result get(@PathVariable("id") String id){ OperMenuDTO data = operMenuService.get(id); + + //菜单资源列表 + List resourceList = operResourceService.getMenuResourceList(id); + return new Result().ok(data); } diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperResourceService.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperResourceService.java index 815250f1d4..560e097c0b 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperResourceService.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperResourceService.java @@ -101,4 +101,10 @@ public interface OperResourceService extends BaseService { * @param resourceList 资源列表 */ void saveMenuResource(String menuId, String menuName, List resourceList); + + /** + * 获取菜单资源列表 + * @param menuId 菜单ID + */ + List getMenuResourceList(String menuId); } \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java index de2b612c8f..da2786ecaf 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java @@ -98,7 +98,8 @@ public class OperMenuServiceImpl extends BaseServiceImpl getMenuResourceList(String menuId) { + List entityList = baseDao.getMenuResourceList(menuId+""); + + return ConvertUtils.sourceToTarget(entityList, MenuResourceDTO.class); + } + } \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperResourceDao.xml b/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperResourceDao.xml index 3cf44a3346..94c839c252 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperResourceDao.xml +++ b/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperResourceDao.xml @@ -8,7 +8,7 @@