From d944e67947188bd0d2c9321e857a7db87d6f752e Mon Sep 17 00:00:00 2001 From: minuk926 Date: Fri, 4 Nov 2022 11:51:30 +0900 Subject: [PATCH 01/13] =?UTF-8?q?fix:=20=ED=94=84=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EB=9E=A8=EA=B4=80=EB=A6=AC=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/biz/mng/menu/mngProgramMgtPopup.jsp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtPopup.jsp index 2608c9be..b033140a 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtPopup.jsp @@ -6,12 +6,13 @@ <%--@elvariable id="progrmMngVO" type=""--%> +

- + 프로그램 정보 @@ -31,15 +32,7 @@ - - - - - - - - - + @@ -76,7 +69,7 @@

- + 변경 삭제 From 4a7067f0788af026be047e96e27f27e4f18c1448 Mon Sep 17 00:00:00 2001 From: minuk926 Date: Fri, 4 Nov 2022 21:30:50 +0900 Subject: [PATCH 02/13] =?UTF-8?q?feat:=20=EA=B6=8C=ED=95=9C=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EC=A7=84=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/cmm/model/XitAuthorInfoVO.java | 47 +-- .../biz/cmm/model/XitRoleInfoVO.java | 16 +- .../biz/cmm/model/XitRoleSclsrtRescueVO.java | 30 +- .../service/impl/XitFrameCrudServiceImpl.java | 24 +- .../service/impl/XitFrameUnitServiceImpl.java | 10 +- ...gtMapper.java => AuthAuthorMgtMapper.java} | 51 +++- ...Service.java => AuthAuthorMgtService.java} | 56 +++- ...mpl.java => AuthAuthorMgtServiceImpl.java} | 139 ++++++--- .../impl/AuthHierarchyMgtServiceImpl.java | 32 +- ...ller.java => AuthAuthorMgtController.java} | 284 ++++++++---------- .../auth/web/AuthHierarchyMgtController.java | 6 +- .../cmm/XitFrameCrud-mysql-mapper.xml | 30 +- .../cmm/XitFrameCrud-oracle-mapper.xml | 30 +- .../mng/auth/XitAuthRegMng-oracle-mapper.xml | 139 --------- .../mng/auth/auth-author-mysql-mapper.xml | 231 ++++++++++++++ .../framework/mng/auth/auth-mysql-mapper.xml | 207 ------------- .../biz/mng/auth/XitAuthRegMng_list.jsp | 2 +- .../auth/XitAuthRegMng_rolegrant_popup.jsp | 4 +- ...thMgtForm.jsp => mngAuthAuthorMgtForm.jsp} | 85 +++--- ...MgtPopup.jsp => mngAuthAuthorMgtPopup.jsp} | 0 .../biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp | 266 ++++++++++++++++ .../biz/mng/auth/mngAuthRoleMgtForm.jsp | 6 +- .../resources/framework/js/cmm/XitCmmnUtil.js | 1 + .../resources/framework/js/cmm/cmmUtil.js | 2 + .../framework/js/cmm/xit-tui-grid.js | 16 +- 25 files changed, 963 insertions(+), 751 deletions(-) rename src/main/java/kr/xit/framework/biz/mng/auth/mapper/{AuthMgtMapper.java => AuthAuthorMgtMapper.java} (62%) rename src/main/java/kr/xit/framework/biz/mng/auth/service/{AuthMgtService.java => AuthAuthorMgtService.java} (73%) rename src/main/java/kr/xit/framework/biz/mng/auth/service/impl/{AuthMgtServiceImpl.java => AuthAuthorMgtServiceImpl.java} (63%) rename src/main/java/kr/xit/framework/biz/mng/auth/web/{AuthMgtController.java => AuthAuthorMgtController.java} (58%) delete mode 100644 src/main/resources/sqlmapper/framework/mng/auth/XitAuthRegMng-oracle-mapper.xml create mode 100644 src/main/resources/sqlmapper/framework/mng/auth/auth-author-mysql-mapper.xml delete mode 100644 src/main/resources/sqlmapper/framework/mng/auth/auth-mysql-mapper.xml rename src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/{mngAuthMgtForm.jsp => mngAuthAuthorMgtForm.jsp} (67%) rename src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/{mngAuthMgtPopup.jsp => mngAuthAuthorMgtPopup.jsp} (100%) create mode 100644 src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp diff --git a/src/main/java/kr/xit/framework/biz/cmm/model/XitAuthorInfoVO.java b/src/main/java/kr/xit/framework/biz/cmm/model/XitAuthorInfoVO.java index 7db8f3a0..fa9c7d5d 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/model/XitAuthorInfoVO.java +++ b/src/main/java/kr/xit/framework/biz/cmm/model/XitAuthorInfoVO.java @@ -1,6 +1,12 @@ package kr.xit.framework.biz.cmm.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 XitAuthorInfoVO extends BaseVO { /** @@ -19,35 +31,8 @@ public class XitAuthorInfoVO extends BaseVO { */ private static final long serialVersionUID = 4982342550430087973L; - protected String author_code; //권한 코드 - protected String author_nm; //권한 명 - protected String author_dc; //권한 설명 - protected String author_creat_de; //권한 생성 일 - - public String getAuthor_code() { - return author_code; - } - public void setAuthor_code(String author_code) { - this.author_code = author_code; - } - public String getAuthor_nm() { - return author_nm; - } - public void setAuthor_nm(String author_nm) { - this.author_nm = author_nm; - } - public String getAuthor_dc() { - return author_dc; - } - public void setAuthor_dc(String author_dc) { - this.author_dc = author_dc; - } - public String getAuthor_creat_de() { - return author_creat_de; - } - public void setAuthor_creat_de(String author_creat_de) { - this.author_creat_de = author_creat_de; - } - - + protected String authorCode; //권한 코드 + protected String authorNm; //권한 명 + protected String authorDc; //권한 설명 + protected String authorCreatDe; //권한 생성 일 } diff --git a/src/main/java/kr/xit/framework/biz/cmm/model/XitRoleInfoVO.java b/src/main/java/kr/xit/framework/biz/cmm/model/XitRoleInfoVO.java index 4888a25b..3e6938e1 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/model/XitRoleInfoVO.java +++ b/src/main/java/kr/xit/framework/biz/cmm/model/XitRoleInfoVO.java @@ -30,12 +30,14 @@ public class XitRoleInfoVO extends BaseVO { */ private static final long serialVersionUID = -2397747474398186436L; - protected String roleCode; //역할 코드 - protected String roleNm; //역할 명 - protected String rolePttrn; //역할 패턴 - protected String roleDc; //역할 설명 - protected String roleTy; //역할 유형 - protected String roleSort; //역할 정렬 - protected String roleCreatDe; //역할 생성 일 + private String roleCode; //역할 코드 + private String roleNm; //역할 명 + private String rolePttrn; //역할 패턴 + private String roleDc; //역할 설명 + private String roleTy; //역할 유형 + private String roleSort; //역할 정렬 + private String roleCreatDe; //역할 생성 일 + private String regYn; // 권한 롤 등록여부 : xit_author_role_relate + private String creatDt; // 권한롤 등록일 } diff --git a/src/main/java/kr/xit/framework/biz/cmm/model/XitRoleSclsrtRescueVO.java b/src/main/java/kr/xit/framework/biz/cmm/model/XitRoleSclsrtRescueVO.java index bf45197f..1e0d6da3 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/model/XitRoleSclsrtRescueVO.java +++ b/src/main/java/kr/xit/framework/biz/cmm/model/XitRoleSclsrtRescueVO.java @@ -1,6 +1,12 @@ package kr.xit.framework.biz.cmm.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 XitRoleSclsrtRescueVO extends BaseVO { /** * serialVersionUID @@ -19,20 +31,6 @@ public class XitRoleSclsrtRescueVO extends BaseVO { private static final long serialVersionUID = 8476668045494460949L; - protected String parnts_role; //부모 역할 - protected String chldrn_role; //자식 역할 - - - public String getParnts_role() { - return parnts_role; - } - public void setParnts_role(String parnts_role) { - this.parnts_role = parnts_role; - } - public String getChldrn_role() { - return chldrn_role; - } - public void setChldrn_role(String chldrn_role) { - this.chldrn_role = chldrn_role; - } + protected String parntsRole; //부모 역할 + protected String chldrnRole; //자식 역할 } diff --git a/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameCrudServiceImpl.java b/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameCrudServiceImpl.java index 53b0150d..79c173b4 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameCrudServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameCrudServiceImpl.java @@ -258,7 +258,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getAuthor_code())) + if(XitCmmnUtil.isEmpty(vo.getAuthorCode())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -289,7 +289,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getAuthor_code())) + if(XitCmmnUtil.isEmpty(vo.getAuthorCode())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -322,7 +322,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getAuthor_code())) + if(XitCmmnUtil.isEmpty(vo.getAuthorCode())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -355,7 +355,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getAuthor_code())) + if(XitCmmnUtil.isEmpty(vo.getAuthorCode())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -3733,9 +3733,9 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getParnts_role())) + if(XitCmmnUtil.isEmpty(vo.getParntsRole())) emsg = String.format("(%s)부모역할(은)는 필수조건 입니다.", table); - if(XitCmmnUtil.isEmpty(vo.getChldrn_role())) + if(XitCmmnUtil.isEmpty(vo.getChldrnRole())) emsg = String.format("(%s)자식역할(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -3766,9 +3766,9 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getParnts_role())) + if(XitCmmnUtil.isEmpty(vo.getParntsRole())) emsg = String.format("(%s)부모역할(은)는 필수조건 입니다.", table); - if(XitCmmnUtil.isEmpty(vo.getChldrn_role())) + if(XitCmmnUtil.isEmpty(vo.getChldrnRole())) emsg = String.format("(%s)자식역할(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -3801,9 +3801,9 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getParnts_role())) + if(XitCmmnUtil.isEmpty(vo.getParntsRole())) emsg = String.format("(%s)부모역할(은)는 필수조건 입니다.", table); - if(XitCmmnUtil.isEmpty(vo.getChldrn_role())) + if(XitCmmnUtil.isEmpty(vo.getChldrnRole())) emsg = String.format("(%s)자식역할(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -3836,9 +3836,9 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getParnts_role())) + if(XitCmmnUtil.isEmpty(vo.getParntsRole())) emsg = String.format("(%s)부모역할(은)는 필수조건 입니다.", table); - if(XitCmmnUtil.isEmpty(vo.getChldrn_role())) + if(XitCmmnUtil.isEmpty(vo.getChldrnRole())) emsg = String.format("(%s)자식역할(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); diff --git a/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java b/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java index 62a75c21..2ee40f9a 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java @@ -572,7 +572,7 @@ public class XitFrameUnitServiceImpl implements XitFrameUnitService { boolean isExists = false; //사용자 권한과 매칭되는 역할(권한)계층정보 유무 확인 for(XitRoleSclsrtRescueVO item : listRoleSclsrtRescueVO) { - if(item.getParnts_role().equals(userAuthorCode)) { + if(item.getParntsRole().equals(userAuthorCode)) { isExists = true; break; } @@ -580,7 +580,7 @@ public class XitFrameUnitServiceImpl implements XitFrameUnitService { //사용자 권한이 최상위 권한이면 true 반환 if(!isExists) for(XitRoleSclsrtRescueVO item : listRoleSclsrtRescueVO) { - if(item.getChldrn_role().equals(userAuthorCode)) { + if(item.getChldrnRole().equals(userAuthorCode)) { log.debug("This user is Top-Level Author !!"); return true; } @@ -622,13 +622,13 @@ public class XitFrameUnitServiceImpl implements XitFrameUnitService { if (result) break; // 권한코드가 일치하지 않으면 skip - if (!item.getParnts_role().equals(authorCode)) + if (!item.getParntsRole().equals(authorCode)) continue; - if (item.getChldrn_role().equals(highAuthorCode)) { // 상위 권한과 일치하면 + if (item.getChldrnRole().equals(highAuthorCode)) { // 상위 권한과 일치하면 result = true; } else { // 상위 권한과 일치하지 않으면 재호출 - result = this.isHighAuthor(list, item.getChldrn_role(), highAuthorCode); + result = this.isHighAuthor(list, item.getChldrnRole(), highAuthorCode); } } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthMgtMapper.java b/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthAuthorMgtMapper.java similarity index 62% rename from src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthMgtMapper.java rename to src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthAuthorMgtMapper.java index bd4d0578..53c06d10 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthMgtMapper.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/mapper/AuthAuthorMgtMapper.java @@ -4,9 +4,13 @@ import java.sql.SQLException; import java.util.List; import java.util.Map; +import org.apache.ibatis.session.RowBounds; + import egovframework.rte.psl.dataaccess.mapper.Mapper; +import kr.xit.framework.biz.cmm.model.XitAuthorInfoVO; +import kr.xit.framework.biz.cmm.model.XitRoleInfoVO; +import kr.xit.framework.biz.cmm.model.XitRoleSclsrtRescueVO; import kr.xit.framework.biz.mng.auth.model.XitAuthRegMngVO; -import kr.xit.framework.biz.mng.auth.model.XitAuthRegMngSearchVO; import kr.xit.framework.core.model.XitBaseSearchVO; /** @@ -20,26 +24,19 @@ import kr.xit.framework.core.model.XitBaseSearchVO; * @version 1.0 Copyright(c) XIT All rights reserved. */ @Mapper -public interface AuthMgtMapper { +public interface AuthAuthorMgtMapper { /** * 
메소드 설명: 권한관리 목록 조회
- * @param searchVO + * + * @param vo + * @param rowBounds * @return List 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 4. 16. */ - public List findList(XitAuthRegMngSearchVO searchVO) throws SQLException; - - /** - * 
메소드 설명: 권한관리 목록 총건수 조회
- * @param searchVO - * @return int 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public int findListTotCnt(XitAuthRegMngSearchVO searchVO) throws SQLException; + List selectAuthorInfos(Map vo, RowBounds rowBounds); /** * 
메소드 설명: 권한관리 상세정보 조회
@@ -48,9 +45,30 @@ public interface AuthMgtMapper { * @author: 박민규 * @date: 2020. 4. 16. */ - public XitAuthRegMngVO findView(XitAuthRegMngVO vo) throws SQLException; - - + XitAuthorInfoVO selectAuthorInfo(final String authorCode); + int insertAuthorInfo(final XitAuthorInfoVO vo); + int updateAuthorInfo(final XitAuthorInfoVO vo); + int deleteAuthorInfo(final String authorCode); + + + int insertRoleSclsrtRescue(final XitRoleSclsrtRescueVO vo); + int deleteRoleSclsrtRescue(final XitRoleSclsrtRescueVO vo); + + + List selectAuthRoleGrantList(Map paraMap); + int deleteRoleGrant(Map map); + int saveRoleGrant(Map map); + + + + + + + + + + + /** * 
메소드 설명: 권한롤관리 목록 조회
@@ -69,4 +87,5 @@ public interface AuthMgtMapper { */ public int findListAuthorRoleTotCnt(XitBaseSearchVO searchVO); + } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthMgtService.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthAuthorMgtService.java similarity index 73% rename from src/main/java/kr/xit/framework/biz/mng/auth/service/AuthMgtService.java rename to src/main/java/kr/xit/framework/biz/mng/auth/service/AuthAuthorMgtService.java index 30068523..762eff8f 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthMgtService.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/service/AuthAuthorMgtService.java @@ -3,6 +3,10 @@ package kr.xit.framework.biz.mng.auth.service; import java.util.List; import java.util.Map; +import org.apache.ibatis.session.RowBounds; + +import kr.xit.framework.biz.cmm.model.XitAuthorInfoVO; +import kr.xit.framework.biz.cmm.model.XitRoleInfoVO; import kr.xit.framework.biz.mng.auth.model.XitAuthRegMngSearchVO; import kr.xit.framework.biz.mng.auth.model.XitAuthRegMngVO; import kr.xit.framework.core.model.XitBaseSearchVO; @@ -17,7 +21,7 @@ import kr.xit.framework.core.model.XitBaseSearchVO; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ -public interface AuthMgtService { +public interface AuthAuthorMgtService { /** @@ -27,16 +31,7 @@ public interface AuthMgtService { * @author: 박민규 * @date: 2020. 4. 16. */ - public List findList(XitAuthRegMngSearchVO searchVO); - - /** - * 
메소드 설명: 권한관리 목록 총건수 조회
- * @param searchVO - * @return int 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - public int findListTotCnt(XitAuthRegMngSearchVO searchVO); + List findAuthAuthors(final Map paraMap, final RowBounds rowBounds); /** * 
메소드 설명: 권한관리 상세정보 조회
@@ -45,8 +40,36 @@ public interface AuthMgtService { * @author: 박민규 * @date: 2020. 4. 16. */ - public XitAuthRegMngVO findView(XitAuthRegMngVO vo); - + XitAuthorInfoVO findAuthAuthor(final String authorCode); + + void addAuthAuthor(final XitAuthorInfoVO vo); + void modifyAuthAuthor(final XitAuthorInfoVO vo); + void removeAuthAuthor(final String authorCode); + + + + + List findAuthRoleGrantList(Map paraMap); + void saveAuthRoleGrantList(Map paraMap); + + + + + + + + + + + + + + + + + + + /** * 
메소드 설명: 권한관리 등록
* @param vo void 요청처리 후 응답객체 @@ -89,7 +112,7 @@ public interface AuthMgtService { * @author: 박민규 * @date: 2020. 4. 16. */ - public List> findListAuthorRole(XitBaseSearchVO searchVO); + List> findListAuthorRole(XitBaseSearchVO searchVO); /** * 
메소드 설명: 권한롤관리 목록 조회 총 건수
* @param searchVO @@ -97,7 +120,7 @@ public interface AuthMgtService { * @author: 박민규 * @date: 2020. 4. 16. */ - public int findListAuthorRoleTotCnt(XitBaseSearchVO searchVO); + int findListAuthorRoleTotCnt(XitBaseSearchVO searchVO); /** * 
메소드 설명: 권한롤관리 등록
* @param authCode @@ -106,6 +129,7 @@ public interface AuthMgtService { * @author: 박민규 * @date: 2020. 4. 16. */ - public void addAuthorRole(String authCode, String[] trgetRoleCodes, String[] trgetRegYns); + void addAuthorRole(String authCode, String[] trgetRoleCodes, String[] trgetRegYns); + } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthMgtServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthAuthorMgtServiceImpl.java similarity index 63% rename from src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthMgtServiceImpl.java rename to src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthAuthorMgtServiceImpl.java index 19c415f8..c70827fd 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthMgtServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthAuthorMgtServiceImpl.java @@ -1,77 +1,124 @@ package kr.xit.framework.biz.mng.auth.service.impl; -import java.sql.SQLException; import java.util.List; import java.util.Map; +import java.util.Objects; import javax.annotation.Resource; +import org.apache.ibatis.session.RowBounds; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import kr.xit.framework.biz.cmm.model.XitAuthorInfoVO; import kr.xit.framework.biz.cmm.model.XitAuthorRoleRelateVO; +import kr.xit.framework.biz.cmm.model.XitRoleInfoVO; import kr.xit.framework.biz.cmm.model.XitRoleSclsrtRescueVO; import kr.xit.framework.biz.cmm.service.XitFrameCrudService; import kr.xit.framework.biz.cmm.service.XitFrameUnitService; -import kr.xit.framework.biz.mng.auth.mapper.AuthMgtMapper; +import kr.xit.framework.biz.mng.auth.mapper.AuthAuthorMgtMapper; import kr.xit.framework.biz.mng.auth.model.XitAuthRegMngVO; -import kr.xit.framework.biz.mng.auth.service.AuthMgtService; -import kr.xit.framework.biz.mng.auth.model.XitAuthRegMngSearchVO; +import kr.xit.framework.biz.mng.auth.service.AuthAuthorMgtService; import kr.xit.framework.core.model.XitBaseSearchVO; import kr.xit.framework.core.utils.XitCmmnUtil; @Service -public class AuthMgtServiceImpl implements AuthMgtService { - private static final Logger logger = LoggerFactory.getLogger(AuthMgtServiceImpl.class); +public class AuthAuthorMgtServiceImpl implements AuthAuthorMgtService { + private static final Logger logger = LoggerFactory.getLogger(AuthAuthorMgtServiceImpl.class); @Resource - private AuthMgtMapper xitAuthRegMngMapper; + private AuthAuthorMgtMapper mapper; @Resource private XitFrameCrudService xitFrameCrudService; @Resource private XitFrameUnitService xitFrameUnitService; /** 부모 권한코드 */ - final String PARNTS_AUTHOR = "ROLE_USER"; + final String PARNTS_AUTHOR = "ROLE_USER"; /** 자녀 권한코드 */ - final String CHLDRN_AUTHOR = "ROLE_ADMIN"; + final String CHLDRN_AUTHOR = "ROLE_ADMIN"; @Override - public List findList(XitAuthRegMngSearchVO searchVO) { - List result = null; - try { - result = xitAuthRegMngMapper.findList(searchVO); - } catch (SQLException e) { - throw new RuntimeException("권한관리 목록 조회 FAIL::", e); - } - return result; + public List findAuthAuthors(final Map paraMap, final RowBounds rowBounds) { + return mapper.selectAuthorInfos(paraMap, rowBounds); } @Override - public int findListTotCnt(XitAuthRegMngSearchVO searchVO) { - int result = 0; - try { - result = xitAuthRegMngMapper.findListTotCnt(searchVO); - } catch (SQLException e) { - throw new RuntimeException("권한관리 목록 총건수 조회 FAIL::", e); - } - return result; + public XitAuthorInfoVO findAuthAuthor(final String authorCode) { + return mapper.selectAuthorInfo(authorCode); } + /* ===================================================== + * 2020.05.21 박민규 + * 신규권한 등록프로세스 주석 및 수정 + * -사유: egovFrame의 권한계층은 부모~자녀 순으로 "익명사용자->사용자->관리자"로 기본제공 되며 + * 부모권한에 부여된 ROLE을 자녀가 상속받는 개념이다. + * 다만 기본제공되는 권한계층을 사용 시 카페의 "관리자>매니저>정회원>준회원>비회원"과 같은 권한계층 관리에 적합하기에 + * 업체별(또는 부서별)로 권한그룹을 별도 관리 해야하는 경우에 적합하지 않다. + * -작업내용: 기본제공되는 "익명사용자->사용자->관리자" 관리구조에서 사용자와 관리자 그룹 사이에 신규권한그룹을 삽입하여 + * "익명사용자->사용자->신규권한1/신규권한2/...->관리자"로 권한계층을 구성하여 + * n개의 신규그룹은 "사용자"에게서 기본적인 ROLE을 상속받고 + * n개의 신규그룹의 ROLE을 "관리자"가 상속받도록 한다. + * AS-IS: "익명사용자->사용자->관리자"의 권한계층에 삽입되지 않아 상위권한(PARENT)의 ROLE을 승계받지 못 함. + * TO-BE: "익명사용자->사용자->신규권한1/신규권한2/...->관리자"순의 상하관계를 가지게 되므로 신규권한그룹도 상위권한(PARENT)의 ROLE을 승계 받음. + ===================================================== */ + @Override - public XitAuthRegMngVO findView(XitAuthRegMngVO vo) { - XitAuthRegMngVO result = null; - try { - result = xitAuthRegMngMapper.findView(vo); - } catch (SQLException e) { - throw new RuntimeException("권한관리 상세정보 조회 FAIL::", e); - } - return result; + public void addAuthAuthor(final XitAuthorInfoVO vo){ + //권한정보 Insert + mapper.insertAuthorInfo(vo); + + //계층구조생성 + XitRoleSclsrtRescueVO roleSclsrtRescueVO = new XitRoleSclsrtRescueVO(); + //부모관계 생성 + roleSclsrtRescueVO.setParntsRole(PARNTS_AUTHOR); + roleSclsrtRescueVO.setChldrnRole(vo.getAuthorCode()); + mapper.insertRoleSclsrtRescue(roleSclsrtRescueVO); + //자녀관계 생성 + roleSclsrtRescueVO.setParntsRole(vo.getAuthorCode()); + roleSclsrtRescueVO.setChldrnRole(CHLDRN_AUTHOR); + mapper.insertRoleSclsrtRescue(roleSclsrtRescueVO); + } + + @Override + public void modifyAuthAuthor(final XitAuthorInfoVO vo){ + mapper.updateAuthorInfo(vo); + } + public void removeAuthAuthor(final String authorCode){ + //계층구조 삭제 + XitRoleSclsrtRescueVO roleSclsrtRescueVO = new XitRoleSclsrtRescueVO(); + roleSclsrtRescueVO.setParntsRole(PARNTS_AUTHOR); + roleSclsrtRescueVO.setChldrnRole(authorCode); + mapper.deleteRoleSclsrtRescue(roleSclsrtRescueVO); + //자녀관계 제거 + roleSclsrtRescueVO.setParntsRole(authorCode); + roleSclsrtRescueVO.setChldrnRole(CHLDRN_AUTHOR); + mapper.deleteRoleSclsrtRescue(roleSclsrtRescueVO); + + mapper.deleteAuthorInfo(authorCode); + } + + @Override + public List findAuthRoleGrantList(Map paraMap) { + return mapper.selectAuthRoleGrantList(paraMap); } + @Override + public void saveAuthRoleGrantList(final Map paraMap) { + List> mapList = (List>)paraMap.get("grantData"); + + mapList.forEach(map -> { + map.put("authorCode", paraMap.get("authorCode")); + if(Objects.equals(map.get("regYn"), "N")) + mapper.deleteRoleGrant(map); + else + mapper.saveRoleGrant(map); + }); + } + + @Override public void addProc(XitAuthRegMngVO vo) { /* ===================================================== @@ -113,12 +160,12 @@ public class AuthMgtServiceImpl implements AuthMgtService { try { XitRoleSclsrtRescueVO roleSclsrtRescueVO = new XitRoleSclsrtRescueVO(); //부모관계 생성 - roleSclsrtRescueVO.setParnts_role(PARNTS_AUTHOR); - roleSclsrtRescueVO.setChldrn_role(authorInfoVO.getAuthor_code()); + roleSclsrtRescueVO.setParntsRole(PARNTS_AUTHOR); + roleSclsrtRescueVO.setChldrnRole(authorInfoVO.getAuthorCode()); xitFrameCrudService.addXitRoleSclsrtRescue(roleSclsrtRescueVO); //자녀관계 생성 - roleSclsrtRescueVO.setParnts_role(authorInfoVO.getAuthor_code()); - roleSclsrtRescueVO.setChldrn_role(CHLDRN_AUTHOR); + roleSclsrtRescueVO.setParntsRole(authorInfoVO.getAuthorCode()); + roleSclsrtRescueVO.setChldrnRole(CHLDRN_AUTHOR); xitFrameCrudService.addXitRoleSclsrtRescue(roleSclsrtRescueVO); } catch (Exception e) { logger.debug(String.format("권한계층 Insert Fail : %s", e.getMessage())); @@ -177,12 +224,12 @@ public class AuthMgtServiceImpl implements AuthMgtService { try { XitRoleSclsrtRescueVO roleSclsrtRescueVO = new XitRoleSclsrtRescueVO(); //부모관계 제거 - roleSclsrtRescueVO.setParnts_role(PARNTS_AUTHOR); - roleSclsrtRescueVO.setChldrn_role(authorInfoVO.getAuthor_code()); + roleSclsrtRescueVO.setParntsRole(PARNTS_AUTHOR); + roleSclsrtRescueVO.setChldrnRole(authorInfoVO.getAuthorCode()); xitFrameCrudService.removeXitRoleSclsrtRescue(roleSclsrtRescueVO); //자녀관계 제거 - roleSclsrtRescueVO.setParnts_role(authorInfoVO.getAuthor_code()); - roleSclsrtRescueVO.setChldrn_role(CHLDRN_AUTHOR); + roleSclsrtRescueVO.setParntsRole(authorInfoVO.getAuthorCode()); + roleSclsrtRescueVO.setChldrnRole(CHLDRN_AUTHOR); xitFrameCrudService.removeXitRoleSclsrtRescue(roleSclsrtRescueVO); } catch (Exception e) { logger.debug(String.format("권한계층 Delete Fail : %s", e.getMessage())); @@ -211,12 +258,12 @@ public class AuthMgtServiceImpl implements AuthMgtService { @Override public List> findListAuthorRole(XitBaseSearchVO searchVO) { - return xitAuthRegMngMapper.findListAuthorRole(searchVO); + return mapper.findListAuthorRole(searchVO); } @Override public int findListAuthorRoleTotCnt(XitBaseSearchVO searchVO) { - return xitAuthRegMngMapper.findListAuthorRoleTotCnt(searchVO); + return mapper.findListAuthorRoleTotCnt(searchVO); } @Override @@ -263,9 +310,9 @@ public class AuthMgtServiceImpl implements AuthMgtService { */ private XitAuthorInfoVO convertToCrudVO(XitAuthRegMngVO vo) { XitAuthorInfoVO authorInfoVO = new XitAuthorInfoVO(); - authorInfoVO.setAuthor_code (vo.getAuthorCode()); //권한 코드 - authorInfoVO.setAuthor_nm (vo.getAuthorNm()); //권한 명 - authorInfoVO.setAuthor_dc (vo.getAuthorDc()); //권한 설명 + 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/AuthHierarchyMgtServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/auth/service/impl/AuthHierarchyMgtServiceImpl.java index dccf65cc..2ea51440 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 @@ -80,7 +80,7 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { return result; - String topButtonAuthorCode = this.getStrAuthHierarchy(listRoleSclsrtRescueVO.get(0).getChldrn_role()); + String topButtonAuthorCode = this.getStrAuthHierarchy(listRoleSclsrtRescueVO.get(0).getChldrnRole()); topButtonAuthorCode = topButtonAuthorCode.split(">")[0].trim(); String strAuthorRescueCode = this.getStrAuthHierarchy(topButtonAuthorCode); result.setAuthorRescueCode(strAuthorRescueCode); @@ -155,8 +155,8 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { for(int k=0; k it = resultMap.values().iterator(); // boolean isExists = false; // LOOP: @@ -335,7 +335,7 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { List listAuthorInfoVO = xitFrameCrudService.findXitAuthorInfos(new XitAuthorInfoVO()); Map mAuthorInfo = new HashMap(); for(XitAuthorInfoVO item : listAuthorInfoVO) { - mAuthorInfo.put(item.getAuthor_code(), item.getAuthor_nm()); + mAuthorInfo.put(item.getAuthorCode(), item.getAuthorNm()); } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthMgtController.java b/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthAuthorMgtController.java similarity index 58% rename from src/main/java/kr/xit/framework/biz/mng/auth/web/AuthMgtController.java rename to src/main/java/kr/xit/framework/biz/mng/auth/web/AuthAuthorMgtController.java index 878af288..215feddf 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthMgtController.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthAuthorMgtController.java @@ -11,28 +11,41 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.ui.ModelMap; 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.support.SessionStatus; +import org.springframework.web.servlet.ModelAndView; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kr.xit.framework.biz.cmm.model.XitAuthorInfoVO; +import kr.xit.framework.biz.cmm.model.XitRoleInfoVO; import kr.xit.framework.biz.mng.auth.model.XitAuthRegMngVO; -import kr.xit.framework.biz.mng.auth.service.AuthMgtService; +import kr.xit.framework.biz.mng.auth.service.AuthAuthorMgtService; import kr.xit.framework.biz.mng.auth.model.XitAuthRegMngSearchVO; import kr.xit.framework.core.constants.FrameworkConstants; import kr.xit.framework.core.constants.FrameworkConstants.TILES_TYPE; import kr.xit.framework.core.message.XitMessageSource; +import kr.xit.framework.core.model.ResultResponse; import kr.xit.framework.core.utils.XitCmmnUtil; import kr.xit.framework.core.validation.XitBeanValidator; +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.Checks; +import kr.xit.framework.support.util.ValidationError; +import kr.xit.framework.support.util.constants.MessageKey; /** * @@ -46,10 +59,10 @@ import kr.xit.framework.support.util.AjaxUtils; */ @Controller @RequestMapping("/framework/biz/mng/auth") -public class AuthMgtController { +public class AuthAuthorMgtController { @Resource - private AuthMgtService xitAuthRegMngService; + private AuthAuthorMgtService service; @Autowired private XitBeanValidator beanValidator; @Resource(name = "xitMessageSource") @@ -63,69 +76,123 @@ public class AuthMgtController { * @author: 박민규 * @date: 2020. 4. 16. */ - @RequestMapping(value = "/mngAuthMgtForm", method={RequestMethod.GET, RequestMethod.POST}) - public void mngAuthMgtForm() { + @RequestMapping(value = "/mngAuthAuthorMgtForm", method={RequestMethod.GET, RequestMethod.POST}) + public void mngAuthAuthorMgtForm() { } + + @RequestMapping(value = "/mngAuthAuthorMgtPopup") + public ModelAndView mngAuthAuthorMgtPopup(@ModelAttribute final XitAuthorInfoVO vo){ + ModelAndView mav = new ModelAndView(); + + if(Checks.isEmpty(vo)){ + mav.addObject("authorManage", new XitAuthorInfoVO()); + mav.addObject("pageTitle", "권한 등록"); + } else { + mav.addObject("authorManage", vo); + mav.addObject("pageTitle", "권한 변경"); + } + mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/mngAuthAuthorMgtPopup.popup"); + return mav; + } + /** * 
메소드 설명: 권한관리 목록 페이지 조회
* @return String 요청처리 후 응답객체 * @author: 김동규 * @date: 2020. 7. 30. */ - @RequestMapping(value = "AuthRegMng_list.ajax", method={RequestMethod.GET, RequestMethod.POST}) - @ResponseBody - public Map AuthRegMng_listAjax(@ModelAttribute("authorManageVO") XitAuthRegMngSearchVO 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 = xitAuthRegMngService.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", xitAuthRegMngService.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; + @GetMapping(value = "findAuthAuthors") + public ModelAndView findAuthAuthors(@RequestParam final Map paraMap) { + return ResultResponse.of(service.findAuthAuthors(paraMap, MybatisUtils.getPagingInfo(paraMap))); + } + + @PostMapping(value = "/addAuthAuthor") + public ModelAndView addAuthAuthor(@ModelAttribute final XitAuthorInfoVO vo, final BindingResult bindingResult){ + ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); + + ValidationError.of("", vo, bindingResult); + service.addAuthAuthor(vo); + AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); + return mav; + } + + @PostMapping(value = "/modifyAuthAuthor") + public ModelAndView modifyAuthAuthor(@ModelAttribute final XitAuthorInfoVO vo, final BindingResult bindingResult){ + ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); + + ValidationError.of("", vo, bindingResult); + service.modifyAuthAuthor(vo); + AjaxMessageMapRenderer.success(mav, MessageKey.CMM_UPDATE_SUCCESS); + return mav; + } + + @PostMapping(value = "/removeAuthAuthor") + public ModelAndView removeAuthAuthor(final String authorCode){ + ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); + + service.removeAuthAuthor(authorCode); + AjaxMessageMapRenderer.success(mav, MessageKey.CMM_DELETE_SUCCESS); + return mav; + } + + @RequestMapping(value = "/mngAuthRoleGrantMgtPopup") + public ModelAndView mngAuthRoleGrantMgtPopup(@RequestParam Map paraMap) { + ModelAndView mav = new ModelAndView(); + mav.addObject("authorRoleManageVO", paraMap); + mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/mngAuthRoleGrantMgtPopup.popup"); + return mav; } - + + + /** + * 
메소드 설명: 요청 팝업 페이지의 ajax 요청을 처리 한다.
+ * @param searchVO + * @param model + * @return String 요청처리 후 응답객체 + * @author: 박민규 + * @date: 2020. 4. 16. + */ + @GetMapping(value="/findAuthRoleGrantList") + public ModelAndView findAuthRoleGrantList(@RequestParam final Map paraMap) { + return ResultResponse.of(service.findAuthRoleGrantList(paraMap)); + } + + /** + * + * @param map authorCode and grantData array + * @return + */ + @PostMapping(value = "/saveAuthRoleGrantList") + public ModelAndView saveAuthRoleGrantList(@RequestBody final Map paraMap) { + ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); + + service.saveAuthRoleGrantList(paraMap); + AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); + return mav; + } + + + + + + + + + + + + + + + + + + + /** * 
메소드 설명: 요청 페이지로 이동 한다.
- * @param page + * @param cmd * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) * @param model * @return String 요청처리 후 응답객체 @@ -143,7 +210,7 @@ public class AuthMgtController { break; case "edit": //수정 페이지 case "view": //상세 페이지 - model.addAttribute("authorManage", xitAuthRegMngService.findView(vo)); + //model.addAttribute("authorManage", service.findView(vo)); model.addAttribute("message", xitMessageSource.getMessage("success.common.select")); break; default: @@ -156,103 +223,8 @@ public class AuthMgtController { return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/XitAuthRegMng_"+cmd+tilesDef; } - - /** - * 
메소드 설명: 요청 팝업 페이지 이동 한다.
- * @param page - * @param model - * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - @RequestMapping(value = "AuthRegMng_{cmd}_popup", method={RequestMethod.GET, RequestMethod.POST}) - public String AuthRegMng_page_popup(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef - , @ModelAttribute("authorManageSearchVO") XitAuthRegMngSearchVO searchVO - , @ModelAttribute("authorManageVO") XitAuthRegMngVO vo - , ModelMap model) { - switch (cmd) { - case "rolegrant": //권한롤부여 - model.addAttribute("authorRoleManageVO", searchVO); - break; - default: - throw new RuntimeException("유효하지 않은 요청 입니다."); - } - - - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/XitAuthRegMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); - } - - /** - * 
메소드 설명: 요청 팝업 페이지의 ajax 요청을 처리 한다.
- * @param searchVO - * @param modelMap - * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ - @RequestMapping(value="AuthRegMng_{cmd}_popup.ajax", method={RequestMethod.GET, RequestMethod.POST}) - @ResponseBody - public Map AuthRegMng_page_popupAjax(@PathVariable String cmd - , @ModelAttribute XitAuthRegMngSearchVO searchVO - , @ModelAttribute XitAuthRegMngVO vo, ModelMap model) { - - Map resultMap = new HashMap(); - switch (cmd) { - case "rolegrant": //권한롤부여 - - /** 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()); - try { - /** - * 조회 - */ - List> authorRoleList = xitAuthRegMngService.findListAuthorRole(searchVO); - int totCnt = xitAuthRegMngService.findListAuthorRoleTotCnt(searchVO); - - - - /** - * 반환값 설정 - */ - /* *************************** - * 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", authorRoleList); //[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 - } - break; - } - - - - return resultMap; - } @@ -296,7 +268,7 @@ public class AuthMgtController { } //처리 try { - xitAuthRegMngService.addProc(vo); + service.addProc(vo); status.setComplete(); message = xitMessageSource.getMessage("success.common.insert"); } catch (RuntimeException e) { @@ -323,7 +295,7 @@ public class AuthMgtController { } //처리 try { - xitAuthRegMngService.modifyProc(vo); + service.modifyProc(vo); status.setComplete(); message = xitMessageSource.getMessage("success.common.update"); } catch (RuntimeException e) { @@ -338,7 +310,7 @@ public class AuthMgtController { case "delete": //삭제 //처리 try { - xitAuthRegMngService.removeProc(vo); + service.removeProc(vo); status.setComplete(); message = xitMessageSource.getMessage("success.common.delete"); break; @@ -354,7 +326,7 @@ public class AuthMgtController { case "deletes": //다건 삭제 //처리 try { - xitAuthRegMngService.removesProc(authorCodes); + service.removesProc(authorCodes); status.setComplete(); message = xitMessageSource.getMessage("success.common.delete"); } catch (RuntimeException e) { @@ -369,7 +341,7 @@ public class AuthMgtController { //처리 sLocationUrl = "forward:/framework/biz/mng/auth/AuthRegMng_rolegrant_popup"; try { - xitAuthRegMngService.addAuthorRole(authorCode, roleCodes.split(";"), regYns.split(";")); + service.addAuthorRole(authorCode, roleCodes.split(";"), regYns.split(";")); status.setComplete(); model.addAttribute("message", xitMessageSource.getMessage("success.common.insert")); } catch (RuntimeException e) { 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 6252f2e2..4ccd04f5 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 @@ -166,7 +166,7 @@ public class AuthHierarchyMgtController { List listAuthorInfoVO = xitFrameCrudService.findXitAuthorInfos(new XitAuthorInfoVO()); Map mAuthorInfo = new HashMap(); for(XitAuthorInfoVO item : listAuthorInfoVO) { - mAuthorInfo.put(item.getAuthor_code(), item.getAuthor_nm()); + mAuthorInfo.put(item.getAuthorCode(), item.getAuthorNm()); } //권한코드 목록에서 비중복 권한만 추출 Map mNoDuplAuthorInfo = new HashMap(); @@ -187,8 +187,8 @@ public class AuthHierarchyMgtController { while(it.hasNext()) { String authorCode = it.next(); XitAuthorInfoVO authorInfo = new XitAuthorInfoVO(); - authorInfo.setAuthor_code(authorCode); - authorInfo.setAuthor_nm(mNoDuplAuthorInfo.get(authorCode)); + authorInfo.setAuthorCode(authorCode); + authorInfo.setAuthorNm(mNoDuplAuthorInfo.get(authorCode)); listAuthorInfo.add(authorInfo); } diff --git a/src/main/resources/sqlmapper/framework/cmm/XitFrameCrud-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/cmm/XitFrameCrud-mysql-mapper.xml index 58d1715e..7ace93c9 100644 --- a/src/main/resources/sqlmapper/framework/cmm/XitFrameCrud-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/cmm/XitFrameCrud-mysql-mapper.xml @@ -82,7 +82,9 @@ AND AUTHOR_CODE = #{author_code } AND AUTHOR_NM = #{author_nm } AND AUTHOR_DC = #{author_dc } - AND AUTHOR_CREAT_DE = #{author_creat_de} + AND AUTHOR_CREAT_DE = + #{authorCreatDe + /** addXitAuthorInfo */ @@ -116,17 +118,17 @@ UPDATE XIT_AUTHOR_INFO SET AUTHOR_CREAT_DE = AUTHOR_CREAT_DE - ,AUTHOR_NM = #{author_nm} - ,AUTHOR_DC = #{author_dc} + ,AUTHOR_NM = #{authorNm + ,AUTHOR_DC = #{authorDc WHERE 1=1 - AND AUTHOR_CODE = #{author_code} + AND AUTHOR_CODE = #{authorCode /** removeXitAuthorInfo */ /** 권한정보 삭제 */ DELETE FROM XIT_AUTHOR_INFO WHERE 1=1 - AND AUTHOR_CODE = #{author_code} + AND AUTHOR_CODE = #{authorCode @@ -2008,8 +2010,8 @@ ,CHLDRN_ROLE FROM XIT_ROLE_SCLSRT_RESCUE WHERE 1=1 - AND PARNTS_ROLE = #{parnts_role} - AND CHLDRN_ROLE = #{chldrn_role} + AND PARNTS_ROLE = #{parntsRole + AND CHLDRN_ROLE = #{chldrnRole /** addXitRoleSclsrtRescue */ @@ -2046,16 +2048,16 @@ /** 역할계층구조 삭제 */ DELETE FROM XIT_ROLE_SCLSRT_RESCUE WHERE 1=1 - AND PARNTS_ROLE = #{parnts_role} - AND CHLDRN_ROLE = #{chldrn_role} + AND PARNTS_ROLE = #{parntsRole + AND CHLDRN_ROLE = #{chldrnRole /** removesXitRoleSclsrtRescue */ /** 역할계층구조 다건 삭제 */ DELETE FROM XIT_ROLE_SCLSRT_RESCUE WHERE 1=1 - AND PARNTS_ROLE = #{parnts_role} - AND CHLDRN_ROLE = #{chldrn_role} + AND PARNTS_ROLE = #{parntsRole + AND CHLDRN_ROLE = #{chldrnRole diff --git a/src/main/resources/sqlmapper/framework/cmm/XitFrameCrud-oracle-mapper.xml b/src/main/resources/sqlmapper/framework/cmm/XitFrameCrud-oracle-mapper.xml index 3aaf4173..a14c7300 100644 --- a/src/main/resources/sqlmapper/framework/cmm/XitFrameCrud-oracle-mapper.xml +++ b/src/main/resources/sqlmapper/framework/cmm/XitFrameCrud-oracle-mapper.xml @@ -82,7 +82,9 @@ AND AUTHOR_CODE = #{author_code } AND AUTHOR_NM = #{author_nm } AND AUTHOR_DC = #{author_dc } - AND AUTHOR_CREAT_DE = #{author_creat_de} + AND AUTHOR_CREAT_DE = + #{authorCreatDe + /** addXitAuthorInfo */ @@ -116,17 +118,17 @@ UPDATE XIT_AUTHOR_INFO SET AUTHOR_CREAT_DE = AUTHOR_CREAT_DE - ,AUTHOR_NM = #{author_nm} - ,AUTHOR_DC = #{author_dc} + ,AUTHOR_NM = #{authorNm + ,AUTHOR_DC = #{authorDc WHERE 1=1 - AND AUTHOR_CODE = #{author_code} + AND AUTHOR_CODE = #{authorCode /** removeXitAuthorInfo */ /** 권한정보 삭제 */ DELETE FROM XIT_AUTHOR_INFO WHERE 1=1 - AND AUTHOR_CODE = #{author_code} + AND AUTHOR_CODE = #{authorCode @@ -2008,8 +2010,8 @@ ,CHLDRN_ROLE FROM XIT_ROLE_SCLSRT_RESCUE WHERE 1=1 - AND PARNTS_ROLE = #{parnts_role} - AND CHLDRN_ROLE = #{chldrn_role} + AND PARNTS_ROLE = #{parntsRole + AND CHLDRN_ROLE = #{chldrnRole /** addXitRoleSclsrtRescue */ @@ -2046,16 +2048,16 @@ /** 역할계층구조 삭제 */ DELETE FROM XIT_ROLE_SCLSRT_RESCUE WHERE 1=1 - AND PARNTS_ROLE = #{parnts_role} - AND CHLDRN_ROLE = #{chldrn_role} + AND PARNTS_ROLE = #{parntsRole + AND CHLDRN_ROLE = #{chldrnRole /** removesXitRoleSclsrtRescue */ /** 역할계층구조 다건 삭제 */ DELETE FROM XIT_ROLE_SCLSRT_RESCUE WHERE 1=1 - AND PARNTS_ROLE = #{parnts_role} - AND CHLDRN_ROLE = #{chldrn_role} + AND PARNTS_ROLE = #{parntsRole + AND CHLDRN_ROLE = #{chldrnRole diff --git a/src/main/resources/sqlmapper/framework/mng/auth/XitAuthRegMng-oracle-mapper.xml b/src/main/resources/sqlmapper/framework/mng/auth/XitAuthRegMng-oracle-mapper.xml deleted file mode 100644 index 207a36ca..00000000 --- a/src/main/resources/sqlmapper/framework/mng/auth/XitAuthRegMng-oracle-mapper.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - SELECT * FROM - (SELECT LIST.*, ROWNUM AS "RN" FROM( - - - - ) LIST - ) WHERE RN BETWEEN #{firstIndex} + 1 AND #{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 '%'||#{searchKeyword}||'%' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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-author-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/auth/auth-author-mysql-mapper.xml new file mode 100644 index 00000000..831ad906 --- /dev/null +++ b/src/main/resources/sqlmapper/framework/mng/auth/auth-author-mysql-mapper.xml @@ -0,0 +1,231 @@ + + + + + + + + + + + /* auth-author-mysql-mapper|insertAuthorInfo-권한 정보 등록|julim */ + INSERT INTO xit_author_info ( + author_code + , author_nm + , author_dc + , author_creat_de + ) VALUES ( + #{authorCode} + ,#{authorNm} + ,#{authorDc} + ,DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') + ) + + + + /* auth-author-mysql-mapper|selectAuthorInfos-권한 목록 조회|julim */ + UPDATE xit_author_info + SET author_nm = IF(author_nm = #{authorNm}, author_nm, #{authorNm}) + , author_dc = IF(author_dc = #{authorDc}, author_dc, #{authorDc}) + WHERE author_code = #{authorCode} + + + + /* auth-author-mysql-mapper|selectAuthorInfos-권한 목록 조회|julim */ + DELETE + FROM xit_author_info + WHERE author_code = #{authorCode} + + + + + + + /* auth-author-mysql-mapper|deleteRoleGrant-권한 롤 삭제|julim */ + DELETE + FROM xit_author_role_relate + WHERE author_code = #{authorCode} + AND role_code = #{roleCode} + + + + /* auth-author-mysql-mapper|saveRoleGrant-권한 롤 등록|julim */ + INSERT INTO xit_author_role_relate ( + author_code + , role_code + , creat_dt + ) VALUES ( + #{authorCode} + , #{roleCode} + , NOW() + ) + ON DUPLICATE KEY UPDATE + creat_dt = NOW() + + + + + + + + /* auth-author-mysql-mapper|insertRoleSclsrtRescue-역할계층 정보 등록|julim */ + INSERT + INTO xit_role_sclsrt_rescue( + parnts_role + , chldrn_role + )VALUES( + #{parntsRole} + , #{chldrnRole} + ) + + + + /* auth-author-mysql-mapper|deleteRoleSclsrtRescue-역할계층 삭제 조회|julim */ + DELETE + FROM xit_role_sclsrt_rescue + + + AND parnts_role = #{parntsRole} + + + AND chldrn_role = #{chldrnRole} + + + + + + + + + + + + + + + + + + + + + + + + + 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-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/auth/auth-mysql-mapper.xml deleted file mode 100644 index cdcf3d98..00000000 --- a/src/main/resources/sqlmapper/framework/mng/auth/auth-mysql-mapper.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - /** addXitAuthorInfo */ - /** 권한정보 등록 */ - INSERT INTO XIT_AUTHOR_INFO( - AUTHOR_CODE - ,AUTHOR_NM - ,AUTHOR_DC - ,AUTHOR_CREAT_DE - )VALUES( - #{author_code } - ,#{author_nm } - ,#{author_dc } - ,DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') - ) - - - /** modifyXitAuthorInfo */ - /** 권한정보 수정 */ - UPDATE XIT_AUTHOR_INFO - SET - AUTHOR_CREAT_DE = AUTHOR_CREAT_DE - ,AUTHOR_NM = #{author_nm} - ,AUTHOR_DC = #{author_dc} - WHERE 1=1 - AND AUTHOR_CODE = #{author_code} - - - /** removeXitAuthorInfo */ - /** 권한정보 삭제 */ - DELETE FROM XIT_AUTHOR_INFO - WHERE 1=1 - AND AUTHOR_CODE = #{author_code} - - - - - - - - - - - - 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},'%') - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/webapp/WEB-INF/jsp/framework/biz/mng/auth/XitAuthRegMng_list.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/XitAuthRegMng_list.jsp index f26f2bb7..4842bf15 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/XitAuthRegMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/XitAuthRegMng_list.jsp @@ -263,7 +263,7 @@ GridConfig.setOptDataSource({ //DataSource ----------------------- */ api: { readData : { - url: '', method: 'GET' + url: '', method: 'GET' ,initParams: {} ,serializer: function(params) { var form = document.listForm; diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/XitAuthRegMng_rolegrant_popup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/XitAuthRegMng_rolegrant_popup.jsp index 344e030b..a91152e6 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/XitAuthRegMng_rolegrant_popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/XitAuthRegMng_rolegrant_popup.jsp @@ -28,9 +28,9 @@ - + - + diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp similarity index 67% rename from src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthMgtForm.jsp rename to src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp index 51ca01ff..014d4954 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp @@ -1,7 +1,7 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> - +
@@ -18,7 +18,7 @@ @@ -123,12 +111,6 @@ - - -
권한 명 - + @@ -30,14 +30,17 @@
+
전체 ㅣ
+ + 등록
- + -
- +
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp index 24c2cb14..ce9e0ad6 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp @@ -176,11 +176,7 @@ const gridOptions = { el: 'grid', rowHeaders: ['rowNum'], - columns: gridColumns, - columnOptions: { - frozenCount: 3 //고정컬럼 갯수 - , minWidth: 80 //최소 사이즈 - } + columns: gridColumns }; const gridDatasource = { //DataSource diff --git a/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js b/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js index f562fa34..bcaa3a4e 100644 --- a/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js +++ b/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js @@ -196,6 +196,7 @@ const cmmAjax = (param) => { ,data: param.data ,async: nvl(param.async, true) ,dataType: nvl(param.dataType, "json") + ,contentType: nvl(param.contentType, 'application/json; charset=utf-8') ,success: function (res) { if (!param.showSuccessMsg || param.showSuccessMsg === true) { alert(res.message); diff --git a/src/main/webapp/resources/framework/js/cmm/cmmUtil.js b/src/main/webapp/resources/framework/js/cmm/cmmUtil.js index 8dda30d9..29b152ab 100644 --- a/src/main/webapp/resources/framework/js/cmm/cmmUtil.js +++ b/src/main/webapp/resources/framework/js/cmm/cmmUtil.js @@ -378,6 +378,8 @@ function setComma(n) { } const setDateTimeFmt = (srcDateStr, delimiter = '-') => { + if(srcDateStr == null || srcDateStr.isBlank()) return srcDateStr; + let srcDate = srcDateStr.replace(/\-|\s|\:|\./g,''); if(srcDate.length == 8) { return srcDate.substring(0, 4)+delimiter+srcDate.substring(4, 6)+delimiter+srcDate.substring(6, 8); diff --git a/src/main/webapp/resources/framework/js/cmm/xit-tui-grid.js b/src/main/webapp/resources/framework/js/cmm/xit-tui-grid.js index d009e166..6971ddac 100644 --- a/src/main/webapp/resources/framework/js/cmm/xit-tui-grid.js +++ b/src/main/webapp/resources/framework/js/cmm/xit-tui-grid.js @@ -97,7 +97,8 @@ const TuiGrid = { readData: { contentType: 'application/json', dataType: 'json', - method: 'get' + method: 'get', + initParams: {} } , createData: {url: '', method: 'POST'} , updateData: {url: '', method: 'PUT'} @@ -118,8 +119,8 @@ const TuiGrid = { perPage: 15 }, //[선택]한 페이지에 출력할 건수 columnOptions: { //[선택]고정 컬럼 - frozenCount: 1 //고정컬럼 갯수 - , frozenBorderWidth: 2 //고정컬럼 보더(border) 두께 + //frozenCount: 0 //고정컬럼 갯수 + frozenBorderWidth: 2 //고정컬럼 보더(border) 두께 , resizable: true , minWidth: 100 //최소 사이즈 }, @@ -145,7 +146,14 @@ const TuiGrid = { console.log(msg); //if($('#totCnt span')){ if(document.getElementById('totCnt')){ - $('#totCnt span').text(JSON.parse(ev.xhr.response).data.pagination.totalCount); + const res = JSON.parse(ev.xhr.response); + // paging + if(res.data.pagination){ + $('#totCnt span').text(res.data.pagination.totalCount); + // no paging + }else{ + $('#totCnt span').text(res.count) + } console.log('totCnt >>>>> ',$('#totCnt span').text()) } From f30da6c0a044c1a6cb6eb6f85cdde6a063150a29 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Sat, 5 Nov 2022 04:21:03 +0900 Subject: [PATCH 03/13] =?UTF-8?q?fix:=20contentType=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20=EC=B2=98=EB=A6=AC=20=EC=A0=81=EC=9A=A9=20=20=20=20?= =?UTF-8?q?=20=20form=20data=20serialize=20>=20application/x-www-form-urle?= =?UTF-8?q?ncoded=20=20=20=20=20=20json=20Data=20>=20application/json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/mng/user/web/UserMgtController.java | 3 +- .../biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp | 114 ++++++++---------- .../framework/biz/mng/usr/mngUserMgtPopup.jsp | 89 +++++--------- .../resources/framework/js/cmm/XitCmmnUtil.js | 2 +- .../resources/framework/js/cmm/cmmUtil.js | 38 +++++- 5 files changed, 122 insertions(+), 124 deletions(-) diff --git a/src/main/java/kr/xit/framework/biz/mng/user/web/UserMgtController.java b/src/main/java/kr/xit/framework/biz/mng/user/web/UserMgtController.java index 71597c88..bcdd177e 100644 --- a/src/main/java/kr/xit/framework/biz/mng/user/web/UserMgtController.java +++ b/src/main/java/kr/xit/framework/biz/mng/user/web/UserMgtController.java @@ -19,6 +19,7 @@ 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @@ -117,7 +118,7 @@ public class UserMgtController { @PostMapping(value = "/modifyUser") - public ModelAndView modifyUser(@ModelAttribute final XitUserInfoVO vo, final BindingResult bindingResult){ + public ModelAndView modifyUser(@RequestBody final XitUserInfoVO vo, final BindingResult bindingResult){ ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); ValidationError.of("userInfoVO", vo, bindingResult); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp index c3b0ca13..a23d41fd 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp @@ -8,48 +8,43 @@

권한별 롤 목록

- - - - -
-
- - - - - - - - - - - - - - - - - - -
검색조건
권한코드 : - - - -
-
-
- -
- +
+
+ + + + + + + + + + + + + + + + + + +
검색조건
권한코드 : + + + +
+
+
+ +
- -
전체 ㅣ
- - - 저장 - 닫기 - + +
전체 ㅣ
+ + + 저장 + 닫기 +
@@ -64,8 +59,8 @@ **************************************************************************/ let GRID = null; const REG_YN = [ - {value: 'Y', text: '등록'}, - {value: 'N', text: '미등록'}, + {code: 'Y', codeNm: '등록'}, + {code: 'N', codeNm: '미등록'}, ] /* ******************************* @@ -91,14 +86,15 @@ const data = { authorCode: $('#authorCode').val() - , grantData: arrDatas + ,grantData: arrDatas } if(confirm("등록 하시겠습니까?")) { cmmAjax({ url: '' - , data: JSON.stringify(data) - , success: () => { + ,data: JSON.stringify(data) + ,contentType: 'application/json; charset=utf-8' + ,success: () => { fnBiz.search(); } }) @@ -152,27 +148,19 @@ /* 에디터 적용 */ formatter: 'listItemText', editor: { - type: 'select', //select, radio, checkbox, text + type: 'radio', //select, radio, checkbox, text options: { listItems: [ -// {value: 'Y', text: '등록'}, -// {value: 'N', text: '미등록'} -// /* 다음과 같이 jstl도 사용 가능(예시를 위해 forTokens를 사용하였으나 forEach 사용 가능) */ - <%--> - - - {value: '${row}', text: '${"Y" eq row ? "등록" : "미등록"}' } - - - ,{value: '${row}', text: '${"Y" eq row ? "등록" : "미등록"}' } - - + + + {value: '${row}', text: '${"Y" eq row ? "등록" : "미등록"}' } + + + ,{value: '${row}', text: '${"Y" eq row ? "등록" : "미등록"}' } + + ---%> - - {value: 'Y', text: '등록'}, - {value: 'N', text: '미등록'} ] } }, diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp index 3625a66e..7737fcf4 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp @@ -77,12 +77,6 @@ 		-<%-- - - - - ---%> @@ -107,12 +101,6 @@ -<%-- - - - - ---%>
-<%-- - - - - ---%> @@ -206,12 +188,6 @@ -<%-- - - - - ---%> @@ -219,38 +195,32 @@ - <%-- - - - - - --%> - -
+ + + + + -
- - - - 변경 - 삭제 - - - 등록 - - +
+ + + + 변경 + 삭제 + + + 등록 + + - 닫기 - -
- -
-
- - + 닫기 + +
+ +
+ + + - - +
-

권한 등록

+ <%@include file="/WEB-INF/jsp/framework/biz-popup-title.jsp"%> + - + + + + + - - + - - + - - + + - - + +
권한 등록 /
권한 코드 - 필수 + +   +   +
권한 명 - 필수 + +   +   +
설명 + + + +
등록일자 + + + +
-
- - - 저장 - - - 변경 - 삭제 - - 닫기 - -
- + <%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp"%> +
- +
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp index a23d41fd..f35903c9 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp @@ -235,6 +235,7 @@ readData: { url: '' , initParams: {authorCode: $('#authorCode').val()} + ,serializer: (params) => fnAddPageInfo(document.frmSearch, params) } } }; diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtForm.jsp index dee013c7..d431565f 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtForm.jsp @@ -164,6 +164,7 @@ api: { readData: { url: '' + ,serializer: (params) => fnAddPageInfo(document.frmSearch, params) } } } diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtPopup.jsp index b033140a..7916d98b 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtPopup.jsp @@ -2,27 +2,20 @@ <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp"%> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> + + + <%--@elvariable id="progrmMngVO" type=""--%> -
-

- - - 프로그램 정보 - - - 프로그램 정보 - - -

+ <%@include file="/WEB-INF/jsp/framework/biz-popup-title.jsp"%> - + @@ -66,21 +59,7 @@
프로그램 정보 등록 / 변경 등록 / 변경
-
- - - - 변경 - 삭제 - - - 등록 - - - 닫기 - -
- + <%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp"%>
@@ -145,8 +124,5 @@ * initialize **************************************************************************/ $(document).ready(function(){ - $(".popup").css("position","absolute"); - $(".content_header").css("display","none"); - $("#cur_loc").css("display","none"); }); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp index 024e92da..279a1fdb 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp @@ -66,21 +66,6 @@ GRID.reloadData(); } - ,pageLink: function(flag, url, params){ - switch (flag) { - case "move": //페이지 이동 - document.frmSearch.searchKeyword.value = ""; - document.frmSearch.action = url; - document.frmSearch.submit(); - break; - case "popup": //팝업 OPEN - fnBiz.pagePopup(flag, url, params); - break; - default: - break; - } - } - ,pagePopup: function(flag, params){ let url; let popTitle; @@ -217,6 +202,7 @@ api: { readData: { url: '' + ,serializer: (params) => fnAddPageInfo(document.frmSearch, params) } } }; diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp index 7737fcf4..d657fefb 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp @@ -2,27 +2,20 @@ <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp"%> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> + + + <%--@elvariable id="userInfoVO" type=""--%> -
-

- - - - - - - - -

+ <%@include file="/WEB-INF/jsp/framework/biz-popup-title.jsp"%> - + @@ -201,22 +194,7 @@
/ <:out value="${bizName}"/> /
-
- - - - 변경 - 삭제 - - - 등록 - - - - 닫기 - -
- + <%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp"%>
@@ -236,7 +214,7 @@ } ,add: () => { - //if(!validateUserInfoVO(document.getElementById('userInfoVO'))) return; + if(!validateUserInfoVO(document.getElementById('userInfoVO'))) return; cmmBizAjax('add', { url: '' From a7c0c3d638b1c4fa15e68d87f1611937b5c2af7f Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Sun, 6 Nov 2022 03:15:41 +0900 Subject: [PATCH 05/13] =?UTF-8?q?refactor:=20=EC=97=85=EB=AC=B4=ED=8C=9D?= =?UTF-8?q?=EC=97=85(=EB=93=B1=EB=A1=9D/=EB=B3=80=EA=B2=BD/=EC=82=AD?= =?UTF-8?q?=EC=A0=9C)=20=ED=83=80=EC=9D=B4=ED=8B=80=20=EB=B0=8F=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EA=B3=B5=ED=86=B5=20JSP=20include=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 32 ++ .../fims/biz/common/popup/fimsTotal_popup.jsp | 16 +- .../WEB-INF/jsp/fims/biz/rt/rt0200Sel.jsp | 1 + .../WEB-INF/jsp/framework/biz-popup-btn.jsp | 21 + .../WEB-INF/jsp/framework/biz-popup-title.jsp | 20 + .../biz/mng/auth/mngAuthGrpMgtForm.jsp | 423 ++++++------------ .../biz/mng/auth/mngAuthGrpMgtPopup.jsp | 250 +++++------ .../biz/mng/auth/mngAuthRoleMgtForm.jsp | 23 +- .../resources/framework/js/cmm/XitCmmnUtil.js | 4 +- 9 files changed, 310 insertions(+), 480 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/framework/biz-popup-btn.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/framework/biz-popup-title.jsp diff --git a/README.md b/README.md index 5def51f0..3d401ac4 100644 --- a/README.md +++ b/README.md @@ -96,3 +96,35 @@ access token : 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 3) MyBatisX mapper에서 xml을 편하게 이동 ``` + +### 팝업 공통처리 : 등록 / 변경 / 삭제 팝업 +```html + +1) 변수 정의 + + + +2) title include + +
+

권한

+ +
+ + <%@include file="/WEB-INF/jsp/framework/biz-popup-title.jsp"%> + + + +
+ + 등록 + 변경 + 삭제 + 닫기 + +
+ + + <%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp"%> + +``` diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/common/popup/fimsTotal_popup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/common/popup/fimsTotal_popup.jsp index 0f9d2931..a6e8a111 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/common/popup/fimsTotal_popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/common/popup/fimsTotal_popup.jsp @@ -499,7 +499,7 @@ api: { readData: { url: '' - , serializer: (params) => fnAddPageInfo(document.frmSearch, params) + ,serializer: (params) => fnAddPageInfo(document.frmSearch, params) } } }; @@ -712,19 +712,7 @@ } return true; - }, - /* ======================== - * 페이지 이동 - -외부사이트 링크가 필요 시 사용(내부코드는 각 페이지에 맞게 수정, ex>https://www.gov.kr/portal/main ) - ======================== */ - pageLink: function(flag, url, params){ - switch (flag) { - case "move": //페이지 이동 - break; - default: - break; - } - }, + } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rt0200Sel.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rt0200Sel.jsp index 86af15b0..a553e3c5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rt0200Sel.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rt0200Sel.jsp @@ -325,6 +325,7 @@ api: { readData: { url: '' + ,serializer: (params) => fnAddPageInfo(document.frmSearch, params) } } }; diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz-popup-btn.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz-popup-btn.jsp new file mode 100644 index 00000000..d0255385 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/framework/biz-popup-btn.jsp @@ -0,0 +1,21 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%-- TODO: 완료후 comment 삭제 +아래와 같이 isUpdate 정의 필요 + +--%> + +
+ + + + 변경 + 삭제 + + + 등록 + + + 닫기 + +
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz-popup-title.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz-popup-title.jsp new file mode 100644 index 00000000..fddf1b4e --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/framework/biz-popup-title.jsp @@ -0,0 +1,20 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + +<%-- TODO: 완료후 comment 삭제 +아래와 같이 isUpdate 정의 필요 + + +--%> + +

+ + + 변경 + + + 등록 + + +

+ diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp index c8365bb3..23661f40 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp @@ -1,12 +1,7 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> - - - - - - +
@@ -15,15 +10,15 @@ - + - + - + From f5d071c890931345d91bb4c943257e36f169f055 Mon Sep 17 00:00:00 2001 From: minuk926 Date: Mon, 7 Nov 2022 15:23:44 +0900 Subject: [PATCH 10/13] =?UTF-8?q?fix:=20exception=20fix=20-=20Duplication?= =?UTF-8?q?=20error=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resolver/AjaxExceptionViewResolver.java | 21 ++++++++++++--- .../resolver/NormalExceptionViewResolver.java | 26 +++++++++++++++---- .../message/com/message-common.properties | 2 +- .../message/com/message-common_ko.properties | 2 +- 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/main/java/kr/xit/framework/support/exception/resolver/AjaxExceptionViewResolver.java b/src/main/java/kr/xit/framework/support/exception/resolver/AjaxExceptionViewResolver.java index 0e6bac64..4eebf7f8 100644 --- a/src/main/java/kr/xit/framework/support/exception/resolver/AjaxExceptionViewResolver.java +++ b/src/main/java/kr/xit/framework/support/exception/resolver/AjaxExceptionViewResolver.java @@ -2,11 +2,13 @@ package kr.xit.framework.support.exception.resolver; import java.io.ByteArrayOutputStream; import java.io.PrintStream; +import java.sql.SQLIntegrityConstraintViolationException; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.dao.DataIntegrityViolationException; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.ModelAndView; @@ -36,11 +38,24 @@ public class AjaxExceptionViewResolver extends AbstractExceptionViewResolver { ByteArrayOutputStream out = new ByteArrayOutputStream(); PrintStream pinrtStream = new PrintStream(out); - exception.printStackTrace(pinrtStream); - String stackTraceString = ""; - if(Globals.IS_SP_ALERT_MSG) stackTraceString = out.toString(); Map tempMap = AjaxMessageMapRenderer.error(errorCode, errorArguments); + String stackTraceString = ""; + tempMap.put("result", false); + exception.printStackTrace(pinrtStream); + if(Globals.IS_SP_ALERT_MSG) stackTraceString = out.toString(); + + // Duplicate exception + if(exception instanceof SQLIntegrityConstraintViolationException + || exception instanceof DataIntegrityViolationException){ + tempMap.put("message", "요청 처리에 실패하였습니다[이미 등록된 데이타 요청]"); + }else{ + if(Globals.IS_SP_ALERT_MSG){ + exception.printStackTrace(pinrtStream); + stackTraceString = out.toString(); + } + } + if(Globals.IS_SP_ALERT_MSG) tempMap.put("message", tempMap.get("message")+"\n"+stackTraceString); else tempMap.put("message", tempMap.get("message")); return new ModelAndView(getView(), tempMap); diff --git a/src/main/java/kr/xit/framework/support/exception/resolver/NormalExceptionViewResolver.java b/src/main/java/kr/xit/framework/support/exception/resolver/NormalExceptionViewResolver.java index 4dd1afff..a5e916a4 100644 --- a/src/main/java/kr/xit/framework/support/exception/resolver/NormalExceptionViewResolver.java +++ b/src/main/java/kr/xit/framework/support/exception/resolver/NormalExceptionViewResolver.java @@ -2,11 +2,13 @@ package kr.xit.framework.support.exception.resolver; import java.io.ByteArrayOutputStream; import java.io.PrintStream; +import java.sql.SQLIntegrityConstraintViolationException; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.dao.DataIntegrityViolationException; import org.springframework.web.servlet.ModelAndView; import kr.xit.framework.support.util.AjaxMessageMapRenderer; @@ -26,19 +28,33 @@ public class NormalExceptionViewResolver extends AbstractExceptionViewResolver { ByteArrayOutputStream out = new ByteArrayOutputStream(); PrintStream pinrtStream = new PrintStream(out); - exception.printStackTrace(pinrtStream); String stackTraceString = ""; - if(Globals.IS_SP_ALERT_MSG) stackTraceString = out.toString(); Map tempMap = AjaxMessageMapRenderer.error(errorCode, errorArguments); + + tempMap.put("result", false); + exception.printStackTrace(pinrtStream); + if(Globals.IS_SP_ALERT_MSG) stackTraceString = out.toString(); + + // Duplicate exception + if(exception instanceof SQLIntegrityConstraintViolationException + || exception instanceof DataIntegrityViolationException){ + tempMap.put("message", "요청 처리에 실패하였습니다[이미 등록된 데이타 요청]"); + }else{ + if(Globals.IS_SP_ALERT_MSG){ + exception.printStackTrace(pinrtStream); + stackTraceString = out.toString(); + } + } + if(Globals.IS_SP_ALERT_MSG) tempMap.put("message", tempMap.get("message")+"\n"+stackTraceString); else tempMap.put("message", tempMap.get("message")); mav.addObject(Globals.JSON_ERROR_ROOT_ELEMENT_VALUE, tempMap); // mav.addObject(Globals.JSON_ERROR_ROOT_ELEMENT_VALUE, AjaxMessageMapRenderer.error(errorCode, errorArguments)); - Map errorMessage = AjaxMessageMapRenderer.error(errorCode, errorArguments); + - logger.error(new StringBuffer().append("error_code : {}\n").append("error_message : {}").toString(), - new Object[]{ errorCode, errorMessage}); + logger.error("error_code : {}\n" + "error_message : {}", + new Object[]{ errorCode, tempMap}); return mav; } diff --git a/src/main/resources/message/com/message-common.properties b/src/main/resources/message/com/message-common.properties index 6b64c387..f361995f 100644 --- a/src/main/resources/message/com/message-common.properties +++ b/src/main/resources/message/com/message-common.properties @@ -127,7 +127,7 @@ fail.common.loginIncorrect = [{0}] \uD68C \uC774\uC0C1 \uB85C\uADF8\uC778 \uC811 fail.common.login.password = \uD328\uC2A4\uC6CC\uB4DC \uC790\uB9AC \uC218\uAC00 \uC77C\uCE58 \uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.(8\uC790\uB9AC \uC774\uC0C1 20\uC790\uB9AC \uC774\uD558) fail.common.idsearch = \uC544\uC774\uB514\uB97C \uCC3E\uC744\uC218 \uC5C6\uC2B5\uB2C8\uB2E4. fail.common.pwsearch = \uBE44\uBC00\uBC88\uD638\uB97C \uCC3E\uC744\uC218 \uC5C6\uC2B5\uB2C8\uB2E4. -fail.request.msg = \uC694\uCCAD\uCC98\uB9AC\uB97C \uC2E4\uD328\uD558\uC600\uC2B5\uB2C8\uB2E4. +fail.request.msg = \uC694\uCCAD \uCC98\uB9AC\uC5D0 \uC2E4\uD328\uD558\uC600\uC2B5\uB2C8\uB2E4. fail.common.login.ip = \uB4F1\uB85D\uB41C IP\uAC00 \uC544\uB2C8\uBBC0\uB85C \uB85C\uADF8\uC778\uC774 \uAC70\uBD80\uB418\uC5C8\uC2B5\uB2C8\uB2E4. #UI User Message# diff --git a/src/main/resources/message/com/message-common_ko.properties b/src/main/resources/message/com/message-common_ko.properties index 50f30e5f..1758b1ac 100644 --- a/src/main/resources/message/com/message-common_ko.properties +++ b/src/main/resources/message/com/message-common_ko.properties @@ -127,7 +127,7 @@ fail.common.loginIncorrect = [{0}] \uD68C \uC774\uC0C1 \uB85C\uADF8\uC778 \uC811 fail.common.login.password = \uD328\uC2A4\uC6CC\uB4DC \uC790\uB9AC \uC218\uAC00 \uC77C\uCE58 \uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.(8\uC790\uB9AC \uC774\uC0C1 20\uC790\uB9AC \uC774\uD558) fail.common.idsearch = \uC544\uC774\uB514\uB97C \uCC3E\uC744\uC218 \uC5C6\uC2B5\uB2C8\uB2E4. fail.common.pwsearch = \uBE44\uBC00\uBC88\uD638\uB97C \uCC3E\uC744\uC218 \uC5C6\uC2B5\uB2C8\uB2E4. -fail.request.msg = \uC694\uCCAD\uCC98\uB9AC\uB97C \uC2E4\uD328\uD558\uC600\uC2B5\uB2C8\uB2E4. +fail.request.msg = \uC694\uCCAD \uCC98\uB9AC\uC5D0 \uC2E4\uD328\uD558\uC600\uC2B5\uB2C8\uB2E4. fail.common.login.ip = \uB4F1\uB85D\uB41C IP\uAC00 \uC544\uB2C8\uBBC0\uB85C \uB85C\uADF8\uC778\uC774 \uAC70\uBD80\uB418\uC5C8\uC2B5\uB2C8\uB2E4. #UI User Message# From 6c81a61eb19b0267b54dc99b6e532eeec1d81b44 Mon Sep 17 00:00:00 2001 From: minuk926 Date: Mon, 7 Nov 2022 21:06:25 +0900 Subject: [PATCH 11/13] =?UTF-8?q?feat:=20=EC=82=AC=EC=9A=A9=EC=9E=90?= =?UTF-8?q?=EB=B3=84=20=EA=B6=8C=ED=95=9C=EA=B4=80=EB=A6=AC=20=EB=B0=98?= =?UTF-8?q?=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mng/auth/mapper/AuthUserMgtMapper.java | 6 + .../biz/mng/auth/model/XitAuthUsrMngVO.java | 140 +---------- .../mng/auth/service/AuthGrpMgtService.java | 2 +- .../mng/auth/service/AuthUserMgtService.java | 6 + .../service/impl/AuthGrpMgtServiceImpl.java | 13 +- .../service/impl/AuthUserMgtServiceImpl.java | 52 +++++ .../mng/auth/web/AuthAuthorMgtController.java | 16 ++ .../mng/auth/web/AuthUserMgtController.java | 53 ++++- .../support/tag/code/CodeSelectBoxTag.java | 5 + .../cache/cachecode-mysql-mapper.xml | 11 +- .../mng/auth/auth-author-mysql-mapper.xml | 2 +- .../mng/auth/auth-user-mysql-mapper.xml | 194 +++++----------- .../biz/mng/auth/mngAuthGrpMgtPopup.jsp | 2 +- .../biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp | 42 ++-- .../biz/mng/auth/mngAuthUserMgtForm.jsp | 218 +++++++----------- src/main/webapp/WEB-INF/tlds/code.tld | 5 +- .../resources/framework/js/cmm/XitCmmnUtil.js | 19 +- 17 files changed, 331 insertions(+), 455 deletions(-) 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 89462b83..667725c6 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 @@ -4,6 +4,8 @@ import java.sql.SQLException; import java.util.List; import java.util.Map; +import org.apache.ibatis.session.RowBounds; + import egovframework.rte.psl.dataaccess.mapper.Mapper; import kr.xit.framework.biz.mng.auth.model.XitAuthUsrMngSearchVO; import kr.xit.framework.biz.mng.auth.model.XitAuthUsrMngVO; @@ -23,6 +25,10 @@ import kr.xit.framework.core.model.XitBaseSearchVO; public interface AuthUserMgtMapper { + List selectAuthUsers(final Map paraMap, final RowBounds rowBounds); + XitAuthUsrMngVO selectAuthUser(final Map paraMap); + + /** * 
메소드 설명: 사용자별권한관리 목록 조회
* @param searchVO diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/model/XitAuthUsrMngVO.java b/src/main/java/kr/xit/framework/biz/mng/auth/model/XitAuthUsrMngVO.java index 68074708..e2a71ac3 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/model/XitAuthUsrMngVO.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/model/XitAuthUsrMngVO.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 XitAuthUsrMngVO extends BaseVO { /** @@ -54,132 +66,4 @@ public class XitAuthUsrMngVO extends BaseVO { * Uniq ID */ private String uniqId; - - /** - * authorGroup attribute 를 리턴한다. - * @return AuthorGroup - */ - public XitAuthUsrMngVO getAuthorGroup() { - return authorGroup; - } - /** - * authorGroup attribute 값을 설정한다. - * @param authorGroup AuthorGroup - */ - public void setAuthorGroup(XitAuthUsrMngVO authorGroup) { - this.authorGroup = authorGroup; - } - /** - * userId attribute 를 리턴한다. - * @return String - */ - public String getUserId() { - return userId; - } - /** - * userId attribute 값을 설정한다. - * @param userId String - */ - public void setUserId(String userId) { - this.userId = userId; - } - /** - * userNm attribute 를 리턴한다. - * @return String - */ - public String getUserNm() { - return userNm; - } - /** - * userNm attribute 값을 설정한다. - * @param userNm String - */ - public void setUserNm(String userNm) { - this.userNm = userNm; - } - /** - * groupId attribute 를 리턴한다. - * @return String - */ - public String getGroupId() { - return groupId; - } - /** - * groupId attribute 값을 설정한다. - * @param groupId String - */ - public void setGroupId(String groupId) { - this.groupId = groupId; - } - /** - * mberTyCode attribute 를 리턴한다. - * @return String - */ - public String getMberTyCode() { - return mberTyCode; - } - /** - * mberTyCode attribute 값을 설정한다. - * @param mberTyCode String - */ - public void setMberTyCode(String mberTyCode) { - this.mberTyCode = mberTyCode; - } - /** - * mberTyNm attribute 를 리턴한다. - * @return String - */ - public String getMberTyNm() { - return mberTyNm; - } - /** - * mberTyNm attribute 값을 설정한다. - * @param mberTyNm String - */ - public void setMberTyNm(String mberTyNm) { - this.mberTyNm = mberTyNm; - } - /** - * authorCode attribute 를 리턴한다. - * @return String - */ - public String getAuthorCode() { - return authorCode; - } - /** - * authorCode attribute 값을 설정한다. - * @param authorCode String - */ - public void setAuthorCode(String authorCode) { - this.authorCode = authorCode; - } - /** - * regYn attribute 를 리턴한다. - * @return String - */ - public String getRegYn() { - return regYn; - } - /** - * regYn attribute 값을 설정한다. - * @param regYn String - */ - public void setRegYn(String regYn) { - this.regYn = regYn; - } - /** - * uniqId attribute 를 리턴한다. - * @return String - */ - public String getUniqId() { - return uniqId; - } - /** - * uniqId attribute 값을 설정한다. - * @param uniqId String - */ - public void setUniqId(String uniqId) { - this.uniqId = uniqId; - } - } 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 9d4aca7f..a1ba7eb1 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,7 +28,7 @@ public interface AuthGrpMgtService { void modifyAuthGrp(final XitAuthorGroupInfoVO vo); void removeAuthGrp(final String authorCode); - + void isCheckUserForCanChange(String uniqId, String trgetAuthorCode); 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 f79e731a..f7cae4e0 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 @@ -3,6 +3,8 @@ package kr.xit.framework.biz.mng.auth.service; import java.util.List; import java.util.Map; +import org.apache.ibatis.session.RowBounds; + import kr.xit.framework.biz.mng.auth.model.XitAuthUsrMngSearchVO; import kr.xit.framework.biz.mng.auth.model.XitAuthUsrMngVO; import kr.xit.framework.core.model.XitBaseSearchVO; @@ -19,6 +21,9 @@ import kr.xit.framework.core.model.XitBaseSearchVO; */ public interface AuthUserMgtService { + List findAuthUsers(final Map paraMap, final RowBounds rowBounds); + void saveAuthUserList(final List> paraList); + void removeAuthUserList(final List> paraList); /** * 
메소드 설명: 사용자별권한관리 목록 조회
@@ -99,4 +104,5 @@ public interface AuthUserMgtService { */ public int findListGroupTotCnt(XitBaseSearchVO searchVO); + } 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 6a0f5393..188a2366 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 @@ -62,9 +62,7 @@ public class AuthGrpMgtServiceImpl implements AuthGrpMgtService { @Override public void addAuthGrp(final XitAuthorGroupInfoVO vo) { // 유효성 확인 - boolean isChangePermission = isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthorCode()); - if(!isChangePermission) - throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, "자신의 권한보다 상위 권한을 설정 할 수 없습니다."); + this.isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthorCode()); try { vo.setGroupId(idgenService.getNextStringId()); @@ -77,9 +75,7 @@ public class AuthGrpMgtServiceImpl implements AuthGrpMgtService { @Override public void modifyAuthGrp(final XitAuthorGroupInfoVO vo) { // 유효성 확인 - boolean isChangePermission = isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthorCode()); - if(!isChangePermission) - throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, "자신의 권한보다 상위 권한을 설정 할 수 없습니다."); + this.isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthorCode()); mapper.updateAuthorGroupInfo(vo); } @@ -89,14 +85,15 @@ public class AuthGrpMgtServiceImpl implements AuthGrpMgtService { mapper.deleteAuthorGroupInfo(groupId); } - private boolean isCheckUserForCanChange(String uniqId, String trgetAuthorCode) { + public void isCheckUserForCanChange(String uniqId, String trgetAuthorCode) { //사용자보안설정 조회 XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); userScrtySetupVO.setScrtySetupTrgetId(uniqId); List listUserScrtySetupVO = userMgtMapper.selectUserScrtySetups(userScrtySetupVO); String userAuthorCode = XitCmmnUtil.isEmpty(listUserScrtySetupVO)?null:listUserScrtySetupVO.get(0).getAuthorCode(); - return this.isCheckUserAuthorCodeForCanChange(userAuthorCode, trgetAuthorCode); + if(!this.isCheckUserAuthorCodeForCanChange(userAuthorCode, trgetAuthorCode)) + throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, "자신의 권한보다 상위 권한을 설정 할 수 없습니다.");; } 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 a5b66a0c..37f3bc99 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 @@ -3,18 +3,23 @@ package kr.xit.framework.biz.mng.auth.service.impl; import java.sql.SQLException; import java.util.List; import java.util.Map; +import java.util.Objects; import javax.annotation.Resource; +import org.apache.ibatis.session.RowBounds; import org.springframework.stereotype.Service; import kr.xit.framework.biz.cmm.model.XitUserScrtySetupVO; import kr.xit.framework.biz.cmm.service.XitFrameCrudService; import kr.xit.framework.biz.cmm.service.XitFrameUnitService; +import kr.xit.framework.biz.mng.auth.service.AuthGrpMgtService; import kr.xit.framework.biz.mng.auth.service.AuthUserMgtService; import kr.xit.framework.biz.mng.auth.mapper.AuthUserMgtMapper; import kr.xit.framework.biz.mng.auth.model.XitAuthUsrMngSearchVO; import kr.xit.framework.biz.mng.auth.model.XitAuthUsrMngVO; +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; @@ -23,11 +28,58 @@ public class AuthUserMgtServiceImpl implements AuthUserMgtService { @Resource private AuthUserMgtMapper mapper; + + @Resource + private UserMgtMapper userMapper; + + @Resource + private AuthGrpMgtService authGrpMgtService; + @Resource + private UserMgtService userMgtService; + @Resource private XitFrameCrudService xitFrameCrudService; @Resource private XitFrameUnitService xitFrameUnitService; + @Override + public List findAuthUsers(final Map paraMap, final RowBounds rowBounds) { + return mapper.selectAuthUsers(paraMap, rowBounds); + } + + @Override + public void saveAuthUserList(List> paraList) { + String sessionUniqId = XitCmmnUtil.getUserInfo().getUniqId(); + paraList.forEach(map -> { + //유효성확인 + authGrpMgtService.isCheckUserForCanChange(sessionUniqId, String.valueOf(map.get("authorCode"))); + + XitUserScrtySetupVO vo = new XitUserScrtySetupVO(); + vo.setScrtySetupTrgetId(String.valueOf(map.get("uniqId"))); + vo.setMberTyCode(String.valueOf(map.get("mberTyCode"))); + vo.setAuthorCode(String.valueOf(map.get("authorCode"))); + + if(Objects.equals("N", map.get("regYn"))){ + userMapper.insertUserScrtySetup(vo); + }else{ + userMapper.updateUserScrtySetup(vo); + } + }); + } + + @Override + public void removeAuthUserList(List> paraList) { + + //삭제 시 사용자의 권한을 소속 그룹의 권한 또는 Defualt 권한으로 설정 + paraList.forEach(map -> { + XitUserScrtySetupVO vo = new XitUserScrtySetupVO(); + vo.setScrtySetupTrgetId(String.valueOf(map.get("uniqId"))); + vo.setMberTyCode(String.valueOf(map.get("mberTyCode"))); + vo.setAuthorCode(userMgtService.getDefaultAuthorCode(String.valueOf(map.get("groupId")))); + userMapper.updateUserScrtySetup(vo); + }); + } + @Override public List findList(XitAuthUsrMngSearchVO searchVO) { List result = null; 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 ecf4c650..0a5b6b39 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 @@ -1,6 +1,8 @@ package kr.xit.framework.biz.mng.auth.web; import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -10,6 +12,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; @@ -142,6 +146,18 @@ public class AuthAuthorMgtController { @RequestMapping(value = "/mngAuthRoleGrantMgtPopup") public ModelAndView mngAuthRoleGrantMgtPopup(@RequestParam Map paraMap) { ModelAndView mav = new ModelAndView(); + + List> regYnList = new ArrayList<>(); + Map map = new HashMap<>(); + map.put("code", "Y"); + map.put("code_nm", "등록"); + regYnList.add(map); + map = new HashMap<>();; + map.put("code", "N"); + map.put("code_nm", "미등록"); + regYnList.add(map); + + mav.addObject("regYnList", regYnList); mav.addObject("authorRoleManageVO", paraMap); mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/mngAuthRoleGrantMgtPopup.popup"); return mav; 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 6d3af006..c0ad9348 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 @@ -19,13 +19,17 @@ 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.support.SessionStatus; +import org.springframework.web.servlet.ModelAndView; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kr.xit.framework.biz.cache.util.CacheServiceUtils; import kr.xit.framework.biz.cmm.service.XitFrameCrudService; import kr.xit.framework.biz.mng.auth.model.XitAuthUsrMngSearchVO; import kr.xit.framework.biz.mng.auth.model.XitAuthUsrMngVO; @@ -33,9 +37,13 @@ import kr.xit.framework.biz.mng.auth.service.AuthUserMgtService; import kr.xit.framework.core.constants.FrameworkConstants; import kr.xit.framework.core.constants.FrameworkConstants.TILES_TYPE; import kr.xit.framework.core.message.XitMessageSource; +import kr.xit.framework.core.model.ResultResponse; import kr.xit.framework.core.utils.XitCmmnUtil; import kr.xit.framework.core.validation.XitBeanValidator; +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; /** * @@ -68,9 +76,50 @@ public class AuthUserMgtController { * @date: 2020. 4. 16. */ @GetMapping(value = "/mngAuthUserMgtForm") - public void mngAuthUserMgtForm(@ModelAttribute("authorGroupVO") XitAuthUsrMngSearchVO searchVO) { + public ModelAndView mngAuthUserMgtForm() { + ModelAndView mav = new ModelAndView(); + mav.addObject("authorList", CacheServiceUtils.getComboCodes(null, "AUTHOR")); + return mav; } - + + @GetMapping(value = "/findAuthUsers") + public ModelAndView findAuthUsers(@RequestParam final Map paraMap) { + return ResultResponse.of(service.findAuthUsers(paraMap, MybatisUtils.getPagingInfo(paraMap))); + } + + @PostMapping(value = "/saveAuthUserList") + public ModelAndView saveAuthUserList(@RequestBody final List> paraList) { + ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); + + service.saveAuthUserList(paraList); + AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); + return mav; + } + + @PostMapping(value = "/removeAuthUserList") + public ModelAndView removeAuthUserList(@RequestBody final List> paraList) { + ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); + + service.removeAuthUserList(paraList); + AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); + return mav; + } + + + + + + + + + + + + + + + + /** * 
메소드 설명: 사용자별 권한관리 목록 페이지 조회
* @return String 요청처리 후 응답객체 diff --git a/src/main/java/kr/xit/framework/support/tag/code/CodeSelectBoxTag.java b/src/main/java/kr/xit/framework/support/tag/code/CodeSelectBoxTag.java index bffdc523..2eff01a8 100644 --- a/src/main/java/kr/xit/framework/support/tag/code/CodeSelectBoxTag.java +++ b/src/main/java/kr/xit/framework/support/tag/code/CodeSelectBoxTag.java @@ -41,6 +41,7 @@ public class CodeSelectBoxTag extends TagSupport { private String alt = ""; private String onchange = ""; private boolean disabled = false; + private boolean display = true; // 공통코드가 아닌경우 구분 코드 private String type = ""; @@ -58,6 +59,10 @@ public class CodeSelectBoxTag extends TagSupport { if(this.disabled){ sb.append(" disabled "); } + if(!this.display){ + sb.append(" style='display:none'"); + } + //sb.append(" display='").append(this.display).append("'>").append("\n"); sb.append(" alt='").append(this.alt).append("'>").append("\n"); //out.print(" - /** XitAuthUsrMngMapper.findList */ - /** 사용자별권한관리 목록 조회 */ - - - - - - - WHERE 1=1 - - - - - - - - - - - - - - - - - - - - - - - - + /* auth-user-mysql-mapper|selectAuthUsers-사용자별권한관리 목록 조회|julim */ + - + /* auth-user-mysql-mapper|selectAuthUser-사용자별권한관리 정보 조회|julim */ + - - SELECT A.GROUP_ID AS "groupId" - ,A.GROUP_NM AS "groupNm" - ,A.GROUP_DC AS "groupDc" - ,A.GROUP_CREAT_DE AS "groupCreatDe" - - - 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/mngAuthGrpMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp index c8e6b214..943df3d8 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp @@ -45,7 +45,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp index 3718abe2..d3cc477a 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp @@ -1,3 +1,5 @@ +<%@ page import="org.json.simple.JSONObject" %> +<%@ page import="org.json.simple.JSONArray" %> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> @@ -56,10 +58,6 @@ * Global Variable **************************************************************************/ let GRID = null; - const REG_YN = [ - {code: 'Y', codeNm: '등록'}, - {code: 'N', codeNm: '미등록'}, - ] /* ******************************* * Biz function @@ -69,22 +67,18 @@ GRID.reloadData(); } ,add: () => { - var dataSet = GRID.getData(); //Grid에 출력된 DataSet - const arrChecks = GRID.getCheckedRows(); + const arrChecks = GRID.getCheckedRows(); if(arrChecks.length==0) { alert("등록[변경]할 목록을 선택하세요."); return false; } - const arrDatas = []; - arrChecks.forEach((row) => { - arrDatas.push({roleCode: row.roleCode, regYn: row.regYn}) - }); - const data = { authorCode: $('#authorCode').val() - ,grantData: arrDatas + ,grantData: arrChecks.map((row) => { + return {roleCode: row.roleCode, regYn: row.regYn} + }) } if(confirm("등록 하시겠습니까?")) { @@ -137,28 +131,26 @@ { header: '등록여부', name: 'regYn', - // copyOptions: { - // useListItemText: true - // }, + copyOptions: { + useListItemText: true + }, width: 60, align: 'center', sortable: true, + filter: 'select', /* 에디터 적용 */ formatter: 'listItemText', editor: { type: 'radio', //select, radio, checkbox, text options: { listItems: [ - - - - {value: '${row}', text: '${"Y" eq row ? "등록" : "미등록"}' } - - - ,{value: '${row}', text: '${"Y" eq row ? "등록" : "미등록"}' } - - - + + , + { + text: '${row.code_nm}' + ,value: '${row.code}' + } + ] } }, 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 80713def..b9b4a59a 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 @@ -1,7 +1,7 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> - +
그룹 명권한 그룹명 - + @@ -34,9 +29,8 @@
- + 등록 - 삭제
@@ -45,309 +39,144 @@
- diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp index 8d679d91..d9d6cc74 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp @@ -1,180 +1,136 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> + + - - - - - - - +
-

권한 등록

+ <%@include file="/WEB-INF/jsp/framework/biz-popup-title.jsp"%> - - - - + + + + + + + + - - + - - - + + + - + - - + +
권한 등록
그룹 ID
 + / +
+ + + +
그룹 명 - 필수 + +   +   +
설명
+ + + +
권한 + + - +
등록일자 + + + +
-
- - - 저장 - - - 변경 - 삭제 - - 닫기 - -
- + <%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp"%>
- - - - - - - - +
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp index ce9e0ad6..20de3efb 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp @@ -58,21 +58,6 @@ GRID.reloadData(); } - ,pageLink: function(flag, url, params){ - switch (flag) { - case "move": //페이지 이동 - document.frmSearch.roleNm.value = ""; - document.frmSearch.action = url; - document.frmSearch.submit(); - break; - case "popup": //팝업 OPEN - fnBiz.pagePopup(flag, url, params); - break; - default: - break; - } - } - ,pagePopup: function(flag, params){ let url = ''; let popTitle; @@ -180,13 +165,11 @@ }; const gridDatasource = { //DataSource - /* ----------------------- - * DataSource API Setting - ----------------------- */ - //initialRequest: true, // 화면 load시 조회 안함 - default - api: { + initialRequest: true // 화면 load시 조회 안함 - default + ,api: { readData: { url: '' + ,serializer: (params) => fnAddPageInfo(document.frmSearch, params) } } }; diff --git a/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js b/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js index c51e10cd..c31f3851 100644 --- a/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js +++ b/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js @@ -139,8 +139,8 @@ var XitCmmnUtil = { * @param {Object} params json * @returns {Object} form data + params = serialize data return */ -const fnAddPageInfo = (formEliment, params) => { - let serializeParam = $(formEliment).serialize(); +const fnAddPageInfo = (searchForm, params) => { + let serializeParam = $(searchForm).serialize(); for(var key in params){ if(key=='perPage'){ if(params[key]==undefined) From 41aabf98cfa8730e8f2d74b112d402e65ea2a1d8 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Sun, 6 Nov 2022 21:27:54 +0900 Subject: [PATCH 06/13] =?UTF-8?q?feat:=20=EA=B6=8C=ED=95=9C=EA=B7=B8?= =?UTF-8?q?=EB=A3=B9=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/cmm/model/XitAuthorGroupInfoVO.java | 61 ++----- .../service/impl/XitFrameCrudServiceImpl.java | 10 +- .../service/impl/XitFrameUnitServiceImpl.java | 6 +- .../mng/auth/mapper/AuthAuthorMgtMapper.java | 2 + .../biz/mng/auth/mapper/AuthGrpMgtMapper.java | 27 +++ .../auth/service/AuthAuthorMgtService.java | 9 - .../mng/auth/service/AuthGrpMgtService.java | 15 ++ .../service/impl/AuthGrpMgtServiceImpl.java | 166 +++++++++++++++++- .../mng/auth/web/AuthAuthorMgtController.java | 2 +- .../mng/auth/web/AuthGrpMgtController.java | 47 ++++- .../mng/auth/web/AuthRoleMgtController.java | 2 +- .../biz/mng/user/mapper/UserMgtMapper.java | 4 +- .../biz/mng/user/service/UserMgtService.java | 2 - .../user/service/impl/UserMgtServiceImpl.java | 20 +-- .../cache/cachecode-mysql-mapper.xml | 1 + .../mng/auth/auth-author-mysql-mapper.xml | 8 +- .../mng/auth/auth-grp-mysql-mapper.xml | 124 +++++++------ .../framework/mng/usr/user-mysql-mapper.xml | 114 +----------- .../biz/mng/auth/mngAuthAuthorMgtForm.jsp | 5 +- .../biz/mng/auth/mngAuthGrpMgtForm.jsp | 22 ++- .../biz/mng/auth/mngAuthGrpMgtPopup.jsp | 48 ++--- 21 files changed, 403 insertions(+), 292 deletions(-) diff --git a/src/main/java/kr/xit/framework/biz/cmm/model/XitAuthorGroupInfoVO.java b/src/main/java/kr/xit/framework/biz/cmm/model/XitAuthorGroupInfoVO.java index 38f470e1..b93e8ce8 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/model/XitAuthorGroupInfoVO.java +++ b/src/main/java/kr/xit/framework/biz/cmm/model/XitAuthorGroupInfoVO.java @@ -1,6 +1,12 @@ package kr.xit.framework.biz.cmm.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,50 +18,19 @@ 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 XitAuthorGroupInfoVO extends BaseVO { - - /** - * serialVersionUID - */ private static final long serialVersionUID = -4390096179096398215L; - - - protected String group_id; //그룹 id - protected String group_nm; //그룹 명 - protected String group_creat_de; //그룹 생성 일 - protected String group_dc; //그룹 설명 - protected String author_code; //권한 코드 - - public String getGroup_id() { - return group_id; - } - public void setGroup_id(String group_id) { - this.group_id = group_id; - } - public String getGroup_nm() { - return group_nm; - } - public void setGroup_nm(String group_nm) { - this.group_nm = group_nm; - } - public String getGroup_creat_de() { - return group_creat_de; - } - public void setGroup_creat_de(String group_creat_de) { - this.group_creat_de = group_creat_de; - } - public String getGroup_dc() { - return group_dc; - } - public void setGroup_dc(String group_dc) { - this.group_dc = group_dc; - } - public String getAuthor_code() { - return author_code; - } - public void setAuthor_code(String author_code) { - this.author_code = author_code; - } - + private String groupId; //그룹 id + private String groupNm; //그룹 명 + private String groupDc; //그룹 설명 + private String authorCode; //권한 코드 + private String authorNm; + private String groupCreatDe; //그룹 생성 일 } diff --git a/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameCrudServiceImpl.java b/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameCrudServiceImpl.java index 79c173b4..5537724e 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameCrudServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameCrudServiceImpl.java @@ -97,7 +97,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getGroup_id())) + if(XitCmmnUtil.isEmpty(vo.getGroupId())) emsg = String.format("(%s)그룹ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -128,7 +128,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getGroup_id())) + if(XitCmmnUtil.isEmpty(vo.getGroupId())) emsg = String.format("(%s)그룹ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -161,7 +161,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getGroup_id())) + if(XitCmmnUtil.isEmpty(vo.getGroupId())) emsg = String.format("(%s)그룹ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -194,7 +194,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getGroup_id())) + if(XitCmmnUtil.isEmpty(vo.getGroupId())) emsg = String.format("(%s)그룹ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -4981,7 +4981,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ // logger.error(emsg); // throw new RuntimeException(emsg); // } - + /** * 처리 */ diff --git a/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java b/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java index 2ee40f9a..c68cf683 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java @@ -523,16 +523,16 @@ public class XitFrameUnitServiceImpl implements XitFrameUnitService { // 그룹의 권한 조회 XitAuthorGroupInfoVO groupInfo = new XitAuthorGroupInfoVO(); - groupInfo.setGroup_id(groupId); + groupInfo.setGroupId(groupId); groupInfo = xitFrameCrudService.findXitAuthorGroupInfo(groupInfo); // 권한 설정 if (XitCmmnUtil.isEmpty(groupInfo)) return "ROLE_USER"; else { - if (XitCmmnUtil.isEmpty(groupInfo.getAuthor_code())) + if (XitCmmnUtil.isEmpty(groupInfo.getAuthorCode())) return "ROLE_USER"; else - return groupInfo.getAuthor_code(); + return groupInfo.getAuthorCode(); } } 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 53c06d10..fa9b5515 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 @@ -51,6 +51,8 @@ public interface AuthAuthorMgtMapper { int deleteAuthorInfo(final String authorCode); + List selectRoleSclsrtRescues(final XitRoleSclsrtRescueVO vo); + XitRoleSclsrtRescueVO selectRoleSclsrtRescue(final XitRoleSclsrtRescueVO vo); int insertRoleSclsrtRescue(final XitRoleSclsrtRescueVO vo); int deleteRoleSclsrtRescue(final XitRoleSclsrtRescueVO vo); 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 57f79164..23133775 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 @@ -2,8 +2,13 @@ package kr.xit.framework.biz.mng.auth.mapper; import java.sql.SQLException; import java.util.List; +import java.util.Map; + +import org.apache.ibatis.session.RowBounds; import egovframework.rte.psl.dataaccess.mapper.Mapper; +import kr.xit.framework.biz.cmm.model.XitAuthorGroupInfoVO; +import kr.xit.framework.biz.cmm.model.XitRoleSclsrtRescueVO; import kr.xit.framework.biz.mng.auth.model.XitAuthGrpMngSearchVO; import kr.xit.framework.biz.mng.auth.model.XitAuthGrpMngVO; @@ -20,6 +25,26 @@ import kr.xit.framework.biz.mng.auth.model.XitAuthGrpMngVO; @Mapper public interface AuthGrpMgtMapper { + List selectAuthorGroupInfos(final Map paraMap, final RowBounds rowBounds); + XitAuthorGroupInfoVO selectAuthorGroupInfo(final String groupId); + int insertAuthorGroupInfo(final XitAuthorGroupInfoVO vo); + int updateAuthorGroupInfo(final XitAuthorGroupInfoVO vo); + int deleteAuthorGroupInfo(final String groupId); + + + + + + + + + + + + + + + /** * 
메소드 설명: 사용자그룹관리 목록 조회
* @param searchVO @@ -46,4 +71,6 @@ public interface AuthGrpMgtMapper { * @date: 2020. 4. 16. */ public XitAuthGrpMngVO findView(XitAuthGrpMngVO vo) throws SQLException; + + } 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 762eff8f..9df97857 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 @@ -32,16 +32,7 @@ public interface AuthAuthorMgtService { * @date: 2020. 4. 16. */ List findAuthAuthors(final Map paraMap, final RowBounds rowBounds); - - /** - * 
메소드 설명: 권한관리 상세정보 조회
- * @param vo - * @return XitAuthRegMngVO 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 4. 16. - */ XitAuthorInfoVO findAuthAuthor(final String authorCode); - void addAuthAuthor(final XitAuthorInfoVO vo); void modifyAuthAuthor(final XitAuthorInfoVO vo); void removeAuthAuthor(final String authorCode); 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 324b81ee..9d4aca7f 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 @@ -1,7 +1,12 @@ package kr.xit.framework.biz.mng.auth.service; import java.util.List; +import java.util.Map; +import org.apache.ibatis.session.RowBounds; + +import kr.xit.framework.biz.cmm.model.XitAuthorGroupInfoVO; +import kr.xit.framework.biz.cmm.model.XitAuthorInfoVO; import kr.xit.framework.biz.mng.auth.model.XitAuthGrpMngSearchVO; import kr.xit.framework.biz.mng.auth.model.XitAuthGrpMngVO; @@ -17,6 +22,16 @@ import kr.xit.framework.biz.mng.auth.model.XitAuthGrpMngVO; */ public interface AuthGrpMgtService { + List findAuthGrps(final Map paraMap, final RowBounds rowBounds); + XitAuthorGroupInfoVO findAuthGrp(final String groupId); + void addAuthGrp(final XitAuthorGroupInfoVO vo); + void modifyAuthGrp(final XitAuthorGroupInfoVO vo); + void removeAuthGrp(final String authorCode); + + + + + /** * 
메소드 설명: 사용자그룹관리 목록 조회
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 50d870af..6a0f5393 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 @@ -2,28 +2,44 @@ package kr.xit.framework.biz.mng.auth.service.impl; import java.sql.SQLException; import java.util.List; +import java.util.Map; import javax.annotation.Resource; +import org.apache.ibatis.session.RowBounds; import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kr.xit.framework.biz.cmm.model.XitAuthorGroupInfoVO; +import kr.xit.framework.biz.cmm.model.XitRoleSclsrtRescueVO; +import kr.xit.framework.biz.cmm.model.XitUserScrtySetupVO; import kr.xit.framework.biz.cmm.service.XitFrameCrudService; import kr.xit.framework.biz.cmm.service.XitFrameUnitService; +import kr.xit.framework.biz.mng.auth.mapper.AuthAuthorMgtMapper; import kr.xit.framework.biz.mng.auth.mapper.AuthGrpMgtMapper; import kr.xit.framework.biz.mng.auth.model.XitAuthGrpMngSearchVO; import kr.xit.framework.biz.mng.auth.model.XitAuthGrpMngVO; import kr.xit.framework.biz.mng.auth.service.AuthGrpMgtService; +import kr.xit.framework.biz.mng.user.mapper.UserMgtMapper; import kr.xit.framework.core.message.XitMessageSource; import kr.xit.framework.core.utils.XitCmmnUtil; +import kr.xit.framework.support.exception.BizRuntimeException; +import kr.xit.framework.support.util.constants.MessageKey; +import lombok.extern.slf4j.Slf4j; +@Slf4j @Service public class AuthGrpMgtServiceImpl implements AuthGrpMgtService { @Resource - private AuthGrpMgtMapper xitAuthGrpMngMapper; + private AuthGrpMgtMapper mapper; + @Resource + private AuthAuthorMgtMapper authAuthorMgtMapper; + @Resource + private UserMgtMapper userMgtMapper; + + @Resource private XitFrameCrudService xitFrameCrudService; @Resource @@ -33,11 +49,145 @@ public class AuthGrpMgtServiceImpl implements AuthGrpMgtService { @Resource private XitMessageSource xitMessageSource; + @Override + public List findAuthGrps(final Map paraMap, final RowBounds rowBounds) { + return mapper.selectAuthorGroupInfos(paraMap, rowBounds); + } + + @Override + public XitAuthorGroupInfoVO findAuthGrp(final String groupId) { + return mapper.selectAuthorGroupInfo(groupId); + } + + @Override + public void addAuthGrp(final XitAuthorGroupInfoVO vo) { + // 유효성 확인 + boolean isChangePermission = isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthorCode()); + if(!isChangePermission) + throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, "자신의 권한보다 상위 권한을 설정 할 수 없습니다."); + + try { + vo.setGroupId(idgenService.getNextStringId()); + } catch (FdlException e) { + throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, e.getMessage()); + } + mapper.insertAuthorGroupInfo(vo); + } + + @Override + public void modifyAuthGrp(final XitAuthorGroupInfoVO vo) { + // 유효성 확인 + boolean isChangePermission = isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthorCode()); + if(!isChangePermission) + throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, "자신의 권한보다 상위 권한을 설정 할 수 없습니다."); + + mapper.updateAuthorGroupInfo(vo); + } + + @Override + public void removeAuthGrp(final String groupId) { + mapper.deleteAuthorGroupInfo(groupId); + } + + private boolean isCheckUserForCanChange(String uniqId, String trgetAuthorCode) { + //사용자보안설정 조회 + XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); + userScrtySetupVO.setScrtySetupTrgetId(uniqId); + List listUserScrtySetupVO = userMgtMapper.selectUserScrtySetups(userScrtySetupVO); + String userAuthorCode = XitCmmnUtil.isEmpty(listUserScrtySetupVO)?null:listUserScrtySetupVO.get(0).getAuthorCode(); + + return this.isCheckUserAuthorCodeForCanChange(userAuthorCode, trgetAuthorCode); + } + + + private boolean isCheckUserAuthorCodeForCanChange(String userAuthorCode, String trgetAuthorCode) { + //역할(권한)계층구조 데이터 목록 조회 + List listRoleSclsrtRescueVO = authAuthorMgtMapper.selectRoleSclsrtRescues(null); + //역할(권한)계층구조를 사용하지 않고 있는 경우 true 반환 + if(XitCmmnUtil.isEmpty(listRoleSclsrtRescueVO)) { + log.debug("Do not use a RoleSclsrtRescue Data !!"); + return true; + }else { + //사용자의 권한 정보가 없을 때(비정상적인 루트로 등록한 사용자 계정으로 판단) + if(XitCmmnUtil.isEmpty(userAuthorCode)) { + log.debug("This user is have not UserScrtySetup Data !!"); + return false; + } + } + boolean isExists = false; + //사용자 권한과 매칭되는 역할(권한)계층정보 유무 확인 + for(XitRoleSclsrtRescueVO item : listRoleSclsrtRescueVO) { + if(item.getParntsRole().equals(userAuthorCode)) { + isExists = true; + break; + } + } + //사용자 권한이 최상위 권한이면 true 반환 + if(!isExists) + for(XitRoleSclsrtRescueVO item : listRoleSclsrtRescueVO) { + if(item.getChldrnRole().equals(userAuthorCode)) { + log.debug("This user is Top-Level Author !!"); + return true; + } + } + //사용자의 역할(권한)정보가 없으면 false 반환 + if(!isExists) { + log.debug("This user is have not RoleSclsrtRescue Data !!"); + return false; + } + + + /** + * 상위권한 여부 확인 + * + */ + return this.isHighAuthor(listRoleSclsrtRescueVO, userAuthorCode, trgetAuthorCode)?false:true; + } + + private boolean isHighAuthor(List list, String authorCode, String highAuthorCode) { + boolean result = false; + + for (XitRoleSclsrtRescueVO item : list) { + // 상위 권한으로 확인 되었으면 stop + if (result) + break; + // 권한코드가 일치하지 않으면 skip + if (!item.getParntsRole().equals(authorCode)) + continue; + + if (item.getChldrnRole().equals(highAuthorCode)) { // 상위 권한과 일치하면 + result = true; + } else { // 상위 권한과 일치하지 않으면 재호출 + result = this.isHighAuthor(list, item.getChldrnRole(), highAuthorCode); + } + } + + return result; + } + + + + + + + + + + + + + + + + + + + @Override public List findList(XitAuthGrpMngSearchVO searchVO) { List result = null; try { - result = xitAuthGrpMngMapper.findList(searchVO); + result = mapper.findList(searchVO); } catch (SQLException e) { throw new RuntimeException("사용자그룹관리 목록 조회 FAIL::", e); } @@ -48,7 +198,7 @@ public class AuthGrpMgtServiceImpl implements AuthGrpMgtService { public int findListTotCnt(XitAuthGrpMngSearchVO searchVO) { int result = 0; try { - result = xitAuthGrpMngMapper.findListTotCnt(searchVO); + result = mapper.findListTotCnt(searchVO); } catch (SQLException e) { throw new RuntimeException("사용자그룹관리 목록 총건수 조회 FAIL::", e); } @@ -59,7 +209,7 @@ public class AuthGrpMgtServiceImpl implements AuthGrpMgtService { public XitAuthGrpMngVO findView(XitAuthGrpMngVO vo) { XitAuthGrpMngVO result = null; try { - result = xitAuthGrpMngMapper.findView(vo); + result = mapper.findView(vo); } catch (SQLException e) { throw new RuntimeException("사용자그룹관리 상세정보 조회 FAIL::", e); } @@ -155,11 +305,11 @@ public class AuthGrpMgtServiceImpl implements AuthGrpMgtService { */ private XitAuthorGroupInfoVO convertToCrudVO(XitAuthGrpMngVO vo) { XitAuthorGroupInfoVO authorGroupInfoVO = new XitAuthorGroupInfoVO(); - authorGroupInfoVO.setGroup_id (vo.getGroupId()); //그룹 id - authorGroupInfoVO.setGroup_nm (vo.getGroupNm()); //그룹 명 + authorGroupInfoVO.setGroupId(vo.getGroupId()); //그룹 id + authorGroupInfoVO.setGroupNm(vo.getGroupNm()); //그룹 명 // authorGroupInfoVO.setGroup_creat_de(); //그룹 생성 일 - authorGroupInfoVO.setGroup_dc (vo.getGroupDc()); //그룹 설명 - authorGroupInfoVO.setAuthor_code (vo.getAuthorCode()); //권한 코드 + authorGroupInfoVO.setGroupDc(vo.getGroupDc()); //그룹 설명 + authorGroupInfoVO.setAuthorCode(vo.getAuthorCode()); //권한 코드 return authorGroupInfoVO; } 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 c1c9b147..ecf4c650 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 @@ -84,7 +84,7 @@ public class AuthAuthorMgtController { public ModelAndView mngAuthAuthorMgtPopup(@ModelAttribute final XitAuthorInfoVO vo){ ModelAndView mav = new ModelAndView(); - if(Checks.isEmpty(vo)){ + if(Checks.isEmpty(vo) || Checks.isEmpty(vo.getAuthorCode())){ mav.addObject("authorInfoVO", new XitAuthorInfoVO()); mav.addObject("pageTitle", "권한 등록"); } else { 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 a6a3f858..2e33772b 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 @@ -18,6 +18,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; @@ -26,6 +27,7 @@ import org.springframework.web.bind.support.SessionStatus; import org.springframework.web.servlet.ModelAndView; 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.XitAuthGrpMngVO; @@ -38,8 +40,10 @@ import kr.xit.framework.core.model.ResultResponse; import kr.xit.framework.core.utils.XitCmmnUtil; import kr.xit.framework.core.validation.XitBeanValidator; 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.Checks; +import kr.xit.framework.support.util.constants.MessageKey; /** * @@ -78,14 +82,14 @@ public class AuthGrpMgtController { } @RequestMapping(value = "/mngAuthGrpMgtPopup") - public ModelAndView mngAuthAuthorMgtPopup(@ModelAttribute final XitAuthGrpMngVO vo){ + public ModelAndView mngAuthAuthorMgtPopup(@ModelAttribute final XitAuthorGroupInfoVO vo){ ModelAndView mav = new ModelAndView(); - if(Checks.isEmpty(vo)){ - mav.addObject("authGrpVO", new XitAuthGrpMngVO()); + if(Checks.isEmpty(vo) || Checks.isEmpty(vo.getGroupId())){ + mav.addObject("groupManage", new XitAuthorGroupInfoVO()); mav.addObject("pageTitle", "권한그룹 등록"); } else { - mav.addObject("authGrpVO", vo); + mav.addObject("groupManage", vo); mav.addObject("pageTitle", "권한그룹 변경"); } mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/mngAuthGrpMgtPopup.popup"); @@ -94,10 +98,41 @@ public class AuthGrpMgtController { @GetMapping(value = "/findAuthGrps") public ModelAndView findAuthAuthors(@RequestParam final Map paraMap) { - //return ResultResponse.of(service.findAuthAuthors(paraMap, MybatisUtils.getPagingInfo(paraMap))); - return null; + return ResultResponse.of(service.findAuthGrps(paraMap, MybatisUtils.getPagingInfo(paraMap))); } + @PostMapping(value = "/addAuthGrp") + //public ModelAndView addAuthAuthor(@ModelAttribute final XitAuthorInfoVO vo, final BindingResult bindingResult){ + public ModelAndView addAuthAuthor(@ModelAttribute final XitAuthorGroupInfoVO vo){ + ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); + + //TODO : validate + //ValidationError.of("", vo, bindingResult); + service.addAuthGrp(vo); + AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); + return mav; + } + + @PostMapping(value = "/modifyAuthGrp") + //public ModelAndView modifyAuthAuthor(@ModelAttribute final XitAuthorInfoVO vo, final BindingResult bindingResult){ + public ModelAndView modifyAuthAuthor(@ModelAttribute final XitAuthorGroupInfoVO vo){ + ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); + + //TODO : validate + //ValidationError.of("", vo, bindingResult); + service.modifyAuthGrp(vo); + AjaxMessageMapRenderer.success(mav, MessageKey.CMM_UPDATE_SUCCESS); + return mav; + } + + @PostMapping(value = "/removeAuthGrp") + public ModelAndView removeAuthAuthor(final String groupId){ + ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); + + service.removeAuthGrp(groupId); + AjaxMessageMapRenderer.success(mav, MessageKey.CMM_DELETE_SUCCESS); + return mav; + } diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthRoleMgtController.java b/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthRoleMgtController.java index 19439ad6..8343e085 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthRoleMgtController.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthRoleMgtController.java @@ -77,7 +77,7 @@ public class AuthRoleMgtController { public ModelAndView mngAuthRoleMgtPopup(@ModelAttribute final XitRoleInfoVO vo){ ModelAndView mav = new ModelAndView(); - if(Checks.isEmpty(vo)){ + if(Checks.isEmpty(vo) || Checks.isEmpty(vo.getRoleCode())){ mav.addObject("roleManage", new XitRoleInfoVO()); mav.addObject("pageTitle", "롤 등록"); } else { diff --git a/src/main/java/kr/xit/framework/biz/mng/user/mapper/UserMgtMapper.java b/src/main/java/kr/xit/framework/biz/mng/user/mapper/UserMgtMapper.java index 6aca8a08..4a71eb2e 100644 --- a/src/main/java/kr/xit/framework/biz/mng/user/mapper/UserMgtMapper.java +++ b/src/main/java/kr/xit/framework/biz/mng/user/mapper/UserMgtMapper.java @@ -32,6 +32,7 @@ public interface UserMgtMapper { */ List selectUsers(final Map paraMap, final RowBounds rowBounds); XitUserInfoVO selectUser(final String uniqId); + @SuppressWarnings("MybatisXMapperMethodInspection") Map selectCheckUserInfo(final String userId); int insertUserInfo(final XitUserInfoVO vo); int updateUserInfo(final XitUserInfoVO vo); @@ -42,11 +43,12 @@ public interface UserMgtMapper { - Map selectAuthorGroupInfo(final Map map); + //Map selectAuthorGroupInfo(final Map map); + List selectUserScrtySetups(final XitUserScrtySetupVO vo); XitUserScrtySetupVO selectUserScrtySetup(final String scrtySetupTrgetId); int insertUserScrtySetup(final XitUserScrtySetupVO vo); int updateUserScrtySetup(final XitUserScrtySetupVO vo); diff --git a/src/main/java/kr/xit/framework/biz/mng/user/service/UserMgtService.java b/src/main/java/kr/xit/framework/biz/mng/user/service/UserMgtService.java index a7f88dd7..a9e0892b 100644 --- a/src/main/java/kr/xit/framework/biz/mng/user/service/UserMgtService.java +++ b/src/main/java/kr/xit/framework/biz/mng/user/service/UserMgtService.java @@ -38,8 +38,6 @@ public interface UserMgtService { String getDefaultAuthorCode(final String groupId); - Map findAuthorGroupInfo(final String groupId); - int addUserScrtySetup(final XitUserScrtySetupVO vo); int addXitUserEtcOption(final XitUserEtcOptionVO vo); diff --git a/src/main/java/kr/xit/framework/biz/mng/user/service/impl/UserMgtServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/user/service/impl/UserMgtServiceImpl.java index a7a0b13b..857cdf37 100644 --- a/src/main/java/kr/xit/framework/biz/mng/user/service/impl/UserMgtServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/user/service/impl/UserMgtServiceImpl.java @@ -13,11 +13,13 @@ import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kr.xit.framework.biz.cmm.model.XitAuthorGroupInfoVO; import kr.xit.framework.biz.cmm.model.XitUserEtcOptionVO; import kr.xit.framework.biz.cmm.model.XitUserInfoVO; import kr.xit.framework.biz.cmm.model.XitUserScrtySetupVO; import kr.xit.framework.biz.cmm.service.XitFrameCrudService; import kr.xit.framework.biz.cmm.model.XitLoginVO; +import kr.xit.framework.biz.mng.auth.mapper.AuthGrpMgtMapper; import kr.xit.framework.biz.mng.user.mapper.UserMgtMapper; import kr.xit.framework.biz.mng.user.model.XitUserRegMngVO; import kr.xit.framework.biz.mng.user.service.UserMgtService; @@ -33,6 +35,8 @@ public class UserMgtServiceImpl implements UserMgtService { @Resource private UserMgtMapper mapper; @Resource + private AuthGrpMgtMapper authGrpMgtMapper; + @Resource private XitFrameCrudService xitFrameCrudService; @Resource private XitMessageSource xitMessageSource; @@ -165,26 +169,18 @@ public class UserMgtServiceImpl implements UserMgtService { public String getDefaultAuthorCode(final String groupId) { if(Checks.isEmpty(groupId)) return "ROLE_USER"; - Map authMap = findAuthorGroupInfo(groupId); + XitAuthorGroupInfoVO vo = authGrpMgtMapper.selectAuthorGroupInfo(groupId); // 권한 설정 - if (Checks.isEmpty(authMap)) + if (Checks.isEmpty(vo)) return "ROLE_USER"; else { - if (Checks.isEmpty(authMap.get("author_code"))) + if (Checks.isEmpty(vo.getAuthorCode())) return "ROLE_USER"; else - return String.valueOf(authMap.get("author_code")); + return vo.getAuthorCode(); } } - @Override - public Map findAuthorGroupInfo(final String groupId) { - if(Checks.isEmpty(groupId)) throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, "그룹ID(은)는 필수조건 입니다"); - Map map = new HashMap<>(); - map.put("groupId", groupId); - return mapper.selectAuthorGroupInfo(map); - } - @Override public int addUserScrtySetup(final XitUserScrtySetupVO vo) { diff --git a/src/main/resources/sqlmapper/framework/cache/cachecode-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/cache/cachecode-mysql-mapper.xml index f4185696..b5291d5e 100644 --- a/src/main/resources/sqlmapper/framework/cache/cachecode-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/cache/cachecode-mysql-mapper.xml @@ -42,6 +42,7 @@ SELECT author_code AS code , author_nm AS code_nm FROM xit_author_info + 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 831ad906..6c471b12 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 @@ -114,8 +114,8 @@ - + /* auth-author-mysql-mapper|selectRoleSclsrtRescues-역할계층 조회|julim */ SELECT parnts_role , chldrn_role FROM xit_role_sclsrt_rescue @@ -129,8 +129,8 @@ - + /* auth-author-mysql-mapper|selectRoleSclsrtRescue-역할계층 정보 조회|julim */ SELECT parnts_role , chldrn_role FROM xit_role_sclsrt_rescue 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 39b980ca..a6efd813 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 @@ -3,71 +3,68 @@ - + /* auth-grp-mysql-mapper|selectAuthorGroupInfos-권한그룹 목록 조회|julim */ + SELECT agi.group_id + , agi.group_nm + , agi.group_dc + , agi.author_code + , xai.author_nm + , agi.group_creat_de + FROM xit_author_group_info agi + LEFT OUTER JOIN xit_author_info xai + ON agi.author_code = xai.author_code + + + AND agi.group_nm = #{groupNm} + + - + /* auth-grp-mysql-mapper|selectAuthorGroupInfo-권한그룹 정보 조회|julim */ + SELECT group_id + , group_nm + , group_dc + , author_code + , group_creat_de + FROM xit_author_group_info + WHERE group_id = #{groupId} - - /** addXitAuthorGroupInfo */ - /** 권한그룹정보 등록 */ - INSERT INTO XIT_AUTHOR_GROUP_INFO( - GROUP_ID - ,GROUP_NM - ,GROUP_CREAT_DE - ,GROUP_DC - ,AUTHOR_CODE + + + /* auth-grp-mysql-mapper|insertAuthorGroupInfo-권한그룹 등록|julim */ + INSERT INTO xit_author_group_info( + group_id + , group_nm + , group_dc + , author_code + , group_creat_de )VALUES( - #{group_id } - ,#{group_nm } - ,DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') - ,#{group_dc } - ,#{author_code } + #{groupId} + , #{groupNm} + , #{groupDc} + , #{authorCode} + , DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') ) - - /** modifyXitAuthorGroupInfo */ - /** 권한그룹정보 수정 */ - UPDATE XIT_AUTHOR_GROUP_INFO - SET - GROUP_CREAT_DE = GROUP_CREAT_DE - ,GROUP_NM = #{group_nm } - ,GROUP_DC = #{group_dc } - ,AUTHOR_CODE = #{author_code} - WHERE 1=1 - AND GROUP_ID = #{group_id} + + + /* auth-grp-mysql-mapper|updateAuthorGroupInfo-권한그룹 정보 변경|julim */ + UPDATE xit_author_group_info + SET group_nm = IF(group_nm = #{groupNm}, group_nm, #{groupNm}) + , group_dc = IF(group_dc = #{groupDc}, group_dc, #{groupDc}) + , author_code = IF(author_code = #{authorCode}, author_code, #{authorCode}) + WHERE group_id = #{groupId} - - /** removeXitAuthorGroupInfo */ - /** 권한그룹정보 삭제 */ - DELETE FROM XIT_AUTHOR_GROUP_INFO - WHERE 1=1 - AND GROUP_ID = #{group_id} + + + /* auth-grp-mysql-mapper|deleteAuthorGroupInfo-권한그룹 삭제|julim */ + DELETE + FROM xit_author_group_info + WHERE group_id = #{groupId} @@ -77,6 +74,17 @@ + + + + + + + + + + + SELECT LIST.* FROM( diff --git a/src/main/resources/sqlmapper/framework/mng/usr/user-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/usr/user-mysql-mapper.xml index 96b93194..c40d09cb 100644 --- a/src/main/resources/sqlmapper/framework/mng/usr/user-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/mng/usr/user-mysql-mapper.xml @@ -205,13 +205,14 @@ - + /* user-mysql-mapper|delectEntrprsMber-기업사용자정보 삭제|julim */ DELETE FROM xit_entrprs_mber WHERE entrprs_mber_id = #{userId} + @@ -467,116 +468,5 @@ - - - - - /** modifyXitUserInfoChangeDtls */ - /** 사용자정보변경내역 수정 */ - UPDATE XIT_USER_INFO_CHANGE_DTLS - SET - CHANGE_DE = DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') - ,ORGNZT_ID = #{orgnzt_id } - ,GROUP_ID = #{group_id } - ,EMPL_NO = #{empl_no } - ,SEXDSTN_CODE = #{sexdstn_code } - ,BRTHDY = #{brthdy } - ,FXNUM = #{fxnum } - ,HOUSE_ADRES = #{house_adres } - ,HOUSE_END_TELNO = #{house_end_telno } - ,AREA_NO = #{area_no } - ,DETAIL_ADRES = #{detail_adres } - ,ZIP = #{zip } - ,OFFM_TELNO = #{offm_telno } - ,MBTLNUM = #{mbtlnum } - ,EMAIL_ADRES = #{email_adres } - ,HOUSE_MIDDLE_TELNO = #{house_middle_telno} - ,PSTINST_CODE = #{pstinst_code } - ,USER_STTUS_CODE = #{user_sttus_code } - ,ESNTL_ID = #{esntl_id } - WHERE 1=1 - AND USER_ID = #{user_id } - AND CHANGE_DE = #{change_de} - - - /** removeXitUserInfoChangeDtls */ - /** 사용자정보변경내역 삭제 */ - DELETE FROM XIT_USER_INFO_CHANGE_DTLS - WHERE 1=1 - AND USER_ID = #{user_id } - AND CHANGE_DE = #{change_de} - diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp index cd520e64..35ebb530 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp @@ -153,7 +153,10 @@ name: 'authorCreatDe', width: 120, sortable: false, - align: 'center' + align: 'center', + formatter({value}) { + return setDateTimeFmt(value); // + } }, { header: '롤정보', diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp index 23661f40..092c57e3 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp @@ -40,6 +40,19 @@ From 7a936cacdde6c566afa4b8eb83a692b8c88f57e4 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Sun, 6 Nov 2022 21:42:35 +0900 Subject: [PATCH 07/13] =?UTF-8?q?feat:=20=EA=B6=8C=ED=95=9C=EB=B3=84=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B4=80=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AuthUserMgtServiceImpl.java | 12 +++++----- .../mng/auth/web/AuthUserMgtController.java | 23 ++++++++----------- .../biz/mng/auth/mngAuthUserMgtForm.jsp | 18 +++++---------- 3 files changed, 21 insertions(+), 32 deletions(-) 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 fde4ea3a..a5b66a0c 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,7 +22,7 @@ import kr.xit.framework.core.utils.XitCmmnUtil; public class AuthUserMgtServiceImpl implements AuthUserMgtService { @Resource - private AuthUserMgtMapper xitAuthUsrMngMapper; + private AuthUserMgtMapper mapper; @Resource private XitFrameCrudService xitFrameCrudService; @Resource @@ -32,7 +32,7 @@ public class AuthUserMgtServiceImpl implements AuthUserMgtService { public List findList(XitAuthUsrMngSearchVO searchVO) { List result = null; try { - result = xitAuthUsrMngMapper.findList(searchVO); + result = mapper.findList(searchVO); } catch (SQLException e) { throw new RuntimeException("사용자별권한관리 목록 조회 FAIL::", e); } @@ -43,7 +43,7 @@ public class AuthUserMgtServiceImpl implements AuthUserMgtService { public int findListTotCnt(XitAuthUsrMngSearchVO searchVO) { int result = 0; try { - result = xitAuthUsrMngMapper.findListTotCnt(searchVO); + result = mapper.findListTotCnt(searchVO); } catch (SQLException e) { throw new RuntimeException("사용자별권한관리 목록 총건수 조회 FAIL::", e); } @@ -54,7 +54,7 @@ public class AuthUserMgtServiceImpl implements AuthUserMgtService { public XitAuthUsrMngVO findView(XitAuthUsrMngVO vo) { XitAuthUsrMngVO result = null; try { - result = xitAuthUsrMngMapper.findView(vo); + result = mapper.findView(vo); } catch (SQLException e) { throw new RuntimeException("사용자별권한관리 상세정보 조회 FAIL::", e); } @@ -145,13 +145,13 @@ public class AuthUserMgtServiceImpl implements AuthUserMgtService { @Override public List> findListGroup(XitBaseSearchVO searchVO) { - return xitAuthUsrMngMapper.findListGroup(searchVO); + return mapper.findListGroup(searchVO); } @Override public int findListGroupTotCnt(XitBaseSearchVO searchVO) { - return xitAuthUsrMngMapper.findListGroupTotCnt(searchVO); + return mapper.findListGroupTotCnt(searchVO); } 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 b769bd77..6d3af006 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 @@ -24,10 +24,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.support.SessionStatus; -import org.springframework.web.servlet.ModelAndView; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; -import kr.xit.framework.biz.cmm.model.XitAuthorInfoVO; import kr.xit.framework.biz.cmm.service.XitFrameCrudService; import kr.xit.framework.biz.mng.auth.model.XitAuthUsrMngSearchVO; import kr.xit.framework.biz.mng.auth.model.XitAuthUsrMngVO; @@ -54,7 +52,7 @@ import kr.xit.framework.support.util.AjaxUtils; public class AuthUserMgtController { @Resource - private AuthUserMgtService xitAuthUsrMngService; + private AuthUserMgtService service; @Resource private XitFrameCrudService xitFrameCrudService; @Autowired @@ -70,10 +68,7 @@ public class AuthUserMgtController { * @date: 2020. 4. 16. */ @GetMapping(value = "/mngAuthUserMgtForm") - public ModelAndView mngAuthUserMgtForm(@ModelAttribute("authorGroupVO") XitAuthUsrMngSearchVO searchVO) { - ModelAndView mav = new ModelAndView(); - mav.addObject("authorManageList", xitFrameCrudService.findXitAuthorInfos(new XitAuthorInfoVO())); - return mav; + public void mngAuthUserMgtForm(@ModelAttribute("authorGroupVO") XitAuthUsrMngSearchVO searchVO) { } /** @@ -100,7 +95,7 @@ public class AuthUserMgtController { /** * 조회 */ - int totCnt = xitAuthUsrMngService.findListTotCnt(searchVO); + int totCnt = service.findListTotCnt(searchVO); paginationInfo.setTotalRecordCount(totCnt); /** * 반환값 설정 @@ -111,7 +106,7 @@ public class AuthUserMgtController { 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", xitAuthUsrMngService.findList(searchVO)); //[tui Grid] data-contents + data.put("contents", service.findList(searchVO)); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("page", searchVO.getPage()); pagination.put("totalCount", totCnt); @@ -195,9 +190,9 @@ public class AuthUserMgtController { searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - list = xitAuthUsrMngService.findListGroup(searchVO); + list = service.findListGroup(searchVO); - totCnt = xitAuthUsrMngService.findListGroupTotCnt(searchVO); + totCnt = service.findListGroupTotCnt(searchVO); paginationInfo.setTotalRecordCount(totCnt); model.addAttribute("groupList", list); @@ -265,9 +260,9 @@ public class AuthUserMgtController { vo.setAuthorCode(strAuthorCodes[i]); vo.setMberTyCode(strMberTyCode[i]); if("N".equals(strRegYns[i])) - xitAuthUsrMngService.addProc(vo); + service.addProc(vo); else - xitAuthUsrMngService.modifyProc(vo); + service.modifyProc(vo); } status.setComplete(); message = xitMessageSource.getMessage("success.common.insert"); @@ -292,7 +287,7 @@ public class AuthUserMgtController { case "deletes": //다건 삭제 //처리 try { - xitAuthUsrMngService.removesProc(userIds, groupIds); + service.removesProc(userIds, groupIds); status.setComplete(); message = xitMessageSource.getMessage("success.common.delete"); } catch (RuntimeException e) { 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 60d0a56d..69680865 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 @@ -1,15 +1,7 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> - - - - - - - - - +
@@ -18,9 +10,9 @@ - + - + @@ -31,7 +23,9 @@ " /> - 그룹검색검색 + + 그룹검색검색 + diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp index 33b228bd..c8e6b214 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp @@ -1,9 +1,7 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> -<%--@elvariable id="groupManage" type=""--%> - + @@ -24,7 +22,14 @@ @@ -32,8 +37,7 @@ @@ -65,7 +69,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/XitMenuListMng_input.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/XitMenuListMng_input.jsp index 5ffede1b..51f7398f 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/XitMenuListMng_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/XitMenuListMng_input.jsp @@ -11,6 +11,7 @@ +<%--@elvariable id="menuManageVO" type=""--%> @@ -22,37 +23,53 @@

메뉴목록 생성

From 9aa4528d7062bbcf71d737df62a64407ebf13c88 Mon Sep 17 00:00:00 2001 From: minuk926 Date: Mon, 7 Nov 2022 13:05:00 +0900 Subject: [PATCH 08/13] fix: popup fix --- .../biz/mng/auth/mngAuthAuthorMgtPopup.jsp | 10 +++++-- .../biz/mng/auth/mngAuthGrpMgtPopup.jsp | 22 ++++++++------ .../biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp | 2 -- .../biz/mng/auth/mngAuthRoleMgtPopup.jsp | 29 +++---------------- 4 files changed, 25 insertions(+), 38 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp index ad72ef85..675774db 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp @@ -5,7 +5,6 @@
-
<%@include file="/WEB-INF/jsp/framework/biz-popup-title.jsp"%> @@ -21,7 +20,14 @@
-   + + +   + + +   + +
- + + + + + + + +
-   - +  
+ + + + + + - - + - - + - - + - - + - - +
메뉴 등록화면
필수 + + +   필수 + + +  
필수 + + +   필수 + + +  
필수 + + +   @@ -85,8 +102,8 @@
- 등록 - 닫기 + 등록 + 닫기
@@ -118,10 +135,6 @@ $(document).ready(function(){ ******************************* */ var XitMenuListMng_input = { init : function(){ - //닫기 버튼 Event - $("#btnClose").click(function() { - window.close(); - }); //저장 버튼 Event 설정 $('#btnSave').on({ click: function(){ diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuMgtForm.jsp index bfd9346a..894ec163 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuMgtForm.jsp @@ -40,8 +40,8 @@
- - 일괄등록 + + 일괄등록 등록 삭제 diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtPopup.jsp index 7916d98b..f750a489 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtPopup.jsp @@ -25,7 +25,7 @@
- +
- +
@@ -17,15 +17,13 @@
- + + + - " /> - - 그룹검색검색 - + "/> + @@ -36,7 +34,7 @@
- + 권한등록 권한취소 @@ -55,126 +53,78 @@ ******************************* */ const fnBiz = { search : function(){ - instance.reloadData(); + GRID.reloadData(); }, /* ======================== * 데이터 등록 ======================== */ add : function(){ - var varFrom = document.getElementById("listForm"); - var param = $(varFrom).serialize(); - $.ajax({ - url : "/framework/biz/mng/auth/AuthUsrMng_insert_proc.do", - data : param, - type : "post", - dataType : "json", - success : function(data) { - alert(data.resp.message); - fnBiz.search(); - }, - error: function(){ - - } - }); - }, - /* ======================== - * 데이터 수정 - ======================== */ - modify : function(){ - }, - /* ======================== - * 데이터 삭제 - ======================== */ - remove : function(){ - var varFrom = document.getElementById("listForm"); - var param = $(varFrom).serialize(); - $.ajax({ - url : "/framework/biz/mng/auth/AuthUsrMng_deletes_proc.do", - data : param, - type : "post", - dataType : "json", - success : function(data) { - alert(data.resp.message); - fnBiz.search(); - }, - error: function(){ - - } - }); - }, - /* ======================== - * 페이지 이동 - -외부사이트 링크가 필요 시 사용(내부코드는 각 페이지에 맞게 수정, ex>https://www.gov.kr/portal/main ) - ======================== */ - pageLink: function(flag, url, params){ - switch (flag) { - case "": // - break; - default: - break; - } - }, - /* ======================== - * 페이지 Open - -팝업페이지를 Open 한다. - ======================== */ - pagePopup: function(flag, url, params){ - var popUrl = url; - popUrl += "?tilesDef=popup"; - if(!(params == undefined || params == null)){ - popUrl += "&"; - popUrl += params; - } - var popTitle = ''; - switch (flag) { - case "grp": //등록 - popTitle = "그룹 조회"; - popOption = "height=500, width=800, top=50, left=20, scrollbars=no, resizable=no"; - break; - default: - break; + const arrDatas = fnBiz.getCheckedList(); + + if(confirm("권한을 등록 하시겠습니까?")) { + cmmAjax({ + url: '' + ,data: JSON.stringify(arrDatas) + ,contentType: 'application/json; charset=utf-8' + ,success: () => { + fnBiz.search(); + } + }) } + } - window.open(popUrl, popTitle ,popOption); - }, - fncManageChecked : function(){ - var checkArr = instance.getCheckedRows(); + ,modify : function(){ + } - var returnId = ""; - var returnAuthor = ""; - var returnRegYn = ""; - var returnmberTyCode = ""; - var returnGroupId = ""; + ,remove : function(){ + const arrDatas = fnBiz.getCheckedList(); - var returnBoolean = false; + if(confirm("권한을 취소 하시겠습니까?")) { + cmmAjax({ + url: '' + ,data: JSON.stringify(arrDatas) + ,contentType: 'application/json; charset=utf-8' + ,success: () => { + fnBiz.search(); + } + }) + } + } - if(instance.getData().length == 0 ){ - alert("조회된 결과가 없습니다."); - }else if(checkArr.length == 0){ - alert("선택된 권한이 없습니다."); - }else{ - checkArr.forEach(function(item, index){ + ,getCheckedList: ()=>{ + const arrChecks = GRID.getCheckedRows(); - returnId += item.uniqId; - returnAuthor += item.authorCode; - returnRegYn += item.regYn; - returnmberTyCode += item.mberTyCode; - returnGroupId += item.groupId; + if(arrChecks.length === 0) { + alert("목록을 선택해 주세요."); + return false; + } - if(checkArr.length -1 > index){ - returnId += ";"; - returnAuthor += ";"; - returnRegYn += ";"; - returnmberTyCode += ";"; - returnGroupId += ";"; - } - }) + return arrChecks.map((row) => { + return { + uniqId: row.uniqId + , authorCode: row.authorCode + , mberTyCode: row.mberTyCode + , groupId: row.groupId + , regYn: row.regYn + } + }); + } - document.listForm.userIds.value = returnId; - document.listForm.authorCodes.value = returnAuthor; - document.listForm.regYns.value = returnRegYn; - document.listForm.mberTyCodes.value = returnmberTyCode; - document.listForm.groupIds.value = returnGroupId; + ,onSearchChange: () => { + if($('#searchCondition').val() === 'groupId'){ + $('select[name="searchKeyword"]') + .css('display', 'inline-block') + .attr('disabled', false); + $('input[name="searchKeyword"]') + .css('display', 'none') + .attr('disabled', true); + }else{ + $('select[name="searchKeyword"]') + .css('display', 'none') + .attr('disabled', true); + $('input[name="searchKeyword"]') + .css('display', 'inline-block') + .attr('disabled', false); } } } @@ -186,27 +136,13 @@ $('#btnSearch').on('click', () => { fnBiz.search(); }); - //등록 Event 설정 + $("#btnRegist").click(function(){ - if(confirm("권한등록을 하시겠습니까?")){ - fnBiz.fncManageChecked(); - if($('#userIds').val()){ - fnBiz.search(); - } - } + fnBiz.add(); }); - //삭제 Event 설정 + $("#btnRemove").click(function(){ - if(confirm("삭제하시겠습니까?")){ - fnBiz.fncManageChecked(); - if($('#userIds').val()){ - fnBiz.remove(); - } - } - }); - //그룹검색 버튼 Event 설정 - $("#grpSearch_btn").click(function(){ - fnBiz.pagePopup('grp',"", null); + fnBiz.remove(); }); }); @@ -250,11 +186,11 @@ type: "select", options: { listItems: [ - + , { - text: '${row.author_nm}' - ,value: '${row.author_code}' + text: '${row.code_nm}' + ,value: '${row.code}' } ] @@ -267,7 +203,8 @@ name: 'regYn', width: 60, sortable: false, - align: 'center' + align: 'center', + edit: true } ]; @@ -289,7 +226,7 @@ initialRequest: true, // 화면 load시 조회 안함 - default api: { readData: { - url: '' + url: '' ,serializer: (params) => fnAddPageInfo(document.frmSearch, params) } } @@ -299,7 +236,6 @@ }); } - /************************************************************************** * initialize **************************************************************************/ diff --git a/src/main/webapp/WEB-INF/tlds/code.tld b/src/main/webapp/WEB-INF/tlds/code.tld index 87306277..3789c337 100644 --- a/src/main/webapp/WEB-INF/tlds/code.tld +++ b/src/main/webapp/WEB-INF/tlds/code.tld @@ -78,7 +78,10 @@ disabled - false + true + + + display true diff --git a/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js b/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js index c31f3851..52667a69 100644 --- a/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js +++ b/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js @@ -215,13 +215,20 @@ const cmmAjax = (param) => { }; /** + * 
+ * 팝업호출시(isPopup)
  * 1) alert confirm 후 업무처리
  * 2) 부모(opener) 의 callBackSerch 실행
  * 3) window close
+ * 일반호출시
+ * 1) alert confirm 후 업무처리
+ * 2) fnBiz.search() 호출
+ *
* @param {String} workType add | modify | remove - * @param {Object} param + * @param {Object} param parameter data + * */ -const cmmBizAjax = (workType, param) => { +const cmmBizAjax = (workType, param, isPopup = true) => { let confirmMsg = '하시겠습니까?'; if(workType === 'add') confirmMsg = `등록 ${confirmMsg}`; else if(workType === 'modify') confirmMsg = `변경 ${confirmMsg}`; @@ -235,8 +242,12 @@ const cmmBizAjax = (workType, param) => { success: ()=>{ //if(callback === 'function') window.opener.callback(); //else window.opener.callbackSearch(); - window.opener.callbackSearch(); - window.close(); + if(isPopup) { + window.opener.callbackSearch(); + window.close(); + }else{ + fnBiz.search(); + } } }); if(confirm(confirmMsg)) { From a29e302bc2a8756e97b565faa743568786371828 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Tue, 8 Nov 2022 04:30:21 +0900 Subject: [PATCH 12/13] fix: grid cell style --- README.md | 22 ++++++++++ .../biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp | 44 +++++++++++-------- .../biz/mng/auth/mngAuthUserMgtForm.jsp | 3 +- .../resources/framework/js/cmm/cmmUtil.js | 16 +++++++ .../framework/js/cmm/xit-tui-grid.js | 3 +- 5 files changed, 67 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 3d401ac4..8cfac1cb 100644 --- a/README.md +++ b/README.md @@ -128,3 +128,25 @@ access token : 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 <%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp"%> ``` +#### columns style +```js + { + header: '롤 명', + name: 'roleNm', + width: 150, + sortingType: 'desc', + sortable: true, + filter: 'select', + renderer: { + styles: { + //fontWeight: 'bold', + background: (props) => props.value === 'Y' ? 'cyan' : 'red' + }, + attributes: { + 'data-type': 'default', + title: (props) => `title: ${props.formattedValue}` + }, + classNames: ['blue'] + } + } +``` diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp index d3cc477a..ad67a800 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp @@ -65,6 +65,10 @@ const fnBiz = { search: () => { GRID.reloadData(); + //TODO : onGridUpdated + GRID.on('onGridUpdated', (ev) => { + console.log('%%%%%%%%%%%%%>>>>>>>',ev) + }) // 그리드 레이아웃 새로고침 (로드가 다 되지 않는 경우 그리드가 흰색 화면으로 출력될 때가 있다.)) } ,add: () => { const arrChecks = GRID.getCheckedRows(); @@ -130,10 +134,8 @@ }, { header: '등록여부', + headerCellClass: 'blue', name: 'regYn', - copyOptions: { - useListItemText: true - }, width: 60, align: 'center', sortable: true, @@ -154,13 +156,12 @@ ] } }, - onBeforeChange: function(ev) { //변경 전(ev.value)/후(ev.nextValue) -// console.log('Grade before change:' + ev); - }, - onAfterChange: function(ev) { //변경 전(ev.prevValue)/후(ev.value) -// console.log('Grade after change:' + ev); + //TODO : 컬럼 스타일 : README.md 참조 + renderer: { + styles: { + background: (props) => props.value === 'Y' ? 'cyan' : 'red' + } } - /* //에디터 적용 */ }, { header: '롤 패턴', @@ -206,20 +207,24 @@ el: 'grid', rowHeaders: ['rowNum', 'checkbox'], columns: gridColumns, - pageOptions: { - useClient: true, - perPage: 100 - }, + //TODO : 페이징 미사용시 + //페이지처리 hide + pagination: false, + pageOptions: null, + // pageOptions: { + // useClient: true, + // perPage: 100 + // }, columnOptions: { frozenCount: 3 }, - bodyHeight: 400 + bodyHeight: 400, + onGridMounted: (ev)=>{ + console.log('mounted~~~~~~~~',ev) + } }; const gridDatasource = { //DataSource - /* ----------------------- - * DataSource API Setting - ----------------------- */ initialRequest: true, // 화면 load시 조회 안함 - default api: { readData: { @@ -230,7 +235,10 @@ } }; - GRID = TuiGrid.of(gridOptions, gridDatasource, (res) => { + GRID = TuiGrid.of(gridOptions, gridDatasource, (ev) => { + console.table('---------->>>',ev) + console.log('---------->>>',ev.instance) + console.log('---------->>>',ev.responseData) }); } 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 b9b4a59a..0733c3ad 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 @@ -180,10 +180,9 @@ name: 'authorCode', width: 120, sortable: true, - filter: 'select', formatter: 'listItemText', editor: { - type: "select", + type: "radio", options: { listItems: [ diff --git a/src/main/webapp/resources/framework/js/cmm/cmmUtil.js b/src/main/webapp/resources/framework/js/cmm/cmmUtil.js index 1e6f5938..d5383c56 100644 --- a/src/main/webapp/resources/framework/js/cmm/cmmUtil.js +++ b/src/main/webapp/resources/framework/js/cmm/cmmUtil.js @@ -402,6 +402,14 @@ function setDateFmt(srcDateStr, delimiter = '-') { } } +/** + * 
+ * form의 element data를 json data로 return
+ * form 내의 각 element name 필수
+ *
+ * @param {Object} formObj form Object + * @returns {Object} json Object + */ function getFormJson(formObj) { // Getting an FormData let data = new FormData(formObj); @@ -413,6 +421,14 @@ function getFormJson(formObj) { //console.log(JSON.stringify(serializedFormData)); } +/** + * 
+ * FormData(new FormData(formObj)) 를 json Object로 return
+ * form 내의 각 element의 name 필수
+ *
+ * @param formData new FormData(formObj) 형태의 데이타 + * @returns {Object} json Object + */ function serialize (formData) { let rtnData = {}; diff --git a/src/main/webapp/resources/framework/js/cmm/xit-tui-grid.js b/src/main/webapp/resources/framework/js/cmm/xit-tui-grid.js index 6971ddac..dc584ddc 100644 --- a/src/main/webapp/resources/framework/js/cmm/xit-tui-grid.js +++ b/src/main/webapp/resources/framework/js/cmm/xit-tui-grid.js @@ -157,7 +157,8 @@ const TuiGrid = { console.log('totCnt >>>>> ',$('#totCnt span').text()) } - if(successCallback) successCallback(JSON.parse(ev.xhr.response)); + //if(successCallback) successCallback(JSON.parse(ev.xhr.response)); + if(successCallback) successCallback(ev); }); // 결과가 false인 경우 발생한 경우 this.instance.on('failResponse', function(ev){ From b52829dbb84713d1b75628631dcc5344d7224f5f Mon Sep 17 00:00:00 2001 From: minuk926 Date: Tue, 8 Nov 2022 18:03:12 +0900 Subject: [PATCH 13/13] =?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/mapper/AuthAuthorMgtMapper.java | 3 +- .../auth/mapper/AuthHierarchyMgtMapper.java | 8 +- .../mng/auth/model/XitAuthHierarchyMngVO.java | 21 +- .../auth/service/AuthAuthorMgtService.java | 2 + .../auth/service/AuthHierarchyMgtService.java | 11 +- .../impl/AuthAuthorMgtServiceImpl.java | 15 +- .../impl/AuthHierarchyMgtServiceImpl.java | 212 +++------------ .../mng/auth/web/AuthAuthorMgtController.java | 2 +- .../mng/auth/web/AuthGrpMgtController.java | 2 +- .../auth/web/AuthHierarchyMgtController.java | 116 ++++++++- .../mng/auth/web/AuthRoleMgtController.java | 2 +- .../mng/auth/web/AuthUserMgtController.java | 2 +- .../mng/auth/auth-hierarchy-mysql-mapper.xml | 23 +- .../cmm/anonymous/api/XitAdresSearchApi.jsp | 4 +- .../biz/mng/auth/mngAuthAuthorMgtForm.jsp | 21 +- .../biz/mng/auth/mngAuthGrpMgtForm.jsp | 37 ++- .../biz/mng/auth/mngAuthHierarchyMgtForm.jsp | 186 +++++++++++++ .../biz/mng/auth/mngAuthHierarchyMgtPopup.jsp | 10 +- .../biz/mng/auth/mngAuthHierarchyMgtform.jsp | 245 ------------------ .../biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp | 4 +- .../biz/mng/auth/mngAuthRoleMgtForm.jsp | 4 +- .../framework/biz/mng/usr/mngUserMgtForm.jsp | 4 +- 22 files changed, 418 insertions(+), 516 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp delete mode 100644 src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtform.jsp 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 fa9b5515..66ba17d2 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 @@ -36,7 +36,8 @@ public interface AuthAuthorMgtMapper { * @author: 박민규 * @date: 2020. 4. 16. */ - List selectAuthorInfos(Map vo, RowBounds rowBounds); + List selectAuthorInfos(final Map paraMap, final RowBounds rowBounds); + List selectAuthorInfos(final Map paraMap); /** * 
메소드 설명: 권한관리 상세정보 조회
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 810feb1b..7b875e52 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 @@ -2,6 +2,9 @@ package kr.xit.framework.biz.mng.auth.mapper; import java.sql.SQLException; import java.util.List; +import java.util.Map; + +import org.apache.ibatis.session.RowBounds; import egovframework.rte.psl.dataaccess.mapper.Mapper; import kr.xit.framework.biz.mng.auth.model.XitAuthHierarchyMngSearchVO; @@ -20,6 +23,9 @@ import kr.xit.framework.biz.mng.auth.model.XitAuthHierarchyMngVO; @Mapper public interface AuthHierarchyMgtMapper { + List selectAuthHierarchies(final Map paraMap, final RowBounds rowBounds); + + /** * 
메소드 설명: 권한계층관리 목록 조회
@@ -47,6 +53,6 @@ public interface AuthHierarchyMgtMapper { * @date: 2020. 11. 2. */ public XitAuthHierarchyMngVO findView(XitAuthHierarchyMngVO vo) throws SQLException; - + } 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 8b792ca9..5ae619be 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 @@ -18,11 +18,6 @@ public class XitAuthHierarchyMngVO extends BaseVO { * serialVersionUID */ private static final long serialVersionUID = 1L; - - /** - * 권한계층관리 - */ - private XitAuthHierarchyMngVO authorManage; /** * 권한코드 */ @@ -47,21 +42,7 @@ public class XitAuthHierarchyMngVO extends BaseVO { * 권한구조 코드명 */ private String authorRescueCodeNm; - - /** - * authorManage attribute 를 리턴한다. - * @return AuthorManage - */ - public XitAuthHierarchyMngVO getAuthorManage() { - return authorManage; - } - /** - * authorManage attribute 값을 설정한다. - * @param authorManage AuthorManage - */ - public void setAuthorManage(XitAuthHierarchyMngVO authorManage) { - this.authorManage = authorManage; - } + /** * authorCode attribute 를 리턴한다. * @return String 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 9df97857..c9257ec8 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 @@ -32,6 +32,8 @@ public interface AuthAuthorMgtService { * @date: 2020. 4. 16. */ List findAuthAuthors(final Map paraMap, final RowBounds rowBounds); + List findAuthAuthors(final Map paraMap); + XitAuthorInfoVO findAuthAuthor(final String authorCode); void addAuthAuthor(final XitAuthorInfoVO vo); void modifyAuthAuthor(final XitAuthorInfoVO vo); 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 fb1ebf8f..d5f2f2a1 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 @@ -1,6 +1,9 @@ package kr.xit.framework.biz.mng.auth.service; import java.util.List; +import java.util.Map; + +import org.apache.ibatis.session.RowBounds; import kr.xit.framework.biz.mng.auth.model.XitAuthHierarchyMngSearchVO; import kr.xit.framework.biz.mng.auth.model.XitAuthHierarchyMngVO; @@ -17,6 +20,10 @@ import kr.xit.framework.biz.mng.auth.model.XitAuthHierarchyMngVO; */ public interface AuthHierarchyMgtService { + List findAuthHierarchies(final Map paraMap, final RowBounds pagingInfo); + + + /** * 
메소드 설명: 권한계층관리 목록 조회
@@ -76,6 +83,6 @@ public interface AuthHierarchyMgtService { * @date: 2020. 11. 2. */ public void removesProc(String ids); - - + + } 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 c70827fd..5c6435c8 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 @@ -22,11 +22,11 @@ import kr.xit.framework.biz.mng.auth.model.XitAuthRegMngVO; import kr.xit.framework.biz.mng.auth.service.AuthAuthorMgtService; import kr.xit.framework.core.model.XitBaseSearchVO; import kr.xit.framework.core.utils.XitCmmnUtil; +import lombok.extern.slf4j.Slf4j; +@Slf4j @Service public class AuthAuthorMgtServiceImpl implements AuthAuthorMgtService { - private static final Logger logger = LoggerFactory.getLogger(AuthAuthorMgtServiceImpl.class); - @Resource private AuthAuthorMgtMapper mapper; @Resource @@ -45,7 +45,12 @@ public class AuthAuthorMgtServiceImpl implements AuthAuthorMgtService { return mapper.selectAuthorInfos(paraMap, rowBounds); } - @Override + @Override + public List findAuthAuthors(Map paraMap) { + return mapper.selectAuthorInfos(paraMap); + } + + @Override public XitAuthorInfoVO findAuthAuthor(final String authorCode) { return mapper.selectAuthorInfo(authorCode); } @@ -168,7 +173,7 @@ public class AuthAuthorMgtServiceImpl implements AuthAuthorMgtService { roleSclsrtRescueVO.setChldrnRole(CHLDRN_AUTHOR); xitFrameCrudService.addXitRoleSclsrtRescue(roleSclsrtRescueVO); } catch (Exception e) { - logger.debug(String.format("권한계층 Insert Fail : %s", e.getMessage())); + log.debug(String.format("권한계층 Insert Fail : %s", e.getMessage())); } } @@ -232,7 +237,7 @@ public class AuthAuthorMgtServiceImpl implements AuthAuthorMgtService { roleSclsrtRescueVO.setChldrnRole(CHLDRN_AUTHOR); xitFrameCrudService.removeXitRoleSclsrtRescue(roleSclsrtRescueVO); } catch (Exception e) { - logger.debug(String.format("권한계층 Delete Fail : %s", e.getMessage())); + log.debug(String.format("권한계층 Delete Fail : %s", e.getMessage())); } //권한정보 Delete xitFrameCrudService.removeXitAuthorInfo(authorInfoVO); 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 2ea51440..d6a11229 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 @@ -9,6 +9,7 @@ import java.util.Map; import javax.annotation.Resource; +import org.apache.ibatis.session.RowBounds; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -18,32 +19,42 @@ import kr.xit.framework.biz.cmm.model.XitAuthorInfoVO; import kr.xit.framework.biz.cmm.model.XitRoleSclsrtRescueVO; import kr.xit.framework.biz.cmm.service.XitFrameCrudService; import kr.xit.framework.biz.cmm.service.XitFrameUnitService; +import kr.xit.framework.biz.mng.auth.mapper.AuthAuthorMgtMapper; import kr.xit.framework.biz.mng.auth.mapper.AuthHierarchyMgtMapper; import kr.xit.framework.biz.mng.auth.model.XitAuthHierarchyMngSearchVO; import kr.xit.framework.biz.mng.auth.model.XitAuthHierarchyMngVO; import kr.xit.framework.biz.mng.auth.service.AuthHierarchyMgtService; import kr.xit.framework.core.utils.XitCmmnUtil; +import lombok.AllArgsConstructor; +@AllArgsConstructor @Service public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { - private static final Logger logger = LoggerFactory.getLogger(AuthHierarchyMgtServiceImpl.class); - @Resource - private AuthHierarchyMgtMapper xitAuthHierarchyMngMapper; - @Resource - private XitFrameCrudService xitFrameCrudService; - @Resource - private XitFrameUnitService xitFrameUnitService; - @Resource(name = "databaseSecurityMetadataSource") - private EgovReloadableFilterInvocationSecurityMetadataSource databaseSecurityMetadataSource; - + private final AuthHierarchyMgtMapper mapper; + + private final AuthAuthorMgtMapper authAuthorMgtMapper; + + @Override + public List findAuthHierarchies(final Map paraMap, final RowBounds rowBounds) { + List voList = mapper.selectAuthHierarchies(paraMap, rowBounds); + //권한구조 설정 + + if(XitCmmnUtil.notEmpty(voList)) { + for(XitAuthHierarchyMngVO vo : voList) { + String strAuthorRescueCode = this.getStrAuthHierarchy(vo.getAuthorCode()); + vo.setAuthorRescueCode(strAuthorRescueCode); + vo.setAuthorRescueCodeNm(this.convertKorNm(strAuthorRescueCode)); + } + } + return voList; + } - @Override public List findList(XitAuthHierarchyMngSearchVO searchVO) { List result = null; try { - result = xitAuthHierarchyMngMapper.findList(searchVO); + result = mapper.findList(searchVO); //권한구조 설정 if(XitCmmnUtil.notEmpty(result)) { @@ -64,7 +75,7 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { public int findListTotCnt(XitAuthHierarchyMngSearchVO searchVO) { int result = 0; try { - result = xitAuthHierarchyMngMapper.findListTotCnt(searchVO); + result = mapper.findListTotCnt(searchVO); } catch (SQLException e) { throw new RuntimeException("권한계층관리 목록 총건수 조회 FAIL::", e); } @@ -75,7 +86,7 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { public XitAuthHierarchyMngVO findView(XitAuthHierarchyMngVO vo) { XitAuthHierarchyMngVO result = new XitAuthHierarchyMngVO(); - List listRoleSclsrtRescueVO = xitFrameCrudService.findXitRoleSclsrtRescues(new XitRoleSclsrtRescueVO()); + List listRoleSclsrtRescueVO = authAuthorMgtMapper.selectRoleSclsrtRescues(new XitRoleSclsrtRescueVO()); if(XitCmmnUtil.isEmpty(listRoleSclsrtRescueVO)) return result; @@ -95,19 +106,12 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { @Override public void modifyProc(XitAuthHierarchyMngVO vo) { - /** - * 필수값 확인 - */ + if(XitCmmnUtil.isEmpty(vo.getAuthorCode())) throw new RuntimeException("권한코드는 필수조건 입니다."); - - /** - * 필수값 설정 - */ -// XitRoleSclsrtRescueVO roleSclsrtRescueVO = convertToCrudVO(vo); + String[] arrAuthorCodeGrp = vo.getAuthorCode().split(","); //권한코드 묶음 목록 - /** * 유효성 확인 * -최상위 부모는 반드시 한개 이어야 한다. @@ -127,20 +131,9 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { } if(cnt > 1) throw new RuntimeException("다중상속은 하나의 구간만 설정 가능 합니다."); - // 권한계층관리 데이터 유무 -// boolean isExistRoleHierarchy = XitCmmnUtil.isEmpty(xitFrameCrudService.findXitRoleSclsrtRescues(new XitRoleSclsrtRescueVO()))?false:true; -// if(isExistRoleHierarchy) -// this.isValidate(arrAuthorCodeGrp); - - - - - - /** - * 처리 - */ + //권한계층구조 일괄 제거 - xitFrameCrudService.removesXitRoleSclsrtRescue(new XitRoleSclsrtRescueVO()); + authAuthorMgtMapper.deleteRoleSclsrtRescue(new XitRoleSclsrtRescueVO()); //권한계층 데이터 등록 for(int i=0; i - * 메소드 설명: 메뉴VO를 CRUD Service의 VO로 변환 한다. - * - * - * @return XitRoleSclsrtRescueVO 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 11. 2. - */ -// private XitRoleSclsrtRescueVO convertToCrudVO(XitAuthHierarchyMngVO vo) { -// XitRoleSclsrtRescueVO roleSclsrtRescueVO = new XitRoleSclsrtRescueVO(); -// roleSclsrtRescueVO.setParnts_role(vo.getParntsRole()); -// roleSclsrtRescueVO.setChldrn_role(vo.getChldrnRole()); -// -// return roleSclsrtRescueVO; -// } - - /** * 
메소드 설명: 권한의 권한계층 구조를 문자열로 반환 한다.
* @param authorCode @@ -217,7 +190,7 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { LinkedHashMap mChldrn = new LinkedHashMap(); - List list = xitFrameCrudService.findXitRoleSclsrtRescues(new XitRoleSclsrtRescueVO()); + List list = authAuthorMgtMapper.selectRoleSclsrtRescues(new XitRoleSclsrtRescueVO()); this.getAuthHierarchy(list, authorCode, false, mParnts); this.getAuthHierarchy(list, authorCode, true, mChldrn); @@ -264,8 +237,6 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { resultMap.put(authorCode, resultMap.get(authorCode)+", "+item.getChldrnRole()); }else { //동일한 값이 있으면 담지 않음 -// if(!resultMap.containsValue(item.getChldrn_role())) -// resultMap.put(authorCode, item.getChldrn_role()); Iterator it = resultMap.values().iterator(); boolean isExists = false; LOOP: @@ -304,24 +275,9 @@ public class AuthHierarchyMgtServiceImpl implements AuthHierarchyMgtService { resultMap.put(authorCode, resultMap.get(authorCode)+", "+item.getParntsRole()); }else { //동일한 값이 있으면 담지 않음 - if(!resultMap.containsValue(item.getParntsRole())) + if(!resultMap.containsValue(item.getParntsRole())) { resultMap.put(authorCode, item.getParntsRole()); -// Iterator it = resultMap.values().iterator(); -// boolean isExists = false; -// LOOP: -// while(it.hasNext()) { -// String[] values = it.next().split(","); -// for(int j=0; j listAuthorInfoVO = xitFrameCrudService.findXitAuthorInfos(new XitAuthorInfoVO()); + List listAuthorInfoVO = authAuthorMgtMapper.selectAuthorInfos(null); Map mAuthorInfo = new HashMap(); for(XitAuthorInfoVO item : listAuthorInfoVO) { mAuthorInfo.put(item.getAuthorCode(), item.getAuthorNm()); } - StringBuffer sb = new StringBuffer(); String[] items = strAuthorRescueCode.split(">"); for(int i=0; i메소드 설명: 상위권한을 취득 할 수 없도록 다음을 검증 한다. -// * -자신의 형제를 부모로 설정 할 수 없어야 한다. (ex: 형제 권한의 role 취득 가능) -// * -자신의 권한보다 상위권한을 부모(or형제)로 설정 할 수 없어야 한다. (ex: 상위 권한의 role 취득 가능) -// * -자신의 부모,형제를 자신의 상위권한의 자녀로 설정 할 수 없어야 한다. (ex: n개의 계정 중 본 계정 외 권한을 자녀로 설정하여 상위 권한의 role 취득 가능) -// * -// * @param arrAuthorCodeGrp void 요청처리 후 응답객체 -// * @author: 박민규 -// * @date: 2020. 11. 3. -// */ -// private void isValidate(String[] arrAuthorCodeGrp) { -// //사용자보안설정 조회 -// XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); -// userScrtySetupVO.setScrty_setup_trget_id(XitCmmnUtil.getUserInfo().getUniqId()); -// List listUserScrtySetupVO = xitFrameCrudService.findXitUserScrtySetups(userScrtySetupVO); -// String userAuthorCode = XitCmmnUtil.isEmpty(listUserScrtySetupVO)?null:listUserScrtySetupVO.get(0).getAuthor_code(); -// if(XitCmmnUtil.notEmpty(userAuthorCode)) { -// //변경 전 형제권한 Map 생성 -// Map mSiblingsRole = new HashMap(); -// XitRoleSclsrtRescueVO xitRoleSclsrtRescueVO = new XitRoleSclsrtRescueVO(); -// xitRoleSclsrtRescueVO.setChldrn_role(userAuthorCode); -// List listRoleSclsrtRescueVO = xitFrameCrudService.findXitRoleSclsrtRescues(xitRoleSclsrtRescueVO); -// if(XitCmmnUtil.notEmpty(listRoleSclsrtRescueVO)) { -// String parntsRole = listRoleSclsrtRescueVO.get(0).getParnts_role(); -// xitRoleSclsrtRescueVO = new XitRoleSclsrtRescueVO(); -// xitRoleSclsrtRescueVO.setParnts_role(parntsRole); -// List listSiblingsRole = xitFrameCrudService.findXitRoleSclsrtRescues(xitRoleSclsrtRescueVO); -// for(XitRoleSclsrtRescueVO siblingsRole : listSiblingsRole) { -// //형제 중 자신의 권한은 제외 -// if(siblingsRole.equals(userAuthorCode)) -// continue; -// -// mSiblingsRole.put(siblingsRole.getChldrn_role(), ""); -// } -// } -// -// //부모 및 형제 권한 추출 -// List listParntsRole = new ArrayList(); //추출한 부모권한 목록 -// List listParntsAndSiblingsRole = new ArrayList(); //추출한 부모&형제 권한 목록 -// boolean isCheckingParnts = true; -// CheckComplete: -// for(int i=0; i listAuthorInfoVO = authAuthorMgtService.findAuthAuthors(null); + Map mAuthorInfo = new HashMap(); + for(XitAuthorInfoVO item : listAuthorInfoVO) { + mAuthorInfo.put(item.getAuthorCode(), item.getAuthorNm()); + } + //권한코드 목록에서 비중복 권한만 추출 + Map mNoDuplAuthorInfo = new HashMap(); + mNoDuplAuthorInfo.putAll(mAuthorInfo); + String[] arrAuthorRescue = authHierarchyMngVO.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); + + 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.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/mngAuthHierarchyMgtPopup.popup"); + return mav; + } + + @GetMapping(value = "/findAuthHierarchies") + public ModelAndView findAuthHierarchies(@RequestParam final Map paraMap){ + return ResultResponse.of(service.findAuthHierarchies(paraMap, MybatisUtils.getPagingInfo(paraMap))); + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * 
메소드 설명: 권한계층관리 목록 페이지 조회
@@ -107,7 +203,7 @@ public class AuthHierarchyMgtController { /** * 조회 */ - int totCnt = xitAuthHierarchyMngService.findListTotCnt(searchVO); + int totCnt = service.findListTotCnt(searchVO); paginationInfo.setTotalRecordCount(totCnt); /** * 반환값 설정 @@ -118,7 +214,7 @@ public class AuthHierarchyMgtController { 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", xitAuthHierarchyMngService.findList(searchVO)); //[tui Grid] data-contents + data.put("contents", service.findList(searchVO)); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("page", searchVO.getPage()); pagination.put("totalCount", totCnt); @@ -142,7 +238,7 @@ public class AuthHierarchyMgtController { /** * 
메소드 설명: 요청 페이지로 이동 한다.
- * @param page + * @param cmd * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) * @param model * @return String 요청처리 후 응답객체 @@ -152,7 +248,7 @@ public class AuthHierarchyMgtController { @RequestMapping(value = "AuthHierarchyMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public String AuthHierarchyMng_page(@PathVariable String cmd , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef - , @ModelAttribute("searchVO") XitAuthHierarchyMngSearchVO searchVO + //, @ModelAttribute("searchVO") XitAuthHierarchyMngSearchVO searchVO , @ModelAttribute("vo") XitAuthHierarchyMngVO vo , ModelMap model) { switch (cmd) { @@ -161,7 +257,7 @@ public class AuthHierarchyMgtController { case "edit": //수정 페이지 // case "view": //상세 페이지 //최하위 권한의 권한계층 조회 - XitAuthHierarchyMngVO result = xitAuthHierarchyMngService.findView(vo); + XitAuthHierarchyMngVO result = service.findView(vo); //권한코드 Map 생성 List listAuthorInfoVO = xitFrameCrudService.findXitAuthorInfos(new XitAuthorInfoVO()); Map mAuthorInfo = new HashMap(); @@ -213,7 +309,7 @@ public class AuthHierarchyMgtController { /** * 
메소드 설명: 요청 팝업 페이지 이동 한다.
- * @param page + * @param cmd * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -283,7 +379,7 @@ public class AuthHierarchyMgtController { } //처리 try { - xitAuthHierarchyMngService.modifyProc(vo); + service.modifyProc(vo); status.setComplete(); message = xitMessageSource.getMessage("success.common.update"); } catch (RuntimeException e) { @@ -298,7 +394,7 @@ public class AuthHierarchyMgtController { case "delete": //삭제 //처리 try { - xitAuthHierarchyMngService.removeProc(vo); + service.removeProc(vo); status.setComplete(); message = xitMessageSource.getMessage("success.common.delete"); break; diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthRoleMgtController.java b/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthRoleMgtController.java index 8343e085..02b64960 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthRoleMgtController.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/web/AuthRoleMgtController.java @@ -69,7 +69,7 @@ public class AuthRoleMgtController { * @author: 박민규 * @date: 2020. 4. 16. */ - @RequestMapping(value = "/mngAuthRoleMgtForm", method={RequestMethod.GET, RequestMethod.POST}) + @RequestMapping(value = "/mngAuthRoleMgtForm") public void mngAuthRoleMgtForm() { } 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 c0ad9348..2ebdb479 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 @@ -75,7 +75,7 @@ public class AuthUserMgtController { * @author: 박민규 * @date: 2020. 4. 16. */ - @GetMapping(value = "/mngAuthUserMgtForm") + @RequestMapping(value = "/mngAuthUserMgtForm") public ModelAndView mngAuthUserMgtForm() { ModelAndView mav = new ModelAndView(); mav.addObject("authorList", CacheServiceUtils.getComboCodes(null, "AUTHOR")); 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 0676dcf8..bbb998d9 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 @@ -5,6 +5,19 @@ + + + @@ -71,11 +84,7 @@ WHERE A.AUTHOR_CODE=#{authorCode} - - - - - - - + + + diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/cmm/anonymous/api/XitAdresSearchApi.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/cmm/anonymous/api/XitAdresSearchApi.jsp index 70ada17c..f4b58355 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/cmm/anonymous/api/XitAdresSearchApi.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/cmm/anonymous/api/XitAdresSearchApi.jsp @@ -444,10 +444,10 @@ $(document).ready(function(){ placeHolder(); - $('#searchRdNm').bind('click', function(){ + $('#searchRdNm').on('click', function(){ $('.popWrap3').css({'display':'block','top':'21px','right':'121px'}); }); - $('#popupClose2').bind('click', function(){ + $('#popupClose2').on('click', function(){ $('.popWrap3').css('display','none'); }); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp index 35ebb530..540ca7ab 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp @@ -26,22 +26,21 @@
+ -
- -
전체 ㅣ
- - - 등록 - -
- - +
+ +
전체 ㅣ
+ + + 등록 + +
+
- 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 44cb732f..7a52cbba 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 @@ -37,7 +37,7 @@ - + @@ -91,10 +91,10 @@ - - 저장 - 원래대로 - 설정정보 적용 + + 저장 + 원래대로 + 설정정보 적용 닫기 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 deleted file mode 100644 index fb2da787..00000000 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtform.jsp +++ /dev/null @@ -1,245 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> - - - - - - - -
- - - - - - - - - - - - - - - - - -
검색조건
권한 명 - - - -
-
- - -
- - 권한계층 설정 - -
- - - -
- - - diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp index ad67a800..34e858bf 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp @@ -102,9 +102,9 @@ * event **************************************************************************/ $(() => { - $('#btnSearch').bind('click', () => fnBiz.search()); + $('#btnSearch').on('click', () => fnBiz.search()); - $('#btnRegist').bind('click', () => { + $('#btnRegist').on('click', () => { fnBiz.add(); }); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp index 20de3efb..6845e3cd 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp @@ -85,9 +85,9 @@ * event **************************************************************************/ $(() => { - $('#btnSearch').bind('click', () => fnBiz.search()); + $('#btnSearch').on('click', () => fnBiz.search()); - $('#btnRegist').bind('click', () => { + $('#btnRegist').on('click', () => { fnBiz.pagePopup('add', {}); }); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp index 279a1fdb..a95b6582 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp @@ -98,9 +98,9 @@ * event **************************************************************************/ $(() => { - $('#btnSearch').bind('click', () => fnBiz.search()); + $('#btnSearch').on('click', () => fnBiz.search()); - $('#btnRegist').bind('click', () => { + $('#btnRegist').on('click', () => { fnBiz.pagePopup('add', {}); });