From e0c1a4da943dcd7f9a00510abd10a8b46dbb93c7 Mon Sep 17 00:00:00 2001 From: minuk926 Date: Thu, 10 Nov 2022 12:21:38 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=EA=B6=8C=ED=95=9C=EA=B4=80?= =?UTF-8?q?=EB=A6=AC-=EA=B6=8C=ED=95=9C=EA=B3=84=EC=B8=B5=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mng/auth/model/XitAuthHierarchyMngVO.java | 82 ++------------ .../auth/service/AuthHierarchyMgtService.java | 2 +- .../impl/AuthHierarchyMgtServiceImpl.java | 38 ++++--- .../auth/web/AuthHierarchyMgtController.java | 75 +++++++++---- .../mng/auth/auth-author-mysql-mapper.xml | 4 +- .../biz/mng/auth/mngAuthHierarchyMgtForm.jsp | 8 +- .../biz/mng/auth/mngAuthHierarchyMgtPopup.jsp | 105 +++++++++--------- 7 files changed, 144 insertions(+), 170 deletions(-) diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/model/XitAuthHierarchyMngVO.java b/src/main/java/kr/xit/framework/biz/mng/auth/model/XitAuthHierarchyMngVO.java index 5ae619be..08c63a60 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/model/XitAuthHierarchyMngVO.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/model/XitAuthHierarchyMngVO.java @@ -1,6 +1,12 @@ package kr.xit.framework.biz.mng.auth.model; import kr.xit.framework.core.model.BaseVO; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; /** * @@ -12,6 +18,12 @@ import kr.xit.framework.core.model.BaseVO; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +@ToString public class XitAuthHierarchyMngVO extends BaseVO { /** @@ -42,74 +54,4 @@ public class XitAuthHierarchyMngVO extends BaseVO { * 권한구조 코드명 */ private String authorRescueCodeNm; - - /** - * authorCode attribute 를 리턴한다. - * @return String - */ - public String getAuthorCode() { - return authorCode; - } - /** - * authorCode attribute 값을 설정한다. - * @param authorCode String - */ - public void setAuthorCode(String authorCode) { - this.authorCode = authorCode; - } - /** - * authorCreatDe attribute 를 리턴한다. - * @return String - */ - public String getAuthorCreatDe() { - return authorCreatDe; - } - /** - * authorCreatDe attribute 값을 설정한다. - * @param authorCreatDe String - */ - public void setAuthorCreatDe(String authorCreatDe) { - this.authorCreatDe = authorCreatDe; - } - /** - * authorDc attribute 를 리턴한다. - * @return String - */ - public String getAuthorDc() { - return authorDc; - } - /** - * authorDc attribute 값을 설정한다. - * @param authorDc String - */ - public void setAuthorDc(String authorDc) { - this.authorDc = authorDc; - } - /** - * authorNm attribute 를 리턴한다. - * @return String - */ - public String getAuthorNm() { - return authorNm; - } - /** - * authorNm attribute 값을 설정한다. - * @param authorNm String - */ - public void setAuthorNm(String authorNm) { - this.authorNm = authorNm; - } - public String getAuthorRescueCode() { - return authorRescueCode; - } - public void setAuthorRescueCode(String authorRescueCode) { - this.authorRescueCode = authorRescueCode; - } - public String getAuthorRescueCodeNm() { - return authorRescueCodeNm; - } - public void setAuthorRescueCodeNm(String authorRescueCodeNm) { - this.authorRescueCodeNm = authorRescueCodeNm; - } - } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthHierarchyMgtService.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthHierarchyMgtService.java index d5f2f2a1..4607905d 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthHierarchyMgtService.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthHierarchyMgtService.java @@ -50,7 +50,7 @@ public interface AuthHierarchyMgtService { * @author: 박민규 * @date: 2020. 11. 2. */ - public XitAuthHierarchyMngVO findView(XitAuthHierarchyMngVO vo); + public XitAuthHierarchyMngVO findAuthHierarchyInfo(XitAuthHierarchyMngVO vo); /** * 
메소드 설명: 권한계층관리 등록
diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthHierarchyMgtServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthHierarchyMgtServiceImpl.java index d6a11229..1df6127e 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthHierarchyMgtServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthHierarchyMgtServiceImpl.java @@ -50,6 +50,27 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { return voList; } + @Override + public XitAuthHierarchyMngVO findAuthHierarchyInfo(XitAuthHierarchyMngVO vo) { + XitAuthHierarchyMngVO result = new XitAuthHierarchyMngVO(); + + List listRoleSclsrtRescueVO = authAuthorMgtMapper.selectRoleSclsrtRescues(new XitRoleSclsrtRescueVO()); + if(XitCmmnUtil.isEmpty(listRoleSclsrtRescueVO)) + return result; + + + String topButtonAuthorCode = this.getStrAuthHierarchy(listRoleSclsrtRescueVO.get(0).getChldrnRole()); + topButtonAuthorCode = topButtonAuthorCode.split(">")[0].trim(); + String strAuthorRescueCode = this.getStrAuthHierarchy(topButtonAuthorCode); + result.setAuthorRescueCode(strAuthorRescueCode); + + return result; + } + + + + + @Override public List findList(XitAuthHierarchyMngSearchVO searchVO) { List result = null; @@ -82,23 +103,6 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { return result; } - @Override - public XitAuthHierarchyMngVO findView(XitAuthHierarchyMngVO vo) { - XitAuthHierarchyMngVO result = new XitAuthHierarchyMngVO(); - - List listRoleSclsrtRescueVO = authAuthorMgtMapper.selectRoleSclsrtRescues(new XitRoleSclsrtRescueVO()); - if(XitCmmnUtil.isEmpty(listRoleSclsrtRescueVO)) - return result; - - - String topButtonAuthorCode = this.getStrAuthHierarchy(listRoleSclsrtRescueVO.get(0).getChldrnRole()); - topButtonAuthorCode = topButtonAuthorCode.split(">")[0].trim(); - String strAuthorRescueCode = this.getStrAuthHierarchy(topButtonAuthorCode); - result.setAuthorRescueCode(strAuthorRescueCode); - - return result; - } - @Override public void addProc(XitAuthHierarchyMngVO vo) { this.modifyProc(vo); diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthHierarchyMgtController.java b/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthHierarchyMgtController.java index b911b7b5..f580445a 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthHierarchyMgtController.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthHierarchyMgtController.java @@ -22,6 +22,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @@ -32,7 +33,6 @@ import org.springframework.web.servlet.ModelAndView; import egovframework.rte.fdl.security.securedobject.EgovSecuredObjectService; import egovframework.rte.fdl.security.userdetails.jdbc.EgovJdbcUserDetailsManager; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; -import kr.xit.framework.biz.cmm.model.XitAuthorGroupInfoVO; import kr.xit.framework.biz.cmm.model.XitAuthorInfoVO; import kr.xit.framework.biz.cmm.service.XitFrameCrudService; import kr.xit.framework.biz.mng.auth.model.XitAuthHierarchyMngSearchVO; @@ -93,20 +93,17 @@ public class AuthHierarchyMgtController { public void mngAuthHierarchyMgtForm() { } - - @RequestMapping(value = "/mngAuthHierarchyMgtPopup") public ModelAndView mngAuthHierarchyMgtPopup(XitAuthHierarchyMngVO vo){ ModelAndView mav = new ModelAndView(); //최하위 권한의 권한계층 조회 - XitAuthHierarchyMngVO authHierarchyMngVO = service.findView(vo); + XitAuthHierarchyMngVO authHierarchyMngVO = service.findAuthHierarchyInfo(vo); //권한코드 Map 생성 - List listAuthorInfoVO = authAuthorMgtService.findAuthAuthors(null); + List authorInfoVOList = authAuthorMgtService.findAuthAuthors(null); Map mAuthorInfo = new HashMap(); - for(XitAuthorInfoVO item : listAuthorInfoVO) { - mAuthorInfo.put(item.getAuthorCode(), item.getAuthorNm()); - } + authorInfoVOList.forEach(infoVO -> mAuthorInfo.put(infoVO.getAuthorCode(), infoVO.getAuthorNm())); + //권한코드 목록에서 비중복 권한만 추출 Map mNoDuplAuthorInfo = new HashMap(); mNoDuplAuthorInfo.putAll(mAuthorInfo); @@ -121,27 +118,18 @@ public class AuthHierarchyMgtController { } } //권한계층 미설정 권한 목록 설정 - List listAuthorInfo = new ArrayList(); - Iterator it = mNoDuplAuthorInfo.keySet().iterator(); - while(it.hasNext()) { - String authorCode = it.next(); + List listAuthorInfo = new ArrayList<>(); + for (String authorCode : mNoDuplAuthorInfo.keySet()) { XitAuthorInfoVO authorInfo = new XitAuthorInfoVO(); authorInfo.setAuthorCode(authorCode); authorInfo.setAuthorNm(mNoDuplAuthorInfo.get(authorCode)); listAuthorInfo.add(authorInfo); } - mav.addObject("authorList", listAuthorInfo); mav.addObject("mAuthorInfo", mAuthorInfo); - - if(Checks.isEmpty(vo) || Checks.isEmpty(vo.getAuthorCode())){ - mav.addObject("authHierarchyManage", new XitAuthHierarchyMngVO()); - mav.addObject("pageTitle", "권한 계층 설정"); - } else { - mav.addObject("authHierarchyManage", authHierarchyMngVO); - mav.addObject("pageTitle", "권한 계층 설정"); - } + mav.addObject("authHierarchyManage", authHierarchyMngVO); + mav.addObject("pageTitle", "권한 계층 설정"); mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/mngAuthHierarchyMgtPopup.popup"); return mav; } @@ -151,6 +139,49 @@ public class AuthHierarchyMgtController { return ResultResponse.of(service.findAuthHierarchies(paraMap, MybatisUtils.getPagingInfo(paraMap))); } + @PostMapping(value = "/saveResetAuthHierarchy") + public ModelAndView saveResetAuthHierarchy(@RequestParam Map paraMap){ + ModelAndView mav = new ModelAndView(); + + //최하위 권한의 권한계층 조회 + XitAuthHierarchyMngVO result = authAuthorMgtService.findAuthAuthors(paraMap); + //권한코드 Map 생성 + List listAuthorInfoVO = xitFrameCrudService.findXitAuthorInfos(new XitAuthorInfoVO()); + Map mAuthorInfo = new HashMap(); + for(XitAuthorInfoVO item : listAuthorInfoVO) { + mAuthorInfo.put(item.getAuthorCode(), item.getAuthorNm()); + } + //권한코드 목록에서 비중복 권한만 추출 + Map mNoDuplAuthorInfo = new HashMap(); + mNoDuplAuthorInfo.putAll(mAuthorInfo); + String[] arrAuthorRescue = result.getAuthorRescueCode().split(">"); + for(int i=0; i listAuthorInfo = new ArrayList(); + Iterator it = mNoDuplAuthorInfo.keySet().iterator(); + while(it.hasNext()) { + String authorCode = it.next(); + XitAuthorInfoVO authorInfo = new XitAuthorInfoVO(); + authorInfo.setAuthorCode(authorCode); + authorInfo.setAuthorNm(mNoDuplAuthorInfo.get(authorCode)); + listAuthorInfo.add(authorInfo); + } + + mav.addObject("authorList", listAuthorInfo); + mav.addObject("mAuthorInfo", mAuthorInfo); + mav.addObject("authHierarchyManage", paraMap); + mav.addObject("pageTitle", "권한 계층 설정"); + mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/mngAuthHierarchyMgtPopup.popup"); + return mav; + } @@ -257,7 +288,7 @@ public class AuthHierarchyMgtController { case "edit": //수정 페이지 // case "view": //상세 페이지 //최하위 권한의 권한계층 조회 - XitAuthHierarchyMngVO result = service.findView(vo); + XitAuthHierarchyMngVO result = authAuthorMgtService.findAuthAuthorInfos(vo); //권한코드 Map 생성 List listAuthorInfoVO = xitFrameCrudService.findXitAuthorInfos(new XitAuthorInfoVO()); Map mAuthorInfo = new HashMap(); diff --git a/src/main/resources/sqlmapper/framework/mng/auth/auth-author-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/auth/auth-author-mysql-mapper.xml index 4fc8ecdc..ddda4a41 100644 --- a/src/main/resources/sqlmapper/framework/mng/auth/auth-author-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/mng/auth/auth-author-mysql-mapper.xml @@ -52,7 +52,7 @@ - /* auth-author-mysql-mapper|selectAuthorInfos-권한 목록 조회|julim */ + /* auth-author-mysql-mapper|updateAuthorInfos-권한 정보 변경|julim */ UPDATE xit_author_info SET author_nm = IF(author_nm = #{authorNm}, author_nm, #{authorNm}) , author_dc = IF(author_dc = #{authorDc}, author_dc, #{authorDc}) @@ -60,7 +60,7 @@ - /* auth-author-mysql-mapper|selectAuthorInfos-권한 목록 조회|julim */ + /* auth-author-mysql-mapper|deleteAuthorInfos-권한 정보 삭제|julim */ DELETE FROM xit_author_info WHERE author_code = #{authorCode} diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp index 422025a3..c4db5fd1 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp @@ -28,13 +28,11 @@ -<%--
권한계층설정
---%> @@ -106,9 +104,9 @@ $(() => { $('#btnSearch').on('click', () => fnBiz.search()); - // $('#btnPopup').on('click', () => { - // fnBiz.pagePopup('add', {}); - // }); + $('#btnPopup').on('click', () => { + fnBiz.pagePopup('add', {}); + }); }); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp index 7a52cbba..fe28ce35 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp @@ -2,12 +2,53 @@ <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> + - +<%--@elvariable id="authHierarchyManage" type=""--%> +
@@ -87,17 +128,16 @@
- - - - - - 저장 - 원래대로 - 설정정보 적용 - 닫기 - - + + +
+ + 저장 + 원래대로 + 설정정보적용 + 닫기 + +
@@ -105,47 +145,6 @@ - diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp index fe28ce35..305a3a3e 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp @@ -45,10 +45,9 @@ - <%--@elvariable id="authHierarchyManage" type=""--%> - +
@@ -134,8 +133,8 @@ 저장 원래대로 - 설정정보적용 - 닫기 + 설정정보적용 + 닫기
@@ -147,155 +146,155 @@ From 76070312323acf8bd00b8a8cbc0ba859676cea47 Mon Sep 17 00:00:00 2001 From: minuk926 Date: Thu, 10 Nov 2022 17:19:07 +0900 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=EA=B6=8C=ED=95=9C=EA=B4=80?= =?UTF-8?q?=EB=A6=AC-=EA=B6=8C=ED=95=9C=EA=B3=84=EC=B8=B5=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mng/auth/auth-hierarchy-mysql-mapper.xml | 71 ------------------- 1 file changed, 71 deletions(-) diff --git a/src/main/resources/sqlmapper/framework/mng/auth/auth-hierarchy-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/auth/auth-hierarchy-mysql-mapper.xml index bbb998d9..542e69cc 100644 --- a/src/main/resources/sqlmapper/framework/mng/auth/auth-hierarchy-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/mng/auth/auth-hierarchy-mysql-mapper.xml @@ -14,77 +14,6 @@ AND author_nm LIKE CONCAT('%',#{searchKeyword},'%') - - - - - - - - SELECT LIST.* FROM( - - - - ) LIST LIMIT #{firstIndex}, #{recordCountPerPage} - - - - - SELECT A.AUTHOR_CODE AS "authorCode" - ,A.AUTHOR_NM AS "authorNm" - ,A.AUTHOR_DC AS "authorDc" - ,A.AUTHOR_CREAT_DE AS "authorCreatDe" - - - FROM XIT_AUTHOR_INFO A - - - - AND A.AUTHOR_NM LIKE CONCAT('%',#{searchKeyword},'%') - - - - - - - - - - - - - - - - From 5e50f8b89cde512855595f4b90363e298b292960 Mon Sep 17 00:00:00 2001 From: minuk926 Date: Thu, 10 Nov 2022 17:19:48 +0900 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=EA=B6=8C=ED=95=9C=EA=B4=80?= =?UTF-8?q?=EB=A6=AC-=EA=B6=8C=ED=95=9C=EA=B3=84=EC=B8=B5=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/mng/auth/auth-hierarchy-mysql-mapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/sqlmapper/framework/mng/auth/auth-hierarchy-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/auth/auth-hierarchy-mysql-mapper.xml index 542e69cc..5c78b84f 100644 --- a/src/main/resources/sqlmapper/framework/mng/auth/auth-hierarchy-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/mng/auth/auth-hierarchy-mysql-mapper.xml @@ -12,7 +12,7 @@ , author_creat_de FROM xit_author_info - AND author_nm LIKE CONCAT('%',#{searchKeyword},'%') + AND INSTR(author_nm, #{searchKeyword}) > 0 From 50c8f475e19dedc94c243ea2accf861ba7f7beca Mon Sep 17 00:00:00 2001 From: minuk926 Date: Thu, 10 Nov 2022 20:05:38 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=EA=B6=8C=ED=95=9C=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=20=EC=B5=9C=EC=A2=85=20=EC=86=8C=EC=8A=A4=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mng/auth/mapper/AuthAuthorMgtMapper.java | 30 -- .../biz/mng/auth/mapper/AuthGrpMgtMapper.java | 43 --- .../auth/mapper/AuthHierarchyMgtMapper.java | 1 - .../mng/auth/mapper/AuthRoleMgtMapper.java | 5 +- .../mng/auth/mapper/AuthUserMgtMapper.java | 50 --- .../auth/service/AuthAuthorMgtService.java | 87 +----- .../mng/auth/service/AuthGrpMgtService.java | 64 +--- .../auth/service/AuthHierarchyMgtService.java | 2 +- .../mng/auth/service/AuthRoleMgtService.java | 4 +- .../mng/auth/service/AuthUserMgtService.java | 81 ----- .../impl/AuthAuthorMgtServiceImpl.java | 208 +----------- .../service/impl/AuthGrpMgtServiceImpl.java | 162 +--------- .../impl/AuthHierarchyMgtServiceImpl.java | 6 +- .../service/impl/AuthRoleMgtServiceImpl.java | 6 +- .../service/impl/AuthUserMgtServiceImpl.java | 168 +--------- .../mng/auth/web/AuthAuthorMgtController.java | 230 +------------- .../mng/auth/web/AuthGrpMgtController.java | 295 +----------------- .../mng/auth/web/AuthUserMgtController.java | 282 +---------------- .../auth/web/XitLoginPolicyMngController.java | 1 - .../mng/auth/auth-author-mysql-mapper.xml | 66 ---- .../mng/auth/auth-grp-mysql-mapper.xml | 88 ------ .../biz/mng/auth/mngAuthUserMgtForm.jsp | 14 +- 22 files changed, 42 insertions(+), 1851 deletions(-) diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthAuthorMgtMapper.java b/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthAuthorMgtMapper.java index 32f87739..93dd4fd6 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthAuthorMgtMapper.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthAuthorMgtMapper.java @@ -68,34 +68,4 @@ public interface AuthAuthorMgtMapper { List selectAuthRoleGrantList(Map paraMap); int deleteRoleGrant(Map map); int saveRoleGrant(Map map); - - - - - - - - - - - - - /** - * 
메소드 설명: 권한롤관리 목록 조회
- * @param searchVO - * @return List> 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public List> findListAuthorRole(XitBaseSearchVO searchVO); - /** - * 
메소드 설명: 권한롤관리 목록 조회 총 건수
- * @param searchVO - * @return int 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public int findListAuthorRoleTotCnt(XitBaseSearchVO searchVO); - - } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthGrpMgtMapper.java b/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthGrpMgtMapper.java index 23133775..c57d7949 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthGrpMgtMapper.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthGrpMgtMapper.java @@ -30,47 +30,4 @@ public interface AuthGrpMgtMapper { int insertAuthorGroupInfo(final XitAuthorGroupInfoVO vo); int updateAuthorGroupInfo(final XitAuthorGroupInfoVO vo); int deleteAuthorGroupInfo(final String groupId); - - - - - - - - - - - - - - - - /** - * 
메소드 설명: 사용자그룹관리 목록 조회
- * @param searchVO - * @return List 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public List findList(XitAuthGrpMngSearchVO searchVO) throws SQLException; - - /** - * 
메소드 설명: 사용자그룹관리 목록 총건수 조회
- * @param searchVO - * @return int 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public int findListTotCnt(XitAuthGrpMngSearchVO searchVO) throws SQLException; - - /** - * 
메소드 설명: 사용자그룹관리 상세정보 조회
- * @param vo - * @return XitAuthGrpMngVO 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public XitAuthGrpMngVO findView(XitAuthGrpMngVO vo) throws SQLException; - - } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthHierarchyMgtMapper.java b/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthHierarchyMgtMapper.java index 888c01d5..13d28ad4 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthHierarchyMgtMapper.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthHierarchyMgtMapper.java @@ -22,7 +22,6 @@ import kr.xit.framework.biz.mng.auth.model.XitAuthHierarchyMngVO; */ @Mapper public interface AuthHierarchyMgtMapper { - List selectAuthHierarchies(final Map paraMap, final RowBounds rowBounds); } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthRoleMgtMapper.java b/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthRoleMgtMapper.java index 43281d17..e98931d8 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthRoleMgtMapper.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthRoleMgtMapper.java @@ -27,11 +27,8 @@ public interface AuthRoleMgtMapper { /** * 
메소드 설명: 롤관리 목록 조회
- * @param searchVO - * @return List 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. */ + @SuppressWarnings("MybatisXMapperMethodInspection") List selectAuthRoles(final Map paraMap, final RowBounds rowBounds); /** diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthUserMgtMapper.java b/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthUserMgtMapper.java index 667725c6..bd710387 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthUserMgtMapper.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthUserMgtMapper.java @@ -23,56 +23,6 @@ import kr.xit.framework.core.model.XitBaseSearchVO; */ @Mapper public interface AuthUserMgtMapper { - - List selectAuthUsers(final Map paraMap, final RowBounds rowBounds); XitAuthUsrMngVO selectAuthUser(final Map paraMap); - - - /** - * 
메소드 설명: 사용자별권한관리 목록 조회
- * @param searchVO - * @return List 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public List findList(XitAuthUsrMngSearchVO searchVO) throws SQLException; - - /** - * 
메소드 설명: 사용자별권한관리 목록 총건수 조회
- * @param searchVO - * @return int 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public int findListTotCnt(XitAuthUsrMngSearchVO searchVO) throws SQLException; - - /** - * 
메소드 설명: 사용자별권한관리 상세정보 조회
- * @param vo - * @return XitAuthUsrMngVO 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public XitAuthUsrMngVO findView(XitAuthUsrMngVO vo) throws SQLException; - - - - /** - * 
메소드 설명: 그룹 목록 조회
- * @param searchVO - * @return List> 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public List> findListGroup(XitBaseSearchVO searchVO); - /** - * 
메소드 설명: 그룹 목록 조회 총 건수
- * @param searchVO - * @return int 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public int findListGroupTotCnt(XitBaseSearchVO searchVO); - } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthAuthorMgtService.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthAuthorMgtService.java index c9257ec8..445743a7 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthAuthorMgtService.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthAuthorMgtService.java @@ -40,89 +40,6 @@ public interface AuthAuthorMgtService { void removeAuthAuthor(final String authorCode); - - - List findAuthRoleGrantList(Map paraMap); - void saveAuthRoleGrantList(Map paraMap); - - - - - - - - - - - - - - - - - - - - /** - * 
메소드 설명: 권한관리 등록
- * @param vo void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public void addProc(XitAuthRegMngVO vo); - - /** - * 
메소드 설명: 권한관리 수정
- * @param vo void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public void modifyProc(XitAuthRegMngVO vo); - - /** - * 
메소드 설명: 권한관리 삭제
- * @param vo void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public void removeProc(XitAuthRegMngVO vo); - - /** - * 
메소드 설명: 권한관리 다건 삭제
- * @param ids void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public void removesProc(String ids); - - - - - /** - * 
메소드 설명: 권한롤관리 목록 조회
- * @param searchVO - * @return List> 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - List> findListAuthorRole(XitBaseSearchVO searchVO); - /** - * 
메소드 설명: 권한롤관리 목록 조회 총 건수
- * @param searchVO - * @return int 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - int findListAuthorRoleTotCnt(XitBaseSearchVO searchVO); - /** - * 
메소드 설명: 권한롤관리 등록
- * @param authCode - * @param trgetRoleCodes - * @param trgetRegYns void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - void addAuthorRole(String authCode, String[] trgetRoleCodes, String[] trgetRegYns); - - + List findAuthRoleGrantList(final Map paraMap); + void saveAuthRoleGrantList(final Map paraMap); } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthGrpMgtService.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthGrpMgtService.java index a1ba7eb1..a322ee6b 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthGrpMgtService.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthGrpMgtService.java @@ -28,67 +28,5 @@ public interface AuthGrpMgtService { void modifyAuthGrp(final XitAuthorGroupInfoVO vo); void removeAuthGrp(final String authorCode); - void isCheckUserForCanChange(String uniqId, String trgetAuthorCode); - - - - - /** - * 
메소드 설명: 사용자그룹관리 목록 조회
- * @param searchVO - * @return List 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public List findList(XitAuthGrpMngSearchVO searchVO); - - /** - * 
메소드 설명: 사용자그룹관리 목록 총건수 조회
- * @param searchVO - * @return int 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public int findListTotCnt(XitAuthGrpMngSearchVO searchVO); - - /** - * 
메소드 설명: 사용자그룹관리 상세정보 조회
- * @param vo - * @return XitAuthGrpMngVO 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public XitAuthGrpMngVO findView(XitAuthGrpMngVO vo); - - /** - * 
메소드 설명: 사용자그룹관리 등록
- * @param vo void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public void addProc(XitAuthGrpMngVO vo); - - /** - * 
메소드 설명: 사용자그룹관리 수정
- * @param vo void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public void modifyProc(XitAuthGrpMngVO vo); - - /** - * 
메소드 설명: 사용자그룹관리 삭제
- * @param vo void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public void removeProc(XitAuthGrpMngVO vo); - - /** - * 
메소드 설명: 사용자그룹관리 다건 삭제
- * @param ids void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public void removesProc(String ids); + void isCheckUserForCanChange(final String uniqId, final String trgetAuthorCode); } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthHierarchyMgtService.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthHierarchyMgtService.java index ad3cff49..1385013f 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthHierarchyMgtService.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthHierarchyMgtService.java @@ -22,7 +22,7 @@ import kr.xit.framework.biz.mng.auth.model.XitAuthHierarchyMngVO; public interface AuthHierarchyMgtService { List findAuthHierarchies(final Map paraMap, final RowBounds pagingInfo); - XitAuthHierarchyMngVO findAuthHierarchyInfo(XitAuthHierarchyMngVO vo); + XitAuthHierarchyMngVO findAuthHierarchyInfo(final XitAuthHierarchyMngVO vo); void saveAuthHierarchy(final XitAuthHierarchyMngVO vo); } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthRoleMgtService.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthRoleMgtService.java index f28ed50d..6af69d07 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthRoleMgtService.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthRoleMgtService.java @@ -46,7 +46,7 @@ public interface AuthRoleMgtService { * @author: 박민규 * @date: 2020. 4. 16. */ - void addAuthRole(XitRoleInfoVO vo); + void addAuthRole(final XitRoleInfoVO vo); /** * 
메소드 설명: 롤관리 수정
@@ -54,7 +54,7 @@ public interface AuthRoleMgtService { * @author: 박민규 * @date: 2020. 4. 16. */ - void modifyAuthRole(XitRoleInfoVO vo); + void modifyAuthRole(final XitRoleInfoVO vo); /** * 
메소드 설명: 롤관리 삭제
diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthUserMgtService.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthUserMgtService.java index f7cae4e0..565377e9 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthUserMgtService.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthUserMgtService.java @@ -24,85 +24,4 @@ public interface AuthUserMgtService { List findAuthUsers(final Map paraMap, final RowBounds rowBounds); void saveAuthUserList(final List> paraList); void removeAuthUserList(final List> paraList); - - /** - * 
메소드 설명: 사용자별권한관리 목록 조회
- * @param searchVO - * @return List 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public List findList(XitAuthUsrMngSearchVO searchVO); - - /** - * 
메소드 설명: 사용자별권한관리 목록 총건수 조회
- * @param searchVO - * @return int 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public int findListTotCnt(XitAuthUsrMngSearchVO searchVO); - - /** - * 
메소드 설명: 사용자별권한관리 상세정보 조회
- * @param vo - * @return XitAuthUsrMngVO 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public XitAuthUsrMngVO findView(XitAuthUsrMngVO vo); - - /** - * 
메소드 설명: 사용자별권한관리 등록
- * @param vo void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public void addProc(XitAuthUsrMngVO vo); - - /** - * 
메소드 설명: 사용자별권한관리 수정
- * @param vo void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public void modifyProc(XitAuthUsrMngVO vo); - - /** - * 
메소드 설명: 사용자별권한관리 삭제
- * @param vo void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public void removeProc(XitAuthUsrMngVO vo); - - /** - * 
메소드 설명: 사용자별권한관리 다건 삭제
- * @param ids - * @param groupIds void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public void removesProc(String ids, String groupIds); - - - - /** - * 
메소드 설명: 그룹 목록 조회
- * @param searchVO - * @return List> 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public List> findListGroup(XitBaseSearchVO searchVO); - /** - * 
메소드 설명: 그룹 목록 조회 총 건수
- * @param searchVO - * @return int 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public int findListGroupTotCnt(XitBaseSearchVO searchVO); - - } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthAuthorMgtServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthAuthorMgtServiceImpl.java index 5c6435c8..bb8bbcb3 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthAuthorMgtServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthAuthorMgtServiceImpl.java @@ -29,10 +29,6 @@ import lombok.extern.slf4j.Slf4j; public class AuthAuthorMgtServiceImpl implements AuthAuthorMgtService { @Resource private AuthAuthorMgtMapper mapper; - @Resource - private XitFrameCrudService xitFrameCrudService; - @Resource - private XitFrameUnitService xitFrameUnitService; /** 부모 권한코드 */ final String PARNTS_AUTHOR = "ROLE_USER"; @@ -46,7 +42,7 @@ public class AuthAuthorMgtServiceImpl implements AuthAuthorMgtService { } @Override - public List findAuthAuthors(Map paraMap) { + public List findAuthAuthors(final Map paraMap) { return mapper.selectAuthorInfos(paraMap); } @@ -106,7 +102,7 @@ public class AuthAuthorMgtServiceImpl implements AuthAuthorMgtService { } @Override - public List findAuthRoleGrantList(Map paraMap) { + public List findAuthRoleGrantList(final Map paraMap) { return mapper.selectAuthRoleGrantList(paraMap); } @@ -122,204 +118,4 @@ public class AuthAuthorMgtServiceImpl implements AuthAuthorMgtService { mapper.saveRoleGrant(map); }); } - - - @Override - public void addProc(XitAuthRegMngVO vo) { - /* ===================================================== - * 2020.05.21 박민규 - * 신규권한 등록프로세스 주석 및 수정 - * -사유: egovFrame의 권한계층은 부모~자녀 순으로 "익명사용자->사용자->관리자"로 기본제공 되며 - * 부모권한에 부여된 ROLE을 자녀가 상속받는 개념이다. - * 다만 기본제공되는 권한계층을 사용 시 카페의 "관리자>매니저>정회원>준회원>비회원"과 같은 권한계층 관리에 적합하기에 - * 업체별(또는 부서별)로 권한그룹을 별도 관리 해야하는 경우에 적합하지 않다. - * -작업내용: 기본제공되는 "익명사용자->사용자->관리자" 관리구조에서 사용자와 관리자 그룹 사이에 신규권한그룹을 삽입하여 - * "익명사용자->사용자->신규권한1/신규권한2/...->관리자"로 권한계층을 구성하여 - * n개의 신규그룹은 "사용자"에게서 기본적인 ROLE을 상속받고 - * n개의 신규그룹의 ROLE을 "관리자"가 상속받도록 한다. - * AS-IS: "익명사용자->사용자->관리자"의 권한계층에 삽입되지 않아 상위권한(PARENT)의 ROLE을 승계받지 못 함. - * TO-BE: "익명사용자->사용자->신규권한1/신규권한2/...->관리자"순의 상하관계를 가지게 되므로 신규권한그룹도 상위권한(PARENT)의 ROLE을 승계 받음. - ===================================================== */ - /* ----------------------- - * 2020.05.21 주석처리 - -----------------------*/ -// /** -// * 필수값 설정 -// */ -// XitAuthorInfoVO authorInfoVO = convertToCrudVO(vo); -// /** -// * 처리 -// */ -// xitFrameCrudService.addXitAuthorInfo(authorInfoVO); - /** - * 필수값 설정 - */ - XitAuthorInfoVO authorInfoVO = convertToCrudVO(vo); - - /** - * 처리 - */ - //권한정보 Insert - xitFrameCrudService.addXitAuthorInfo(authorInfoVO); - //권한계층 Insert - try { - XitRoleSclsrtRescueVO roleSclsrtRescueVO = new XitRoleSclsrtRescueVO(); - //부모관계 생성 - roleSclsrtRescueVO.setParntsRole(PARNTS_AUTHOR); - roleSclsrtRescueVO.setChldrnRole(authorInfoVO.getAuthorCode()); - xitFrameCrudService.addXitRoleSclsrtRescue(roleSclsrtRescueVO); - //자녀관계 생성 - roleSclsrtRescueVO.setParntsRole(authorInfoVO.getAuthorCode()); - roleSclsrtRescueVO.setChldrnRole(CHLDRN_AUTHOR); - xitFrameCrudService.addXitRoleSclsrtRescue(roleSclsrtRescueVO); - } catch (Exception e) { - log.debug(String.format("권한계층 Insert Fail : %s", e.getMessage())); - } - } - - @Override - public void modifyProc(XitAuthRegMngVO vo) { - /** - * 필수값 설정 - */ - XitAuthorInfoVO authorInfoVO = convertToCrudVO(vo); - /** - * 처리 - */ - xitFrameCrudService.modifyXitAuthorInfo(authorInfoVO); - - } - - @Override - public void removeProc(XitAuthRegMngVO vo) { - - /* ===================================================== - * 2020.05.21 박민규 - * 신규권한 등록프로세스 주석 및 수정 - * -사유: egovFrame의 권한계층은 부모~자녀 순으로 "익명사용자->사용자->관리자"로 기본제공 되며 - * 부모권한에 부여된 ROLE을 자녀가 상속받는 개념이다. - * 다만 기본제공되는 권한계층을 사용 시 카페의 "관리자>매니저>정회원>준회원>비회원"과 같은 권한계층 관리에 적합하기에 - * 업체별(또는 부서별)로 권한그룹을 별도 관리 해야하는 경우에 적합하지 않다. - * -작업내용: 기본제공되는 "익명사용자->사용자->관리자" 관리구조에서 사용자와 관리자 그룹 사이에 신규권한그룹을 삽입하여 - * "익명사용자->사용자->신규권한1/신규권한2/...->관리자"로 권한계층을 구성하여 - * n개의 신규그룹은 "사용자"에게서 기본적인 ROLE을 상속받고 - * n개의 신규그룹의 ROLE을 "관리자"가 상속받도록 한다. - * AS-IS: "익명사용자->사용자->관리자"의 권한계층에 삽입되지 않아 상위권한(PARENT)의 ROLE을 승계받지 못 함. - * TO-BE: "익명사용자->사용자->신규권한1/신규권한2/...->관리자"순의 상하관계를 가지게 되므로 신규권한그룹도 상위권한(PARENT)의 ROLE을 승계 받음. - ===================================================== */ - /* ----------------------- - * 2020.05.21 주석처리 - -----------------------*/ -// /** -// * 필수값 설정 -// */ -// XitAuthorInfoVO authorInfoVO = convertToCrudVO(vo); -// /** -// * 처리 -// */ -// xitFrameCrudService.removeXitAuthorInfo(authorInfoVO); - /** - * 필수값 설정 - */ - XitAuthorInfoVO authorInfoVO = convertToCrudVO(vo); - /** - * 처리 - */ - //권한계층 Delete - try { - XitRoleSclsrtRescueVO roleSclsrtRescueVO = new XitRoleSclsrtRescueVO(); - //부모관계 제거 - roleSclsrtRescueVO.setParntsRole(PARNTS_AUTHOR); - roleSclsrtRescueVO.setChldrnRole(authorInfoVO.getAuthorCode()); - xitFrameCrudService.removeXitRoleSclsrtRescue(roleSclsrtRescueVO); - //자녀관계 제거 - roleSclsrtRescueVO.setParntsRole(authorInfoVO.getAuthorCode()); - roleSclsrtRescueVO.setChldrnRole(CHLDRN_AUTHOR); - xitFrameCrudService.removeXitRoleSclsrtRescue(roleSclsrtRescueVO); - } catch (Exception e) { - log.debug(String.format("권한계층 Delete Fail : %s", e.getMessage())); - } - //권한정보 Delete - xitFrameCrudService.removeXitAuthorInfo(authorInfoVO); - - } - - @Override - public void removesProc(String ids) { - /** - * 처리 - */ - String[] authorCodes = ids.split(";"); - for (int i = 0; i < authorCodes.length; i++) { - XitAuthRegMngVO vo = new XitAuthRegMngVO(); - vo.setAuthorCode(authorCodes[i]); - this.removeProc(vo); - } - - } - - - - - @Override - public List> findListAuthorRole(XitBaseSearchVO searchVO) { - return mapper.findListAuthorRole(searchVO); - } - - @Override - public int findListAuthorRoleTotCnt(XitBaseSearchVO searchVO) { - return mapper.findListAuthorRoleTotCnt(searchVO); - } - - @Override - public void addAuthorRole(String authorCode, String[] trgetRoleCodes, String[] trgetRegYns) { - /** - * 필수값 확인 - */ - if(XitCmmnUtil.isEmpty(authorCode)) - throw new RuntimeException("권한코드(은)는 필수조건 입니다."); - if(XitCmmnUtil.isEmpty(trgetRoleCodes)) - throw new RuntimeException("역할코드(은)는 필수조건 입니다."); - if(XitCmmnUtil.isEmpty(trgetRegYns)) - throw new RuntimeException("등록여부(은)는 필수조건 입니다."); - - /** - * 유효성 확인 - */ - if(trgetRoleCodes.length != trgetRegYns.length) - throw new RuntimeException("권한코드와 등록여부 건수가 일치하지 않습니다."); - - - /** - * 처리 - */ - for(int i=0; i - * 메소드 설명: 메뉴VO를 CRUD Service의 VO로 변환 한다. - * - * - * @return XitAuthorInfoVO 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - private XitAuthorInfoVO convertToCrudVO(XitAuthRegMngVO vo) { - XitAuthorInfoVO authorInfoVO = new XitAuthorInfoVO(); - authorInfoVO.setAuthorCode(vo.getAuthorCode()); //권한 코드 - authorInfoVO.setAuthorNm(vo.getAuthorNm()); //권한 명 - authorInfoVO.setAuthorDc(vo.getAuthorDc()); //권한 설명 -// authorInfoVO.setAuthor_creat_de(vo.getAuthorCreatDe()); //권한 생성 일 - - return authorInfoVO; - } } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthGrpMgtServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthGrpMgtServiceImpl.java index 188a2366..68bfcd64 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthGrpMgtServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthGrpMgtServiceImpl.java @@ -39,15 +39,8 @@ public class AuthGrpMgtServiceImpl implements AuthGrpMgtService { @Resource private UserMgtMapper userMgtMapper; - - @Resource - private XitFrameCrudService xitFrameCrudService; - @Resource - private XitFrameUnitService xitFrameUnitService; @Resource(name="xitGroupIdGnrService") private EgovIdGnrService idgenService; - @Resource - private XitMessageSource xitMessageSource; @Override public List findAuthGrps(final Map paraMap, final RowBounds rowBounds) { @@ -85,7 +78,7 @@ public class AuthGrpMgtServiceImpl implements AuthGrpMgtService { mapper.deleteAuthorGroupInfo(groupId); } - public void isCheckUserForCanChange(String uniqId, String trgetAuthorCode) { + public void isCheckUserForCanChange(final String uniqId, final String trgetAuthorCode) { //사용자보안설정 조회 XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); userScrtySetupVO.setScrtySetupTrgetId(uniqId); @@ -97,7 +90,7 @@ public class AuthGrpMgtServiceImpl implements AuthGrpMgtService { } - private boolean isCheckUserAuthorCodeForCanChange(String userAuthorCode, String trgetAuthorCode) { + private boolean isCheckUserAuthorCodeForCanChange(final String userAuthorCode, final String trgetAuthorCode) { //역할(권한)계층구조 데이터 목록 조회 List listRoleSclsrtRescueVO = authAuthorMgtMapper.selectRoleSclsrtRescues(null); //역할(권한)계층구조를 사용하지 않고 있는 경우 true 반환 @@ -141,7 +134,7 @@ public class AuthGrpMgtServiceImpl implements AuthGrpMgtService { return this.isHighAuthor(listRoleSclsrtRescueVO, userAuthorCode, trgetAuthorCode)?false:true; } - private boolean isHighAuthor(List list, String authorCode, String highAuthorCode) { + private boolean isHighAuthor(final List list, final String authorCode, final String highAuthorCode) { boolean result = false; for (XitRoleSclsrtRescueVO item : list) { @@ -161,153 +154,4 @@ public class AuthGrpMgtServiceImpl implements AuthGrpMgtService { return result; } - - - - - - - - - - - - - - - - - - - - @Override - public List findList(XitAuthGrpMngSearchVO searchVO) { - List result = null; - try { - result = mapper.findList(searchVO); - } catch (SQLException e) { - throw new RuntimeException("사용자그룹관리 목록 조회 FAIL::", e); - } - return result; - } - - @Override - public int findListTotCnt(XitAuthGrpMngSearchVO searchVO) { - int result = 0; - try { - result = mapper.findListTotCnt(searchVO); - } catch (SQLException e) { - throw new RuntimeException("사용자그룹관리 목록 총건수 조회 FAIL::", e); - } - return result; - } - - @Override - public XitAuthGrpMngVO findView(XitAuthGrpMngVO vo) { - XitAuthGrpMngVO result = null; - try { - result = mapper.findView(vo); - } catch (SQLException e) { - throw new RuntimeException("사용자그룹관리 상세정보 조회 FAIL::", e); - } - return result; - } - - @Override - public void addProc(XitAuthGrpMngVO vo) { - /** - * 유효성 확인 - */ - boolean isChangePermission = xitFrameUnitService.isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthorCode()); - if(!isChangePermission) - throw new RuntimeException("자신의 권한보다 상위 권한을 설정 할 수 없습니다."); - - - /** - * 필수값 설정 - */ - try { - vo.setGroupId(idgenService.getNextStringId()); - } catch (FdlException e) { - throw new RuntimeException(String.format("%s %s", xitMessageSource.getMessage("fail.common.insert"), e.getMessage())); - } - XitAuthorGroupInfoVO authorGroupInfoVO = convertToCrudVO(vo); - - - - /** - * 처리 - */ - xitFrameCrudService.addXitAuthorGroupInfo(authorGroupInfoVO); - - } - - @Override - public void modifyProc(XitAuthGrpMngVO vo) { - /** - * 유효성 확인 - */ - boolean isChangePermission = xitFrameUnitService.isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthorCode()); - if(!isChangePermission) - throw new RuntimeException("자신의 권한보다 상위 권한을 설정 할 수 없습니다."); - - - /** - * 필수값 설정 - */ - XitAuthorGroupInfoVO authorGroupInfoVO = convertToCrudVO(vo); - - - /** - * 처리 - */ - xitFrameCrudService.modifyXitAuthorGroupInfo(authorGroupInfoVO); - } - - @Override - public void removeProc(XitAuthGrpMngVO vo) { - /** - * 필수값 설정 - */ - XitAuthorGroupInfoVO authorGroupInfoVO = convertToCrudVO(vo); - - - /** - * 처리 - */ - xitFrameCrudService.removeXitAuthorGroupInfo(authorGroupInfoVO); - } - - @Override - public void removesProc(String ids) { - /** - * 처리 - */ - String [] groupIds = ids.split(";"); - for(int i=0; i - * 메소드 설명: 메뉴VO를 CRUD Service의 VO로 변환 한다. - * - * - * @return XitAuthorGroupInfoVO 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - private XitAuthorGroupInfoVO convertToCrudVO(XitAuthGrpMngVO vo) { - XitAuthorGroupInfoVO authorGroupInfoVO = new XitAuthorGroupInfoVO(); - authorGroupInfoVO.setGroupId(vo.getGroupId()); //그룹 id - authorGroupInfoVO.setGroupNm(vo.getGroupNm()); //그룹 명 -// authorGroupInfoVO.setGroup_creat_de(); //그룹 생성 일 - authorGroupInfoVO.setGroupDc(vo.getGroupDc()); //그룹 설명 - authorGroupInfoVO.setAuthorCode(vo.getAuthorCode()); //권한 코드 - - return authorGroupInfoVO; - } } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthHierarchyMgtServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthHierarchyMgtServiceImpl.java index d0256ca4..fa345218 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthHierarchyMgtServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthHierarchyMgtServiceImpl.java @@ -127,7 +127,7 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { * @author: 박민규 * @date: 2020. 11. 2. */ - private String getStrAuthHierarchy(String authorCode) { + private String getStrAuthHierarchy(final String authorCode) { LinkedHashMap mParnts = new LinkedHashMap(); LinkedHashMap mChldrn = new LinkedHashMap(); @@ -161,7 +161,7 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { * @author: 박민규 * @date: 2020. 11. 2. */ - private void getAuthHierarchy(List list, String authorCode, boolean isChldrnSearch, LinkedHashMap resultMap) { + private void getAuthHierarchy(final List list, final String authorCode, final boolean isChldrnSearch, final LinkedHashMap resultMap) { for (XitRoleSclsrtRescueVO item : list) { @@ -228,7 +228,7 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { } - private String convertKorNm(String strAuthorRescueCode) { + private String convertKorNm(final String strAuthorRescueCode) { //권한코드 Map 생성 List listAuthorInfoVO = authAuthorMgtMapper.selectAuthorInfos(null); Map mAuthorInfo = new HashMap(); diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthRoleMgtServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthRoleMgtServiceImpl.java index 2ac52d8e..f5b2a4e9 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthRoleMgtServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthRoleMgtServiceImpl.java @@ -24,8 +24,6 @@ public class AuthRoleMgtServiceImpl implements AuthRoleMgtService { private AuthRoleMgtMapper mapper; @Resource(name="xitRoleIdGnrService") private EgovIdGnrService idgenService; - @Resource - private XitMessageSource xitMessageSource; @Override public List findAuthRoles(final Map paraMap, final RowBounds rowBounds) { @@ -46,13 +44,13 @@ public class AuthRoleMgtServiceImpl implements AuthRoleMgtService { try { vo.setRoleCode(roleTyp.concat("-").concat(idgenService.getNextStringId())); } catch (FdlException e) { - throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, String.format("%s %s", xitMessageSource.getMessage(MessageKey.CMM_INSERT_FAIL), e.getMessage())); + throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, e.getMessage()); } mapper.insertAuthRole(vo); } @Override - public void modifyAuthRole(XitRoleInfoVO vo) { + public void modifyAuthRole(final XitRoleInfoVO vo) { mapper.updateAuthRole(vo); } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthUserMgtServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthUserMgtServiceImpl.java index 37f3bc99..a2828601 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthUserMgtServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthUserMgtServiceImpl.java @@ -22,25 +22,18 @@ import kr.xit.framework.biz.mng.user.mapper.UserMgtMapper; import kr.xit.framework.biz.mng.user.service.UserMgtService; import kr.xit.framework.core.model.XitBaseSearchVO; import kr.xit.framework.core.utils.XitCmmnUtil; +import lombok.AllArgsConstructor; +@AllArgsConstructor @Service public class AuthUserMgtServiceImpl implements AuthUserMgtService { - @Resource - private AuthUserMgtMapper mapper; + private final AuthUserMgtMapper mapper; - @Resource - private UserMgtMapper userMapper; + private final UserMgtMapper userMapper; - @Resource - private AuthGrpMgtService authGrpMgtService; - @Resource - private UserMgtService userMgtService; - - @Resource - private XitFrameCrudService xitFrameCrudService; - @Resource - private XitFrameUnitService xitFrameUnitService; + private final AuthGrpMgtService authGrpMgtService; + private final UserMgtService userMgtService; @Override public List findAuthUsers(final Map paraMap, final RowBounds rowBounds) { @@ -80,153 +73,4 @@ public class AuthUserMgtServiceImpl implements AuthUserMgtService { }); } - @Override - public List findList(XitAuthUsrMngSearchVO searchVO) { - List result = null; - try { - result = mapper.findList(searchVO); - } catch (SQLException e) { - throw new RuntimeException("사용자별권한관리 목록 조회 FAIL::", e); - } - return result; - } - - @Override - public int findListTotCnt(XitAuthUsrMngSearchVO searchVO) { - int result = 0; - try { - result = mapper.findListTotCnt(searchVO); - } catch (SQLException e) { - throw new RuntimeException("사용자별권한관리 목록 총건수 조회 FAIL::", e); - } - return result; - } - - @Override - public XitAuthUsrMngVO findView(XitAuthUsrMngVO vo) { - XitAuthUsrMngVO result = null; - try { - result = mapper.findView(vo); - } catch (SQLException e) { - throw new RuntimeException("사용자별권한관리 상세정보 조회 FAIL::", e); - } - return result; - } - - @Override - public void addProc(XitAuthUsrMngVO vo) { - /** - * 유효성 확인 - */ - boolean isChangePermission = xitFrameUnitService.isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthorCode()); - if(!isChangePermission) - throw new RuntimeException("자신의 권한보다 상위 권한을 설정 할 수 없습니다."); - - /** - * 필수값 설정 - */ - XitUserScrtySetupVO userScrtySetupVO = convertToCrudVO(vo); - - /** - * 처리 - */ - xitFrameCrudService.addXitUserScrtySetup(userScrtySetupVO); - } - - @Override - public void modifyProc(XitAuthUsrMngVO vo) { - /** - * 유효성 확인 - */ - boolean isChangePermission = xitFrameUnitService.isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthorCode()); - if(!isChangePermission) - throw new RuntimeException("자신의 권한보다 상위 권한을 설정 할 수 없습니다."); - - /** - * 필수값 설정 - */ - XitUserScrtySetupVO userScrtySetupVO = convertToCrudVO(vo); - - /** - * 처리 - */ - xitFrameCrudService.modifyXitUserScrtySetup(userScrtySetupVO); - } - - @Override - public void removeProc(XitAuthUsrMngVO vo) { - /** - * 필수값 설정 - */ - XitUserScrtySetupVO userScrtySetupVO = convertToCrudVO(vo); - userScrtySetupVO.setMberTyCode(null); - String defaultAuthorCode = xitFrameUnitService.getDefaultAuthorCode(vo.getGroupId()); - userScrtySetupVO.setAuthorCode(defaultAuthorCode); - /** - * 처리 - */ - /* ============================ - * 2020.10.30. 박민규 - * 권한취소(삭제) 처리 서비스 처리 방식 - * -사유: 삭제 시 사용자의 권한을 소속 그룹의 권한 또는 Defualt 권한으로 설정 - * -작업내용: - * as-is: delete로 사용자보안설정 데이터 영구 삭제 - * to-be: update로 사용자 권한코드 변경 - ============================ */ -// xitFrameCrudService.removeXitUserScrtySetup(userScrtySetupVO); - xitFrameCrudService.modifyXitUserScrtySetup(userScrtySetupVO); - } - - @Override - public void removesProc(String ids, String groupIds) { - /** - * 처리 - */ - String [] userIds = ids.split(";"); - String [] grpIds = groupIds.split(";"); - for(int i=0; i> findListGroup(XitBaseSearchVO searchVO) { - - return mapper.findListGroup(searchVO); - } - - @Override - public int findListGroupTotCnt(XitBaseSearchVO searchVO) { - - return mapper.findListGroupTotCnt(searchVO); - } - - - - /** - * 
-	 * 메소드 설명: 메뉴VO를 CRUD Service의 VO로 변환 한다.
-	 *
- * - * @return XitUserScrtySetupVO 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - private XitUserScrtySetupVO convertToCrudVO(XitAuthUsrMngVO vo) { - XitUserScrtySetupVO crudVO = new XitUserScrtySetupVO(); - crudVO.setScrtySetupTrgetId(vo.getUniqId()); //보안 설정 대상 id - crudVO.setMberTyCode(vo.getMberTyCode()); //회원 유형 코드 - crudVO.setAuthorCode(vo.getAuthorCode()); //권한 코드 - - return crudVO; - } - - - - } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthAuthorMgtController.java b/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthAuthorMgtController.java index 7635b016..123faa90 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthAuthorMgtController.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthAuthorMgtController.java @@ -50,6 +50,7 @@ import kr.xit.framework.support.util.AjaxUtils; import kr.xit.framework.support.util.Checks; import kr.xit.framework.support.util.ValidationError; import kr.xit.framework.support.util.constants.MessageKey; +import lombok.AllArgsConstructor; /** * @@ -61,24 +62,16 @@ import kr.xit.framework.support.util.constants.MessageKey; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ +@AllArgsConstructor @Controller @RequestMapping("/framework/biz/mng/auth") public class AuthAuthorMgtController { - @Resource - private AuthAuthorMgtService service; - @Autowired - private XitBeanValidator beanValidator; - @Resource(name = "xitMessageSource") - XitMessageSource xitMessageSource; - + private final AuthAuthorMgtService service; /** * 
메소드 설명: 권한관리 목록 페이지
- * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. */ @RequestMapping(value = "/mngAuthAuthorMgtForm") public void mngAuthAuthorMgtForm() { @@ -101,9 +94,6 @@ public class AuthAuthorMgtController { /** * 
메소드 설명: 권한관리 목록 페이지 조회
- * @return String 요청처리 후 응답객체 - * @author: 김동규 - * @date: 2020. 7. 30. */ @GetMapping(value = "findAuthAuthors") public ModelAndView findAuthAuthors(@RequestParam final Map paraMap) { @@ -177,218 +167,4 @@ public class AuthAuthorMgtController { return mav; } - - - - - - - - - - - - - - - - - - - - /** - * 
메소드 설명: 요청 페이지로 이동 한다.
- * @param cmd - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) - * @param model - * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - @RequestMapping(value = "AuthRegMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) - public String AuthRegMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef - , @ModelAttribute("authorManageSearchVO") XitAuthRegMngSearchVO searchVO - , @ModelAttribute("authorManageVO") XitAuthRegMngVO vo - , ModelMap model) { - switch (cmd) { - case "input": //등록 페이지 - break; - case "edit": //수정 페이지 - case "view": //상세 페이지 - //model.addAttribute("authorManage", service.findView(vo)); - model.addAttribute("message", xitMessageSource.getMessage("success.common.select")); - break; - default: - throw new RuntimeException("유효하지 않은 요청 입니다."); - } - - - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/XitAuthRegMng_"+cmd+tilesDef; - - } - - - - - - /** - * 
메소드 설명: 권한관리 CUD 처리
- * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @throws IOException - * @throws ServletException - * @date: 2020. 4. 16. - */ - @RequestMapping(value = "AuthRegMng_{cmd}_proc", method=RequestMethod.POST) - public void AuthRegMng_cmd_proc(@PathVariable String cmd - ,@ModelAttribute("authorManage") XitAuthRegMngVO vo - ,@RequestParam(value="authorCodes", required=false, defaultValue="") String authorCodes - ,BindingResult bindingResult - ,SessionStatus status - ,Model model - ,HttpServletRequest request - ,HttpServletResponse response - ,@RequestParam(value="authorCode", required=false, defaultValue="") String authorCode - ,@RequestParam(value="roleCodes", required=false, defaultValue="") String roleCodes - ,@RequestParam(value="regYns", required=false, defaultValue="") String regYns - ) throws ServletException, IOException { - - /** - * 처리 분기 - */ - String sLocationUrl = "forward:/framework/biz/mng/auth/AuthRegMng_list.do"; - String message = null; - switch (cmd) { - case "insert": //등록 - //유효성 확인 - //2020.11.24. 주석처리 - beanValidator.validate(vo, bindingResult); -// beanValidator.validate("authorManage", vo, bindingResult); - if (bindingResult.hasErrors()) { - message = xitMessageSource.getMessage("fail.common.insert"); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthRegMng_input.do"; - break; - } - //처리 - try { - service.addProc(vo); - status.setComplete(); - message = xitMessageSource.getMessage("success.common.insert"); - } catch (RuntimeException e) { - message = e.getMessage(); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthRegMng_input.do"; - } catch (Exception e) { - message = xitMessageSource.getMessage("fail.common.insert"); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthRegMng_input.do"; - } - break; - -// case "inserts": //다건 등록 -// break; - - case "update": //수정 - //유효성 확인 - //2020.11.24. 주석처리 - beanValidator.validate(vo, bindingResult); -// beanValidator.validate("authorManage", vo, bindingResult); - if (bindingResult.hasErrors()) { - message = xitMessageSource.getMessage("fail.common.update"); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthRegMng_edit.do"; - break; - } - //처리 - try { - service.modifyProc(vo); - status.setComplete(); - message = xitMessageSource.getMessage("success.common.update"); - } catch (RuntimeException e) { - message = e.getMessage(); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthRegMng_edit"; - } catch (Exception e) { - message = xitMessageSource.getMessage("fail.common.update"); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthRegMng_edit"; - } - break; - - case "delete": //삭제 - //처리 - try { - service.removeProc(vo); - status.setComplete(); - message = xitMessageSource.getMessage("success.common.delete"); - break; - } catch (RuntimeException e) { - message = e.getMessage(); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthRegMng_edit"; - } catch (Exception e) { - message = xitMessageSource.getMessage("fail.common.delete"); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthRegMng_edit"; - } - break; - - case "deletes": //다건 삭제 - //처리 - try { - service.removesProc(authorCodes); - status.setComplete(); - message = xitMessageSource.getMessage("success.common.delete"); - } catch (RuntimeException e) { - message = e.getMessage(); - } catch (Exception e) { - message = xitMessageSource.getMessage("fail.common.delete"); - } - break; - - - case "insertRoleGrant": //등록 권한롤부여 - //처리 - sLocationUrl = "forward:/framework/biz/mng/auth/AuthRegMng_rolegrant_popup"; - try { - service.addAuthorRole(authorCode, roleCodes.split(";"), regYns.split(";")); - status.setComplete(); - model.addAttribute("message", xitMessageSource.getMessage("success.common.insert")); - } catch (RuntimeException e) { - message = e.getMessage(); - } catch (Exception e) { - message = xitMessageSource.getMessage("fail.common.insert"); - } - break; - - default: - new RuntimeException("유효하지 않은 요청 입니다."); - } - - - - /** - * 응답 설정 - */ - /* ============================ - * 2020.09.10 박민규 - * 서버 호출 방식에 관계 없이 응답처리가 가능하도록 개선 - * -기존 호출방식도 유지하며 ajax로 서버호출 시 json 으로 응답처리가 가능하도록 개선 - * [AS-IS] 반환타입 String, return url에 "forward"구문으로 처리 - * [TO-BE] 반환타입 void, DispatchServlet으로 forward 처리, ajax 호출인 경우 json응답처리 서비스로 forward - ============================ */ - //2020.09.10 주석처리 -// model.addAttribute("message", message); -// return sLocationUrl; - model.addAttribute("message", message); - if(AjaxUtils.isAjaxRequest(request)){ //ajax 요청시 - //반환 데이터 설정 - Map resultMap = new HashMap(); - resultMap.put("message", message); - XitCmmnUtil.forwardForAjaxRequest(request, response, resultMap); - }else { //submit 요청 시 - XitCmmnUtil.forwardForSubmitRequest(request, response, sLocationUrl, model.asMap()); - } - } - - - - - } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthGrpMgtController.java b/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthGrpMgtController.java index a214faa7..0b29e527 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthGrpMgtController.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthGrpMgtController.java @@ -44,6 +44,7 @@ import kr.xit.framework.support.util.AjaxMessageMapRenderer; import kr.xit.framework.support.util.AjaxUtils; import kr.xit.framework.support.util.Checks; import kr.xit.framework.support.util.constants.MessageKey; +import lombok.AllArgsConstructor; /** * @@ -55,19 +56,12 @@ import kr.xit.framework.support.util.constants.MessageKey; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ +@AllArgsConstructor @Controller @RequestMapping("/framework/biz/mng/auth") public class AuthGrpMgtController { - - @Resource - private AuthGrpMgtService service; - @Resource - private XitFrameCrudService xitFrameCrudService; - @Autowired - private XitBeanValidator beanValidator; - @Resource(name = "xitMessageSource") - XitMessageSource xitMessageSource; - + + private final AuthGrpMgtService service; /** * 
메소드 설명: 사용자그룹관리 목록 페이지
@@ -133,285 +127,4 @@ public class AuthGrpMgtController { AjaxMessageMapRenderer.success(mav, MessageKey.CMM_DELETE_SUCCESS); return mav; } - - - - - - - - - - - - - - - - - - - - /** - * 
메소드 설명: 사용자 그룹관리 목록 페이지 조회
- * @return String 요청처리 후 응답객체 - * @author: 김동규 - * @date: 2020. 7. 31. - */ - @RequestMapping(value = "AuthGrpMng_list.ajax", method={RequestMethod.GET, RequestMethod.POST}) - @ResponseBody - public Map AuthGrpMng_listAjax(@ModelAttribute("groupManageVO") XitAuthGrpMngSearchVO searchVO, ModelMap model) { - - /** paging */ - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); - paginationInfo.setPageSize(searchVO.getPageSize()); - searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); - searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - Map resultMap = new HashMap(); - try { - /** - * 조회 - */ - int totCnt = service.findListTotCnt(searchVO); - paginationInfo.setTotalRecordCount(totCnt); - /** - * 반환값 설정 - */ - /* *************************** - * tui Grid Response Set - *************************** */ - resultMap.put("result", true); //[tui Grid] result - resultMap.put("message", xitMessageSource.getMessage("success.common.select")); //[tui Grid] result message - Map data = new HashMap(); - data.put("contents", service.findList(searchVO)); //[tui Grid] data-contents - Map pagination = new HashMap(); - pagination.put("page", searchVO.getPage()); - pagination.put("totalCount", totCnt); - data.put("pagination", pagination); //[tui Grid] data-paging - resultMap.put("data", data); //[tui Grid] data - /* *************************** - * //tui Grid Response Set - *************************** */ - } catch (Exception e) { - /** - * 반환값 설정 - */ - //tui Grid Response Set - resultMap.put("result", false); //[tui Grid] result - resultMap.put("message", xitMessageSource.getMessage("fail.common.select")); //[tui Grid] result message - } - - return resultMap; - } - - - /** - * 
메소드 설명: 요청 페이지로 이동 한다.
- * @param cmd - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) - * @param model - * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - @RequestMapping(value = "AuthGrpMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) - public String AuthGrpMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef - , @ModelAttribute("groupManageVO") XitAuthGrpMngVO vo - , @ModelAttribute("groupManageSearchVO") XitAuthGrpMngSearchVO searchVO - , ModelMap model) { - - /** - * 코드 조회 - */ - //권한 목록 조회 - XitAuthorInfoVO authorInfoVO = new XitAuthorInfoVO(); - List listAuthorInfoVO = xitFrameCrudService.findXitAuthorInfos(authorInfoVO); - model.addAttribute("listAuthorInfoVO", listAuthorInfoVO); - - switch (cmd) { - case "input": //등록 페이지 - break; - case "edit": //수정 페이지 - case "view": //상세 페이지 - model.addAttribute("groupManage", service.findView(vo)); - model.addAttribute("message", xitMessageSource.getMessage("success.common.select")); - break; - default: - throw new RuntimeException("유효하지 않은 요청 입니다."); - } - - - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/XitAuthGrpMng_"+cmd+tilesDef; - - } - - - /** - * 
메소드 설명: 요청 팝업 페이지 이동 한다.
- * @param cmd - * @param model - * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - @RequestMapping(value = "AuthGrpMng_{cmd}_popup", method={RequestMethod.GET, RequestMethod.POST}) - public String AuthGrpMng_page_popup( - @PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef - , @ModelAttribute("groupManageVO") XitAuthGrpMngVO vo - , @ModelAttribute("groupManageSearchVO") XitAuthGrpMngSearchVO searchVO - , ModelMap model) { - switch (cmd) { - case "": // - break; - default: - throw new RuntimeException("유효하지 않은 요청 입니다."); - } - - - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/grp/XitAuthGrpMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); - } - - - - /** - * 
메소드 설명: 사용자그룹관리 CUD 처리
- * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @throws IOException - * @throws ServletException - * @date: 2020. 4. 16. - */ - @RequestMapping(value = "AuthGrpMng_{cmd}_proc", method=RequestMethod.POST) - public void AuthGrpMng_cmd_proc(@PathVariable String cmd - ,@ModelAttribute("groupManageVO") XitAuthGrpMngVO vo - ,@ModelAttribute("groupManageSearchVO") XitAuthGrpMngSearchVO searchVO - ,@RequestParam(value="groupIds", required=false, defaultValue="") String groupIds - ,BindingResult bindingResult - ,SessionStatus status - ,Model model - ,HttpServletRequest request - ,HttpServletResponse response - ) throws ServletException, IOException { - - /** - * 처리 분기 - */ - String sLocationUrl = "forward:/framework/biz/mng/auth/AuthGrpMng_list.do"; - String message = null; - switch (cmd) { - case "insert": //등록 - //유효성 확인 - beanValidator.validate(vo, bindingResult); - if (bindingResult.hasErrors()) { - message = xitMessageSource.getMessage("fail.common.insert"); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthGrpMng_input.do"; - break; - } - //처리 - try { - service.addProc(vo); - status.setComplete(); - message = xitMessageSource.getMessage("success.common.insert"); - model.addAttribute("groupId", vo.getGroupId()); - sLocationUrl = "redirect:/framework/biz/mng/auth/AuthGrpMng_edit.do"; - } catch (RuntimeException e) { - message = e.getMessage(); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthGrpMng_input.do"; - } catch (Exception e) { - message = xitMessageSource.getMessage("fail.common.insert"); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthGrpMng_input.do"; - } - break; - -// case "inserts": //다건 등록 -// break; - - case "update": //수정 - //유효성 확인 - beanValidator.validate(vo, bindingResult); - if (bindingResult.hasErrors()) { - message = xitMessageSource.getMessage("fail.common.update"); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthGrpMng_edit.do"; - break; - } - //처리 - try { - service.modifyProc(vo); - status.setComplete(); - message = xitMessageSource.getMessage("success.common.update"); - } catch (RuntimeException e) { - message = e.getMessage(); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthGrpMng_edit.do"; - } catch (Exception e) { - message = xitMessageSource.getMessage("fail.common.update"); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthGrpMng_edit.do"; - } - break; - - case "delete": //삭제 - //처리 - try { - service.removeProc(vo); - status.setComplete(); - message = xitMessageSource.getMessage("success.common.delete"); - break; - } catch (RuntimeException e) { - message = e.getMessage(); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthGrpMng_edit.do"; - } catch (Exception e) { - message = xitMessageSource.getMessage("fail.common.delete"); - sLocationUrl = "forward:/framework/biz/mng/auth/AuthGrpMng_edit.do"; - } - break; - - case "deletes": //다건 삭제 - //처리 - try { - service.removesProc(groupIds); - status.setComplete(); - message = xitMessageSource.getMessage("success.common.delete"); - } catch (RuntimeException e) { - message = e.getMessage(); - } catch (Exception e) { - message = xitMessageSource.getMessage("fail.common.delete"); - } - break; - - default: - new RuntimeException("유효하지 않은 요청 입니다."); - } - - - - /** - * 응답 설정 - */ - /* ============================ - * 2020.09.10 박민규 - * 서버 호출 방식에 관계 없이 응답처리가 가능하도록 개선 - * -기존 호출방식도 유지하며 ajax로 서버호출 시 json 으로 응답처리가 가능하도록 개선 - * [AS-IS] 반환타입 String, return url에 "forward"구문으로 처리 - * [TO-BE] 반환타입 void, DispatchServlet으로 forward 처리, ajax 호출인 경우 json응답처리 서비스로 forward - ============================ */ - //2020.09.10 주석처리 -// model.addAttribute("message", message); -// return sLocationUrl; - model.addAttribute("message", message); - if(AjaxUtils.isAjaxRequest(request)){ //ajax 요청시 - //반환 데이터 설정 - Map resultMap = new HashMap(); - resultMap.put("message", message); - XitCmmnUtil.forwardForAjaxRequest(request, response, resultMap); - }else { //submit 요청 시 - XitCmmnUtil.forwardForSubmitRequest(request, response, sLocationUrl, model.asMap()); - } - } } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthUserMgtController.java b/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthUserMgtController.java index 2ebdb479..923275d8 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthUserMgtController.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthUserMgtController.java @@ -44,6 +44,7 @@ import kr.xit.framework.support.mybatis.MybatisUtils; import kr.xit.framework.support.util.AjaxMessageMapRenderer; import kr.xit.framework.support.util.AjaxUtils; import kr.xit.framework.support.util.constants.MessageKey; +import lombok.AllArgsConstructor; /** * @@ -55,18 +56,12 @@ import kr.xit.framework.support.util.constants.MessageKey; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ +@AllArgsConstructor @Controller @RequestMapping("/framework/biz/mng/auth") public class AuthUserMgtController { - @Resource - private AuthUserMgtService service; - @Resource - private XitFrameCrudService xitFrameCrudService; - @Autowired - private XitBeanValidator beanValidator; - @Resource(name = "xitMessageSource") - XitMessageSource xitMessageSource; + private final AuthUserMgtService service; /** @@ -104,275 +99,4 @@ public class AuthUserMgtController { AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); return mav; } - - - - - - - - - - - - - - - - - /** - * 
메소드 설명: 사용자별 권한관리 목록 페이지 조회
- * @return String 요청처리 후 응답객체 - * @author: 최유수 - * @date: 2020. 8.04. - */ - @RequestMapping(value = "AuthUsrMng_list.ajax", method={RequestMethod.GET, RequestMethod.POST}) - @ResponseBody - public Map AuthUsrMng_listAjax(@ModelAttribute("authorGroupVO") XitAuthUsrMngSearchVO searchVO, ModelMap model) { - - /** paging */ - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); - paginationInfo.setPageSize(searchVO.getPageSize()); - searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); - searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - Map resultMap = new HashMap(); - try { - /** - * 조회 - */ - int totCnt = service.findListTotCnt(searchVO); - paginationInfo.setTotalRecordCount(totCnt); - /** - * 반환값 설정 - */ - /* *************************** - * tui Grid Response Set - *************************** */ - resultMap.put("result", true); //[tui Grid] result - resultMap.put("message", xitMessageSource.getMessage("success.common.select")); //[tui Grid] result message - Map data = new HashMap(); - data.put("contents", service.findList(searchVO)); //[tui Grid] data-contents - Map pagination = new HashMap(); - pagination.put("page", searchVO.getPage()); - pagination.put("totalCount", totCnt); - data.put("pagination", pagination); //[tui Grid] data-paging - resultMap.put("data", data); //[tui Grid] data - /* *************************** - * //tui Grid Response Set - *************************** */ - } catch (Exception e) { - /** - * 반환값 설정 - */ - //tui Grid Response Set - resultMap.put("result", false); //[tui Grid] result - resultMap.put("message", xitMessageSource.getMessage("fail.common.select")); //[tui Grid] result message - } - - return resultMap; - } - - - - /** - * 
메소드 설명: 요청 페이지로 이동 한다.
- * @param cmd - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) - * @param model - * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - @RequestMapping(value = "AuthUsrMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) - public String AuthUsrMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef - , @ModelAttribute("authorGroupVO") XitAuthUsrMngVO vo - , @ModelAttribute("authorGroupSearchVO") XitAuthUsrMngSearchVO searchVO - , ModelMap model) { - switch (cmd) { - case "": - break; -// case "input": //등록 페이지 -// case "edit": //수정 페이지 -// case "view": //상세 페이지 -// break; - default: - throw new RuntimeException("유효하지 않은 요청 입니다."); - } - - - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/XitAuthUsrMng_"+cmd+tilesDef; - - } - - - /** - * 
메소드 설명: 요청 팝업 페이지 이동 한다.
- * @param cmd - * @param model - * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - @RequestMapping(value = "AuthUsrMng_{cmd}_popup", method={RequestMethod.GET, RequestMethod.POST}) - public String AuthUsrMng_page_popup(@PathVariable String cmd - , @ModelAttribute XitAuthUsrMngSearchVO searchVO - , @ModelAttribute XitAuthUsrMngVO vo, ModelMap model) { - switch (cmd) { - case "groupsearch": //그룹조회 팝업 - /** paging */ - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(searchVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(searchVO.getPageUnit()); - paginationInfo.setPageSize(searchVO.getPageSize()); - - List> list = new ArrayList>(); - int totCnt = 0; - - searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); - searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - list = service.findListGroup(searchVO); - - totCnt = service.findListGroupTotCnt(searchVO); - - paginationInfo.setTotalRecordCount(totCnt); - model.addAttribute("groupList", list); - model.addAttribute("paginationInfo", paginationInfo); - model.addAttribute("message", xitMessageSource.getMessage("success.common.select")); - break; - default: - throw new RuntimeException("유효하지 않은 요청 입니다."); - } - - - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/XitAuthUsrMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); - } - - - - - /** - * 
메소드 설명: 사용자별권한관리 CUD 처리
- * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @throws IOException - * @throws ServletException - * @date: 2020. 4. 16. - */ - @RequestMapping(value = "AuthUsrMng_{cmd}_proc", method=RequestMethod.POST) - public void AuthUsrMng_cmd_proc(@PathVariable String cmd - ,@ModelAttribute("authorGroupVO") XitAuthUsrMngVO vo - ,@ModelAttribute("authorGroupSearchVO") XitAuthUsrMngSearchVO searchVO - ,@RequestParam(value="userIds", required=false, defaultValue="") String userIds - ,@RequestParam(value="authorCodes", required=false, defaultValue="") String authorCodes - ,@RequestParam(value="regYns", required=false, defaultValue="") String regYns - ,@RequestParam(value="mberTyCodes", required=false, defaultValue="") String mberTyCodes - ,@RequestParam(value="groupIds", required=false, defaultValue="") String groupIds - ,BindingResult bindingResult - ,SessionStatus status - ,Model model - ,HttpServletRequest request - ,HttpServletResponse response - ) throws ServletException, IOException { - - /** - * 처리 분기 - */ - String sLocationUrl = "forward:/framework/biz/mng/auth/AuthUsrMng_list"; - String message = null; - switch (cmd) { - case "insert": //등록 - //유효성 확인 - beanValidator.validate(vo, bindingResult); - if (bindingResult.hasErrors()) { - message = xitMessageSource.getMessage("fail.common.insert"); -// sLocationUrl = "forward:/framework/biz/mng/auth/AuthUsrMng_input"; - break; - } - //처리 - try { - String [] strUserIds = userIds.split(";"); - String [] strAuthorCodes = authorCodes.split(";"); - String [] strRegYns = regYns.split(";"); - String [] strMberTyCode = mberTyCodes.split(";"); - - for(int i=0; i resultMap = new HashMap(); - resultMap.put("message", message); - XitCmmnUtil.forwardForAjaxRequest(request, response, resultMap); - }else { //submit 요청 시 - XitCmmnUtil.forwardForSubmitRequest(request, response, sLocationUrl, model.asMap()); - } - } } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/web/XitLoginPolicyMngController.java b/src/main/java/kr/xit/framework/biz/mng/auth/web/XitLoginPolicyMngController.java index 69a9baf1..9d1461ab 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/web/XitLoginPolicyMngController.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/web/XitLoginPolicyMngController.java @@ -50,7 +50,6 @@ import kr.xit.framework.biz.mng.auth.service.XitLoginPolicyMngService; public class XitLoginPolicyMngController { private final XitLoginPolicyMngService xitLoginPolicyMngService; - private final XitFrameCodeService xitFrameCodeService; private final XitBeanValidator beanValidator; private final XitMessageSource xitMessageSource; diff --git a/src/main/resources/sqlmapper/framework/mng/auth/auth-author-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/auth/auth-author-mysql-mapper.xml index 3cf6b939..c337402f 100644 --- a/src/main/resources/sqlmapper/framework/mng/auth/auth-author-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/mng/auth/auth-author-mysql-mapper.xml @@ -162,70 +162,4 @@ - - - - - - - - - - - - - - - - - - - - - - SELECT A.ROLE_CODE AS "roleCode" - ,A.ROLE_NM AS "roleNm" - ,A.ROLE_PTTRN AS "rolePtn" - ,A.ROLE_DC AS "roleDc" - ,A.ROLE_TY AS "roleTyp" - ,A.ROLE_SORT AS "roleSort" - ,B.AUTHOR_CODE AS "authorCode" - ,B.CREAT_DT AS "creatDt" - ,(CASE WHEN B.ROLE_CODE IS NULL THEN 'N' ELSE 'Y' END) AS "regYn" - - - FROM XIT_ROLE_INFO A - LEFT OUTER JOIN ( SELECT AUTHOR_CODE, ROLE_CODE, CREAT_DT - FROM XIT_AUTHOR_ROLE_RELATE - WHERE AUTHOR_CODE = #{searchKeyword} - ) B ON A.ROLE_CODE = B.ROLE_CODE - - - - - - - - - - diff --git a/src/main/resources/sqlmapper/framework/mng/auth/auth-grp-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/auth/auth-grp-mysql-mapper.xml index a6efd813..70f6a9d4 100644 --- a/src/main/resources/sqlmapper/framework/mng/auth/auth-grp-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/mng/auth/auth-grp-mysql-mapper.xml @@ -67,92 +67,4 @@ WHERE group_id = #{groupId} - - - - - - - - - - - - - - - - - - - - - SELECT LIST.* FROM( - - - - ) LIST LIMIT #{firstIndex}, #{recordCountPerPage} - - - - - SELECT A.GROUP_ID AS "groupId" - ,A.GROUP_NM AS "groupNm" - ,A.GROUP_DC AS "groupDc" - ,A.GROUP_CREAT_DE AS "groupCreatDe" - ,A.AUTHOR_CODE AS "authorCode" - ,(SELECT SA.AUTHOR_NM FROM XIT_AUTHOR_INFO SA WHERE SA.AUTHOR_CODE=A.AUTHOR_CODE) AS "authorNm" - - - FROM XIT_AUTHOR_GROUP_INFO A - - - - AND A.GROUP_NM LIKE CONCAT('%',#{searchKeyword},'%') - - - - - - - - - - - - - - - - - diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthUserMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthUserMgtForm.jsp index 0733c3ad..0fe5ef9d 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthUserMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthUserMgtForm.jsp @@ -60,6 +60,11 @@ ======================== */ add : function(){ const arrDatas = fnBiz.getCheckedList(); + if(arrDatas.length === 0) { + alert("목록을 선택해 주세요."); + return false; + } + if(confirm("권한을 등록 하시겠습니까?")) { cmmAjax({ @@ -78,6 +83,10 @@ ,remove : function(){ const arrDatas = fnBiz.getCheckedList(); + if(arrDatas.length === 0) { + alert("목록을 선택해 주세요."); + return false; + } if(confirm("권한을 취소 하시겠습니까?")) { cmmAjax({ @@ -94,11 +103,6 @@ ,getCheckedList: ()=>{ const arrChecks = GRID.getCheckedRows(); - if(arrChecks.length === 0) { - alert("목록을 선택해 주세요."); - return false; - } - return arrChecks.map((row) => { return { uniqId: row.uniqId