diff --git a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin index 3502ce3..019c0d3 100644 Binary files a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin and b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin differ diff --git a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock index 35bd4ad..04d340b 100644 Binary files a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock and b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock differ diff --git a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin index 6c7f925..424f3d6 100644 Binary files a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin and b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin differ diff --git a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock index 27affbb..20a71b5 100644 Binary files a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock and b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock differ diff --git a/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin b/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin index 2f4b6ee..aa259c6 100644 Binary files a/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin and b/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin differ diff --git a/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 021ba3d..64c3ba0 100644 Binary files a/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/main_vm/.gradle/file-system.probe b/main_vm/.gradle/file-system.probe index 3b966cb..cc85090 100644 Binary files a/main_vm/.gradle/file-system.probe and b/main_vm/.gradle/file-system.probe differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/controller/LoginController.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/controller/LoginController.class index 31fc5c5..155f71c 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/controller/LoginController.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/controller/LoginController.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemCommoncodeController.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemCommoncodeController.class index 3c785d0..a5e7dd2 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemCommoncodeController.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemCommoncodeController.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.class index 66f8174..8733c3e 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemGroupAuthController.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemGroupAuthController.class index 78a1a93..21c924f 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemGroupAuthController.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemGroupAuthController.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemPolicyMenuController.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemPolicyMenuController.class index 7e94d55..95e3408 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemPolicyMenuController.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemPolicyMenuController.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemServiceGroupController.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemServiceGroupController.class index f904f87..77e94f7 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemServiceGroupController.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemServiceGroupController.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemUserAdminController.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemUserAdminController.class index 2a85b20..2bc9a6d 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemUserAdminController.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemUserAdminController.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemUserController.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemUserController.class index 68943cd..13161bb 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemUserController.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemUserController.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/common/code/enumresource/MenuResource.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/common/code/enumresource/MenuResource.class index d6b0559..bdc96d8 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/common/code/enumresource/MenuResource.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/common/code/enumresource/MenuResource.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/common/filter/LoginFilter.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/common/filter/LoginFilter.class index ac5f524..1db6fdb 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/common/filter/LoginFilter.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/common/filter/LoginFilter.class differ diff --git a/main_vm/build/tmp/compileJava/previous-compilation-data.bin b/main_vm/build/tmp/compileJava/previous-compilation-data.bin index 25e88a9..791fd14 100644 Binary files a/main_vm/build/tmp/compileJava/previous-compilation-data.bin and b/main_vm/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java index 8c320fb..f6ba277 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java @@ -39,18 +39,7 @@ public class LoginController { private final FileService fileService; private final HttpServletRequest httpServletRequest; - @GetMapping(value = {"/adm/main/egovLoginUsr.do", "/"}) - public ModelAndView loginUsrView() { -// loginService.Logout(); - log.info("loginpage"); - return new ModelAndView("layout/signin"); - } - - @GetMapping(value = "/adm/main/changePwd") - public String changePwd() { - return "adm/signin/changePwd"; - } @PostMapping(value = "/adm/main/pwd/update") public ResponseEntity PwdUpdate(@RequestBody PwdUpdateReq dto) throws CustomNotFoundException, CustomBadRequestException { diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemCommoncodeController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemCommoncodeController.java index 65775b4..ebf6a67 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemCommoncodeController.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemCommoncodeController.java @@ -24,10 +24,7 @@ public class SystemCommoncodeController { private final SystemCommoncodeService systemOprmngcodeService; - @GetMapping("/oprmngcode/manage.do") - public String OprmngcodeView() { - return "/adm/common/system/commoncode"; - } + @PostMapping("/oprmngcode/list") @ResponseBody diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.java index 333f765..8b5cdb3 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.java @@ -22,16 +22,6 @@ public class SystemCustController { private final SystemCustService custService; - /** - * @Name 고객사관리 JSP 페이지 랜더링 - * @Description 고객사관리 JSP 랜더링하는 컨트롤러 - * @Author JangWonSeok - * @CreateDate 2023. 03. 09. - */ - @GetMapping("/cust/manage.do") - public String CustListView() { - return "/adm/common/system/cust"; - } /** * @Name 고객사 리스트를 조회하는 API @@ -47,16 +37,7 @@ public class SystemCustController { return new DslDataTableRes(result); } - /** - * @Name 고객사정보를 업데이트하는 API - * @Description 고객사정보를 업데이트하는 API - * @Author JangWonSeok - * @CreateDate 2023. 03. 09. - */ - @GetMapping("/cust/update") - public String custUpdate(@RequestParam(name = "custCode", required = true) String custCode) { - return "/adm/common/system/custUpdate"; - } + /** * @Name 고객사 조회 @@ -71,17 +52,7 @@ public class SystemCustController { return custService.custSelect(custCode); } - /** - * @Name 고객사 생성 - * @Description 고객사를 생성하는 페이지 랜더링 - * @Author JangWonSeok - * @CreateDate 2023. 03. 09. - */ - @GetMapping("/cust/insert") - public String CustInsert() { - log.info("CustInsert Controller"); - return "/adm/common/system/custInsert"; - } + /** * @Name 고객사 생성시 줄수있는 권한그룹의 리스트 diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemGroupAuthController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemGroupAuthController.java index e0457e8..d0ff33c 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemGroupAuthController.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemGroupAuthController.java @@ -26,18 +26,6 @@ public class SystemGroupAuthController { private final SystemGroupAuthService groupAuthService; - /** - * @Name 권한그룹의 페이지랜딩 컨트롤러 - * @Description 권한그룹의 페이지를 랜딩함 - * @Author JangWonSeok - * @CreateDate 2023. 03. 09. - */ - @GetMapping("/groupAuth/manage.do") - public String GroupAuthView() { - log.info("group Auth View controller"); - return "/adm/common/system/groupAuth"; - } - /** * @Name 리스트페이지의 API * @Description 권한그룹 리스트의 API @@ -52,17 +40,6 @@ public class SystemGroupAuthController { return new DslDataTableRes(result); } - /** - * @Name 권한그룹의 상세내역 조회페이지 랜더링 - * @Description 권한그룹 상세보기 JSP를 랜더링함. - * @Author JangWonSeok - * @CreateDate 2023. 03. 09. - */ - @GetMapping("/groupAuth/view") - public String GroupAuthView(@RequestParam(name = "custCode", required = true) String custCode) { - log.info("view Controller - {}", custCode); - return "/adm/common/system/groupAuthView"; - } /** * @Name 권한그룹 권한데이터 @@ -88,17 +65,6 @@ public class SystemGroupAuthController { groupAuthService.GroupAuthUpdateInsert(dto); } - /** - * @Name 권한그룹을 업데이트페이지 랜더링 - * @Description 권한그룹 업데이트 JSP페이지 랜더링 - * @Author JangWonSeok - * @CreateDate 2023. 03. 09. - */ - @GetMapping("/groupAuth/update") - public String GroupAuthUpdate() { - log.info("GroupAuthUpdate Controller"); - return "/adm/common/system/groupAuthUpdate"; - } /** * @Name 권한그룹을 업데이트페이지의 데이터조회 diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemPolicyMenuController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemPolicyMenuController.java index 473274a..1d7fa5e 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemPolicyMenuController.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemPolicyMenuController.java @@ -19,14 +19,7 @@ import java.util.List; public class SystemPolicyMenuController { private final SystemPolicyMenuService systemPolicyMenuService; - /** - * 삭제한 메뉴입니다 - */ - @GetMapping("/policyMenu/manage.do") - public String PolicyMenuView(){ - return "/adm/common/system/policyMenu"; - } @PostMapping("/policyMenu/list") @ResponseBody diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemServiceGroupController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemServiceGroupController.java index f1cad13..eaa406c 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemServiceGroupController.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemServiceGroupController.java @@ -21,24 +21,8 @@ import java.util.List; @RequestMapping("/admin/common/system") public class SystemServiceGroupController { - private final LoginService loginService; - private final SystemServiceGroupService systemServiceGroupService; - /** - * @Name 서비스그룹 랜딩페이지 - * @Description 시스템운영자는 고객사리스트 -> 상위서비스리스트, 유저어드민은, 현재 사용중인 메인 서비스의 상세페이지 랜더링 - * @Author JangWonSeok - * @CreateDate 2023. 03. 09. - */ - @GetMapping("/serviceGroup/manage.do") - public String ServiceGroupView() { - UserVo uv = loginService.getUserVo(); - if (uv.getRoleVal().equals(RoleResource.SYSTEMADMIN.getName())) { - return "/adm/common/system/serviceGroupList"; - } else { - return "/adm/common/system/serviceGroupView"; - } - } + private final SystemServiceGroupService systemServiceGroupService; /** * @Name 서비스그룹 리스트 @@ -53,16 +37,6 @@ public class SystemServiceGroupController { return new DslDataTableRes(result); } - /** - * @Name 서비스그룹 리스트 - * @Description 시스템운영자는 고객사리스트 -> 상위서비스리스트 데이터 조회 - * @Author JangWonSeok - * @CreateDate 2023. 03. 09. - */ - @GetMapping("/serviceGroup/view") - public String ServiceGroupView(@RequestParam(name = "serviceGroup", required = false) String serviceGroup) { - return "/adm/common/system/serviceGroupView"; - } /** * @Name 시나리오그룹 추가 버튼 API diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemUserAdminController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemUserAdminController.java index c7b6fb7..b5e6770 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemUserAdminController.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemUserAdminController.java @@ -22,16 +22,7 @@ public class SystemUserAdminController { private final SystemUserAdminService systemUserAdminService; - /** - * @Name 어드민 시스템관리 운영자 관리 - * @Description 사용자 관리와 코멘트 같음. - * @Author JangWonSeok - * @CreateDate 2023. 03. 09. - */ - @GetMapping("/userAdmin/manage.do") - public String UserAdminView() { - return "/adm/common/system/userAdmin"; - } + @PostMapping("/userAdmin/list") @ResponseBody diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemUserController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemUserController.java index 50cad82..89371d1 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemUserController.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemUserController.java @@ -22,16 +22,6 @@ public class SystemUserController { private final SystemUserService systemUserService; - /** - * @Name 유저리스트페이지 - * @Description 어드민 시스템관리 유저관리 JSP랜딩페이지 - * @Author JangWonSeok - * @CreateDate 2023. 03. 09. - */ - @GetMapping("/user/manage.do") - public String UserView() { - return "/adm/common/system/user"; - } /** * @Name 유저리스트페이지 리스트 Data SEARCH API diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/AddrViewController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/AddrViewController.java new file mode 100644 index 0000000..d02a8c7 --- /dev/null +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/AddrViewController.java @@ -0,0 +1,4 @@ +package com.icomsys.main_vm.biz.common.view; + +public class AddrViewController { +} diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/BotcomViewController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/BotcomViewController.java new file mode 100644 index 0000000..bad21a7 --- /dev/null +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/BotcomViewController.java @@ -0,0 +1,4 @@ +package com.icomsys.main_vm.biz.common.view; + +public class BotcomViewController { +} diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/BotmoniViewController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/BotmoniViewController.java new file mode 100644 index 0000000..63246ec --- /dev/null +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/BotmoniViewController.java @@ -0,0 +1,4 @@ +package com.icomsys.main_vm.biz.common.view; + +public class BotmoniViewController { +} diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/GudViewController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/GudViewController.java new file mode 100644 index 0000000..1dcd357 --- /dev/null +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/GudViewController.java @@ -0,0 +1,4 @@ +package com.icomsys.main_vm.biz.common.view; + +public class GudViewController { +} diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/RcpViewController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/RcpViewController.java new file mode 100644 index 0000000..a2d7428 --- /dev/null +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/RcpViewController.java @@ -0,0 +1,4 @@ +package com.icomsys.main_vm.biz.common.view; + +public class RcpViewController { +} diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/Rcpv1ViewController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/Rcpv1ViewController.java new file mode 100644 index 0000000..8bb55b0 --- /dev/null +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/Rcpv1ViewController.java @@ -0,0 +1,4 @@ +package com.icomsys.main_vm.biz.common.view; + +public class Rcpv1ViewController { +} diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/SystemViewController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/SystemViewController.java new file mode 100644 index 0000000..b072b1a --- /dev/null +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/SystemViewController.java @@ -0,0 +1,168 @@ +package com.icomsys.main_vm.biz.common.view; + +import com.icomsys.main_vm.biz.common.login.res.UserVo; +import com.icomsys.main_vm.biz.common.login.service.LoginService; +import com.icomsys.main_vm.common.code.enumresource.RoleResource; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.ModelAndView; + +@Controller +@Slf4j +@RequiredArgsConstructor +public class SystemViewController { + + private final LoginService loginService; + + @GetMapping(value = {"/view/signin", "/"}) + public ModelAndView loginUsrView() { + return new ModelAndView("layout/signin"); + } + + @GetMapping(value = "/view/changePwd") + public String changePwd() { + return "layout/changePwd"; + } + + @GetMapping("/view/admin/common/system/oprmngcode/manage.do") + public String OprmngcodeView() { + return "layout/adm/common/system/commoncode"; + } + + /** + * @Name 고객사관리 JSP 페이지 랜더링 + * @Description 고객사관리 JSP 랜더링하는 컨트롤러 + * @Author JangWonSeok + * @CreateDate 2023. 03. 09. + */ + @GetMapping("/view/admin/common/system/cust/manage.do") + public String CustListView() { + return "layout/adm/common/system/cust"; + } + + + /** + * @Name 고객사정보를 업데이트하는 API + * @Description 고객사정보를 업데이트하는 API + * @Author JangWonSeok + * @CreateDate 2023. 03. 09. + */ + @GetMapping("/view/admin/common/system/cust/update") + public String custUpdate(@RequestParam(name = "custCode", required = true) String custCode) { + return "layout/adm/common/system/custUpdate"; + } + + /** + * @Name 고객사 생성 + * @Description 고객사를 생성하는 페이지 랜더링 + * @Author JangWonSeok + * @CreateDate 2023. 03. 09. + */ + @GetMapping("/view/admin/common/system/cust/insert") + public String CustInsert() { + log.info("CustInsert Controller"); + return "layout/adm/common/system/custInsert"; + } + + /** + * @Name 권한그룹의 페이지랜딩 컨트롤러 + * @Description 권한그룹의 페이지를 랜딩함 + * @Author JangWonSeok + * @CreateDate 2023. 03. 09. + */ + @GetMapping("/view/admin/common/system/groupAuth/manage.do") + public String GroupAuthView() { + log.info("group Auth View controller"); + return "layout/adm/common/system/groupAuth"; + } + + /** + * @Name 권한그룹의 상세내역 조회페이지 랜더링 + * @Description 권한그룹 상세보기 JSP를 랜더링함. + * @Author JangWonSeok + * @CreateDate 2023. 03. 09. + */ + @GetMapping("/view/admin/common/system/groupAuth/view") + public String GroupAuthView(@RequestParam(name = "custCode", required = true) String custCode) { + log.info("view Controller - {}", custCode); + return "layout/adm/common/system/groupAuthView"; + } + + + /** + * @Name 권한그룹을 업데이트페이지 랜더링 + * @Description 권한그룹 업데이트 JSP페이지 랜더링 + * @Author JangWonSeok + * @CreateDate 2023. 03. 09. + */ + @GetMapping("/view/admin/common/system/groupAuth/update") + public String GroupAuthUpdate() { + log.info("GroupAuthUpdate Controller"); + return "layout/adm/common/system/groupAuthUpdate"; + } + + /** + * 삭제한 메뉴입니다 + */ + + @GetMapping("/view/admin/common/system/policyMenu/manage.do") + public String PolicyMenuView(){ + return "layout/adm/common/system/policyMenu"; + } + + + /** + * @Name 서비스그룹 랜딩페이지 + * @Description 시스템운영자는 고객사리스트 -> 상위서비스리스트, 유저어드민은, 현재 사용중인 메인 서비스의 상세페이지 랜더링 + * @Author JangWonSeok + * @CreateDate 2023. 03. 09. + */ + @GetMapping("/view/admin/common/system/serviceGroup/manage.do") + public String ServiceGroupView() { + UserVo uv = loginService.getUserVo(); + if (uv.getRoleVal().equals(RoleResource.SYSTEMADMIN.getName())) { + return "layout/adm/common/system/serviceGroupList"; + } else { + return "layout/adm/common/system/serviceGroupView"; + } + } + + /** + * @Name 서비스그룹 리스트 + * @Description 시스템운영자는 고객사리스트 -> 상위서비스리스트 데이터 조회 + * @Author JangWonSeok + * @CreateDate 2023. 03. 09. + */ + @GetMapping("/view/admin/common/system/serviceGroup/view") + public String ServiceGroupView(@RequestParam(name = "serviceGroup", required = false) String serviceGroup) { + return "layout/adm/common/system/serviceGroupView"; + } + + /** + * @Name 어드민 시스템관리 운영자 관리 + * @Description 사용자 관리와 코멘트 같음. + * @Author JangWonSeok + * @CreateDate 2023. 03. 09. + */ + @GetMapping("/view/admin/common/system/userAdmin/manage.do") + public String UserAdminView() { + return "layout/adm/common/system/userAdmin"; + } + + + /** + * @Name 유저리스트페이지 + * @Description 어드민 시스템관리 유저관리 JSP랜딩페이지 + * @Author JangWonSeok + * @CreateDate 2023. 03. 09. + */ + @GetMapping("/view/admin/common/system/user/manage.do") + public String UserView() { + return "layout/adm/common/system/user"; + } + + +} diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/VdoViewController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/VdoViewController.java new file mode 100644 index 0000000..77e5b98 --- /dev/null +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/view/VdoViewController.java @@ -0,0 +1,4 @@ +package com.icomsys.main_vm.biz.common.view; + +public class VdoViewController { +} diff --git a/main_vm/src/main/java/com/icomsys/main_vm/common/code/enumresource/MenuResource.java b/main_vm/src/main/java/com/icomsys/main_vm/common/code/enumresource/MenuResource.java index 114aca3..0172fde 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/common/code/enumresource/MenuResource.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/common/code/enumresource/MenuResource.java @@ -111,13 +111,13 @@ public enum MenuResource { commonsystem("common", 9000000L, 1L, 2, "시스템관리", "시스템관리", "0"), - commonsystempolicyMenumanage("common", 9000001L, 9000000L, 3, "정책별 메뉴 조회", "정책별 메뉴 조회", "/admin/common/system/policyMenu/manage.do"), - commonsystemcustmanage("common", 9000002L, 9000000L, 3, "고객사 관리", "고객사 관리", "/admin/common/system/cust/manage.do"), - commonsystemserviceGroupmanage("common", 9000003L, 9000000L, 3, "서비스그룹 관리", "서비스그룹 관리", "/admin/common/system/serviceGroup/manage.do"), - commonsystemgroupAuthmanage("common", 9000004L, 9000000L, 3, "그룹별 권한관리", "그룹별 권한관리", "/admin/common/system/groupAuth/manage.do"), - commonsystemuserAdminmanage("common", 9000005L, 9000000L, 3, "운영자 관리(사용안함)", "운영자 관리", "/admin/common/system/userAdmin/manage.do"), - commonsystemusermanage("common", 9000006L, 9000000L, 3, "사용자 관리", "사용자 관리", "/admin/common/system/user/manage.do"), - commonsystemoprmngcodemanage("common", 9000007L, 9000000L, 3, "공통코드 관리", "공통코드 관리", "/admin/common/system/oprmngcode/manage.do"); + commonsystempolicyMenumanage("common", 9000001L, 9000000L, 3, "정책별 메뉴 조회", "정책별 메뉴 조회", "/view/admin/common/system/policyMenu/manage.do"), + commonsystemcustmanage("common", 9000002L, 9000000L, 3, "고객사 관리", "고객사 관리", "/view/admin/common/system/cust/manage.do"), + commonsystemserviceGroupmanage("common", 9000003L, 9000000L, 3, "서비스그룹 관리", "서비스그룹 관리", "/view/admin/common/system/serviceGroup/manage.do"), + commonsystemgroupAuthmanage("common", 9000004L, 9000000L, 3, "그룹별 권한관리", "그룹별 권한관리", "/view/admin/common/system/groupAuth/manage.do"), + commonsystemuserAdminmanage("common", 9000005L, 9000000L, 3, "운영자 관리(사용안함)", "운영자 관리", "/view/admin/common/system/userAdmin/manage.do"), + commonsystemusermanage("common", 9000006L, 9000000L, 3, "사용자 관리", "사용자 관리", "/view/admin/common/system/user/manage.do"), + commonsystemoprmngcodemanage("common", 9000007L, 9000000L, 3, "공통코드 관리", "공통코드 관리", "/view/admin/common/system/oprmngcode/manage.do"); private String solVal; diff --git a/main_vm/src/main/java/com/icomsys/main_vm/common/filter/LoginFilter.java b/main_vm/src/main/java/com/icomsys/main_vm/common/filter/LoginFilter.java index 1eaede4..d77feb0 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/common/filter/LoginFilter.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/common/filter/LoginFilter.java @@ -54,6 +54,7 @@ public class LoginFilter extends OncePerRequestFilter { || reqUrl.startsWith("/createEnv") || reqUrl.startsWith("/error") || reqUrl.startsWith("/files") + || reqUrl.startsWith("/view") || reqUrl.equals("/") ) { log.info("static file check"); diff --git a/main_vm/src/main/resources/templates/layout/adm/common/system/commoncode.html b/main_vm/src/main/resources/templates/layout/adm/common/system/commoncode.html index eac0dd6..c1bc454 100644 --- a/main_vm/src/main/resources/templates/layout/adm/common/system/commoncode.html +++ b/main_vm/src/main/resources/templates/layout/adm/common/system/commoncode.html @@ -1,5 +1,8 @@ - - + + + 시나리오코드 @@ -644,7 +647,6 @@ -<%--