diff --git a/backend/src/main/java/com/zioinfo/cms/uiws/system/controller/MenuController.java b/backend/src/main/java/com/zioinfo/cms/uiws/system/controller/MenuController.java index 9bc3027..084bfa1 100644 --- a/backend/src/main/java/com/zioinfo/cms/uiws/system/controller/MenuController.java +++ b/backend/src/main/java/com/zioinfo/cms/uiws/system/controller/MenuController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** 2.9 메뉴(menus) — 트리목록/검색/CRUD/다중삭제. base: /api/system/menus */ -@RestController +@RestController("uiwsSystemMenuController") @RequestMapping("/api/system/menus") @RequiredArgsConstructor public class MenuController { diff --git a/backend/src/main/java/com/zioinfo/cms/uiws/system/mapper/MenuMapper.java b/backend/src/main/java/com/zioinfo/cms/uiws/system/mapper/UiwsSystemMenuMapper.java similarity index 95% rename from backend/src/main/java/com/zioinfo/cms/uiws/system/mapper/MenuMapper.java rename to backend/src/main/java/com/zioinfo/cms/uiws/system/mapper/UiwsSystemMenuMapper.java index 4c62ed1..622e15c 100644 --- a/backend/src/main/java/com/zioinfo/cms/uiws/system/mapper/MenuMapper.java +++ b/backend/src/main/java/com/zioinfo/cms/uiws/system/mapper/UiwsSystemMenuMapper.java @@ -7,7 +7,7 @@ import java.util.List; /** 메뉴(tb_uiws_menu) 매퍼. 원본 SysMenuRepository 변환. */ @Mapper -public interface MenuMapper { +public interface UiwsSystemMenuMapper { List searchAll(@Param("offset") int offset, @Param("size") int size); long countAll(); List search(@Param("keyword") String keyword); diff --git a/backend/src/main/java/com/zioinfo/cms/uiws/system/service/MenuService.java b/backend/src/main/java/com/zioinfo/cms/uiws/system/service/MenuService.java index 5b5e880..6d8f2ba 100644 --- a/backend/src/main/java/com/zioinfo/cms/uiws/system/service/MenuService.java +++ b/backend/src/main/java/com/zioinfo/cms/uiws/system/service/MenuService.java @@ -5,7 +5,7 @@ import com.zioinfo.cms.uiws.common.UiwsErrorCode; import com.zioinfo.cms.uiws.system.dto.MenuDto; import com.zioinfo.cms.uiws.system.dto.MenuSaveDto; import com.zioinfo.cms.uiws.system.dto.PageResponse; -import com.zioinfo.cms.uiws.system.mapper.MenuMapper; +import com.zioinfo.cms.uiws.system.mapper.UiwsSystemMenuMapper; import com.zioinfo.cms.uiws.system.mapper.RoleMenuMapper; import com.zioinfo.cms.uiws.system.model.SysMenu; import lombok.RequiredArgsConstructor; @@ -15,11 +15,11 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; /** 2.9 메뉴(menus) CRUD + 검색팝업 + 다중삭제. 프론트가 parentMenuId 로 트리 구성. */ -@Service +@Service("uiwsSystemMenuService") @RequiredArgsConstructor public class MenuService { - private final MenuMapper menuMapper; + private final UiwsSystemMenuMapper menuMapper; private final RoleMenuMapper roleMenuMapper; @Transactional(readOnly = true) diff --git a/backend/src/main/java/com/zioinfo/cms/uiws/system/service/ProgramService.java b/backend/src/main/java/com/zioinfo/cms/uiws/system/service/ProgramService.java index dbcc80f..ce48c60 100644 --- a/backend/src/main/java/com/zioinfo/cms/uiws/system/service/ProgramService.java +++ b/backend/src/main/java/com/zioinfo/cms/uiws/system/service/ProgramService.java @@ -5,7 +5,7 @@ import com.zioinfo.cms.uiws.common.UiwsErrorCode; import com.zioinfo.cms.uiws.system.dto.PageResponse; import com.zioinfo.cms.uiws.system.dto.ProgramDto; import com.zioinfo.cms.uiws.system.dto.ProgramSaveDto; -import com.zioinfo.cms.uiws.system.mapper.MenuMapper; +import com.zioinfo.cms.uiws.system.mapper.UiwsSystemMenuMapper; import com.zioinfo.cms.uiws.system.mapper.ProgramMapper; import com.zioinfo.cms.uiws.system.model.SysProgram; import lombok.RequiredArgsConstructor; @@ -20,7 +20,7 @@ import java.util.List; public class ProgramService { private final ProgramMapper programMapper; - private final MenuMapper menuMapper; + private final UiwsSystemMenuMapper menuMapper; @Transactional(readOnly = true) public PageResponse list(String keyword, String programType, int page, int size) { diff --git a/backend/src/main/java/com/zioinfo/cms/uiws/system/service/RoleMenuService.java b/backend/src/main/java/com/zioinfo/cms/uiws/system/service/RoleMenuService.java index 84f3e74..8a9d701 100644 --- a/backend/src/main/java/com/zioinfo/cms/uiws/system/service/RoleMenuService.java +++ b/backend/src/main/java/com/zioinfo/cms/uiws/system/service/RoleMenuService.java @@ -5,7 +5,7 @@ import com.zioinfo.cms.uiws.common.UiwsErrorCode; import com.zioinfo.cms.uiws.system.dto.PageResponse; import com.zioinfo.cms.uiws.system.dto.RoleDto; import com.zioinfo.cms.uiws.system.dto.RoleMenuDto; -import com.zioinfo.cms.uiws.system.mapper.MenuMapper; +import com.zioinfo.cms.uiws.system.mapper.UiwsSystemMenuMapper; import com.zioinfo.cms.uiws.system.mapper.RoleMapper; import com.zioinfo.cms.uiws.system.mapper.RoleMenuMapper; import com.zioinfo.cms.uiws.system.model.SysMenu; @@ -29,7 +29,7 @@ public class RoleMenuService { private final RoleMapper roleMapper; private final RoleMenuMapper roleMenuMapper; - private final MenuMapper menuMapper; + private final UiwsSystemMenuMapper menuMapper; @Transactional(readOnly = true) public PageResponse listRoles(int page, int size) {