diff --git a/src/main/java/kcc/let/sec/rgm/service/EgovAuthorGroupService.java b/src/main/java/kcc/let/sec/rgm/service/EgovAuthorGroupService.java index 6153fb55..82e7ecb9 100644 --- a/src/main/java/kcc/let/sec/rgm/service/EgovAuthorGroupService.java +++ b/src/main/java/kcc/let/sec/rgm/service/EgovAuthorGroupService.java @@ -58,6 +58,8 @@ public interface EgovAuthorGroupService { * @return int * @exception Exception */ - public int selectAuthorGroupListTotCnt(AuthorGroupVO authorGroupVO) throws Exception; + public int selectAuthorGroupListTotCnt(AuthorGroupVO authorGroupVO) throws Exception; + + public void insertAuthorGroupTMember(AuthorGroup authorGroup) throws Exception; } \ No newline at end of file diff --git a/src/main/java/kcc/let/sec/rgm/service/impl/AuthorGroupDAO.java b/src/main/java/kcc/let/sec/rgm/service/impl/AuthorGroupDAO.java index 30410d10..b3660a74 100644 --- a/src/main/java/kcc/let/sec/rgm/service/impl/AuthorGroupDAO.java +++ b/src/main/java/kcc/let/sec/rgm/service/impl/AuthorGroupDAO.java @@ -76,4 +76,8 @@ public class AuthorGroupDAO extends EgovAbstractDAO { public int selectAuthorGroupListTotCnt(AuthorGroupVO authorGroupVO) throws Exception { return (Integer)select("authorGroupDAO.selectAuthorGroupListTotCnt", authorGroupVO); } + + public void insertAuthorGroupTMember(AuthorGroup authorGroup) throws Exception { + insert("authorGroupDAO.insertAuthorGroupTMember", authorGroup); + } } \ No newline at end of file diff --git a/src/main/java/kcc/let/sec/rgm/service/impl/EgovAuthorGroupServiceImpl.java b/src/main/java/kcc/let/sec/rgm/service/impl/EgovAuthorGroupServiceImpl.java index 30dbc397..61b2ffdf 100644 --- a/src/main/java/kcc/let/sec/rgm/service/impl/EgovAuthorGroupServiceImpl.java +++ b/src/main/java/kcc/let/sec/rgm/service/impl/EgovAuthorGroupServiceImpl.java @@ -81,5 +81,12 @@ public class EgovAuthorGroupServiceImpl extends EgovAbstractServiceImpl impleme public int selectAuthorGroupListTotCnt(AuthorGroupVO authorGroupVO) throws Exception { return authorGroupDAO.selectAuthorGroupListTotCnt(authorGroupVO); } + + @Override + public void insertAuthorGroupTMember(AuthorGroup authorGroup) throws Exception { + authorGroupDAO.insertAuthorGroupTMember(authorGroup); + } + + } \ No newline at end of file diff --git a/src/main/java/kcc/let/sym/mnu/mpm/service/MenuManageJTreeVO.java b/src/main/java/kcc/let/sym/mnu/mpm/service/MenuManageJTreeVO.java index 57bf012e..c8fbd45f 100644 --- a/src/main/java/kcc/let/sym/mnu/mpm/service/MenuManageJTreeVO.java +++ b/src/main/java/kcc/let/sym/mnu/mpm/service/MenuManageJTreeVO.java @@ -61,6 +61,8 @@ public class MenuManageJTreeVO implements Serializable { /** 권한정보설정 */ /** 권한코드 */ private String authorCode; + /** 권한이름 */ + private String authorNm; /** 기타VO변수 */ private String tempValue; @@ -491,6 +493,15 @@ public class MenuManageJTreeVO implements Serializable { public void setChildMenuCnt(Integer childMenuCnt) { this.childMenuCnt = childMenuCnt; } + + public String getAuthorNm() { + return authorNm; + } + + public void setAuthorNm(String authorNm) { + this.authorNm = authorNm; + } + diff --git a/src/main/java/kcc/let/uat/uia/service/impl/EgovMberManageServiceImpl.java b/src/main/java/kcc/let/uat/uia/service/impl/EgovMberManageServiceImpl.java index 8bc99953..1361f8a6 100644 --- a/src/main/java/kcc/let/uat/uia/service/impl/EgovMberManageServiceImpl.java +++ b/src/main/java/kcc/let/uat/uia/service/impl/EgovMberManageServiceImpl.java @@ -170,5 +170,11 @@ public class EgovMberManageServiceImpl extends EgovAbstractServiceImpl implement public void updateMberCnf(MberManageConfigVO vo) throws Exception { mberManageDAO.updateMberCnf(vo); } + + @Override + public MberManageVO selectTMber(String uniqId) throws Exception { + MberManageVO mberManageVO = mberManageDAO.selectTMber(uniqId); + return mberManageVO; + } } \ No newline at end of file diff --git a/src/main/java/kcc/let/uat/uia/service/impl/MberManageDAO.java b/src/main/java/kcc/let/uat/uia/service/impl/MberManageDAO.java index 3f5e53a3..0e1611cc 100644 --- a/src/main/java/kcc/let/uat/uia/service/impl/MberManageDAO.java +++ b/src/main/java/kcc/let/uat/uia/service/impl/MberManageDAO.java @@ -78,5 +78,9 @@ public class MberManageDAO extends EgovComAbstractDAO{ public void deleteMber(String delId) { delete("mberManageDAO.deleteMber", delId); } + + public MberManageVO selectTMber(String uniqId) { + return (MberManageVO) select("mberManageDAO.selectTMber", uniqId); + } } \ No newline at end of file diff --git a/src/main/java/kcc/let/uss/umt/service/EgovMberManageService.java b/src/main/java/kcc/let/uss/umt/service/EgovMberManageService.java index 56ed9ec7..bcbcc455 100644 --- a/src/main/java/kcc/let/uss/umt/service/EgovMberManageService.java +++ b/src/main/java/kcc/let/uss/umt/service/EgovMberManageService.java @@ -126,5 +126,7 @@ public interface EgovMberManageService { */ public void updateMberCnf(MberManageConfigVO mberManageConfigVO) throws Exception; + public MberManageVO selectTMber(String uniqId) throws Exception; + } \ No newline at end of file diff --git a/src/main/java/seed/com/gtm/join/MemberJoinController.java b/src/main/java/seed/com/gtm/join/MemberJoinController.java index 7c10d8ca..916b2938 100644 --- a/src/main/java/seed/com/gtm/join/MemberJoinController.java +++ b/src/main/java/seed/com/gtm/join/MemberJoinController.java @@ -2,7 +2,10 @@ package seed.com.gtm.join; import java.util.List; import java.util.Map; +import java.util.stream.Collector; +import java.util.stream.Collectors; +import javax.annotation.Resource; import javax.servlet.http.HttpSession; import org.springframework.beans.factory.annotation.Autowired; @@ -13,6 +16,11 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import kcc.let.sec.ram.service.AuthorManageVO; +import kcc.let.sec.ram.service.EgovAuthorManageService; +import kcc.let.sec.rgm.service.AuthorGroup; +import kcc.let.sec.rgm.service.EgovAuthorGroupService; +import kcc.let.uss.umt.service.EgovMberManageService; import seed.com.gtm.util.Criteria; import seed.com.gtm.util.PageMaker; import seed.utils.SeedUtils; @@ -22,9 +30,22 @@ import seed.utils.SeedUtils; public class MemberJoinController { @Autowired private MemberJoinService service; + + @Resource(name = "egovAuthorManageService") + private EgovAuthorManageService egovAuthorManageService; + + @Resource(name = "mberManageService") + private EgovMberManageService egovMberManageService; + + @Resource(name = "egovAuthorGroupService") + private EgovAuthorGroupService egovAuthorGroupService; + // /gtm/case/join/write.do @RequestMapping(value="/join/write.do", method=RequestMethod.GET) - public String memberWrite(){ + public String memberWrite(ModelMap model){ + + authorListSet(model); + return "/seed/_extra/gtm/join/write"; } @@ -90,6 +111,9 @@ public class MemberJoinController { map.put("message", "common.message.reg"); map.put("url", "/gtm/case/join/list.do"); + + authorUpsert(paramMap.get("seq").toString(), paramMap.get("authorCode").toString()); + return "/_common/jsp/message"; } @@ -179,6 +203,13 @@ public class MemberJoinController { } } + authorListSet(model); + try { + model.addAttribute("mberManageVO", egovMberManageService.selectTMber(memberInfo.get("MEMBER_IDX").toString())); + } catch (Exception e) { + e.printStackTrace(); + } + return "/seed/_extra/gtm/join/edit"; } @@ -247,6 +278,8 @@ public class MemberJoinController { service.memberUpdate(paramMap); + authorUpsert(paramMap.get("memberSeq").toString(), paramMap.get("authorCode").toString()); + map.put("message", "common.message.mod"); map.put("url", "/gtm/case/join/list.do"); @@ -264,4 +297,43 @@ public class MemberJoinController { return "/_common/jsp/message"; } + + private void authorListSet(ModelMap model) { + AuthorManageVO authorManageVO = new AuthorManageVO(); + authorManageVO.setRecordCountPerPage(999); + try { + List authorList = egovAuthorManageService.selectAuthorList(authorManageVO); + + + authorList = authorList.stream() + .filter(t -> + !"ROLE_ANONYMOUS".equals(t.getAuthorCode()) + && !"ROLE_USER_MEMBER".equals(t.getAuthorCode()) + && !"ROLE_USER_MANAGER".equals(t.getAuthorCode()) + ).collect(Collectors.toList()); + model.addAttribute("authorList", authorList); + } catch (Exception e) { + System.out.println(e.getMessage()); + } + } + + + + + + private void authorUpsert(String uniqId, String authorCode) { + AuthorGroup authorGroup = new AuthorGroup(); + authorGroup.setUniqId(uniqId); + authorGroup.setAuthorCode(authorCode); + authorGroup.setMberTyCode("USR"); + try { + egovAuthorGroupService.insertAuthorGroupTMember(authorGroup); + } catch (Exception e) { + System.out.println("권한 등록 실패!!!!!!!!!!!!!!!!!"); + } + } + + + + } diff --git a/src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-uss-umt.xml b/src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-uss-umt.xml index 13b41fbb..8a2548be 100644 --- a/src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-uss-umt.xml +++ b/src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-uss-umt.xml @@ -4,7 +4,7 @@ - + diff --git a/src/main/resources/egovframework/sqlmap/let/sec/ram/EgovAuthorManage_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/let/sec/ram/EgovAuthorManage_SQL_Oracle.xml index 8c273c01..dba8f768 100644 --- a/src/main/resources/egovframework/sqlmap/let/sec/ram/EgovAuthorManage_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/let/sec/ram/EgovAuthorManage_SQL_Oracle.xml @@ -40,13 +40,7 @@ AUTHOR_CREAT_DE, SORT_NUM FROM LETTNAUTHORINFO - ORDER BY 1 - - ,$searchSortCnd$ - - - $searchSortOrd$ - + ORDER BY SORT_NUM ASC ) a + + + /* authorGroupDAO.insertAuthorGroupTMember */ + + diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Oracle.xml index 4ca8b4de..9c0efcc9 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Oracle.xml @@ -988,7 +988,10 @@ SELECT a.MENU_NO as menuNo , a.AUTHOR_CODE as authorCode + , B.AUTHOR_NM AS AUTHORNM FROM lettnmenucreatdtls a + LEFT OUTER JOIN LETTNAUTHORINFO B + ON A.AUTHOR_CODE = B.AUTHOR_CODE WHERE a.MENU_NO = #menuNo# diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Oracle.xml index f577b5a0..8ded5863 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Oracle.xml @@ -350,4 +350,24 @@ WHERE ESNTL_ID=#delId# ]]> + + + diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/edit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/edit.jsp index 804fb4bd..737ef95a 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/edit.jsp @@ -203,6 +203,16 @@ +
+

권한

+
+ +
+

비고

diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/write.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/write.jsp index f147b510..e84f4bbb 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/write.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/write.jsp @@ -198,6 +198,16 @@
+
+

권한

+
+ +
+

비고

diff --git a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp index 16e8c1a9..5adbed90 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp @@ -899,7 +899,7 @@ function set_bbs(){ <%-- --%> " title="Check " type="checkbox" value="${authorList.authorCode}"/> - +