Merge branch 'tolag3'

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;
 
 }

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);
+	}
 }

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);
+	}
+	
+	
 	
 }

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;
+	}
+	
 	
     
 	

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;
+	}
 
 }

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);
+	}
 
 }

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;
+
 
 }

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 <AuthorManageVO> 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("권한 등록 실패!!!!!!!!!!!!!!!!!");
+		}
+	}
+	
+	
+	
+	
 }

src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-uss-umt.xml

@@ -4,7 +4,7 @@
 
 <sqlMapConfig>
 	<sqlMap resource="egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Oracle.xml"/>
-	<!-- <sqlMap resource="egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Oracle.xml"/> --><!-- 회원가입 config 추가 -->
+	<sqlMap resource="egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Oracle.xml"/>
 	<!-- <sqlMap resource="egovframework/sqlmap/let/uss/ion/sign/SignManage_SQL_Oracle.xml"/> --><!-- 결제 추가 -->
 	
 </sqlMapConfig>

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
+				ORDER BY SORT_NUM ASC
-					<isNotEmpty property="searchSortCnd">
-						,$searchSortCnd$
-					</isNotEmpty>
-					<isNotEmpty property="searchSortOrd">
-						$searchSortOrd$
-					</isNotEmpty>
 				) a
 			<![CDATA[
 				WHERE ROWNUM <= (#firstIndex# + #recordCountPerPage#)

src/main/resources/egovframework/sqlmap/let/sec/rgm/EgovAuthorGroup_SQL_Oracle.xml

@@ -128,5 +128,24 @@
                 </isEqual>
             </isNotEmpty>
 	</select>
+	
+	<insert id="authorGroupDAO.insertAuthorGroupTMember" parameterClass="AuthorGroup">
+		/*	authorGroupDAO.insertAuthorGroupTMember	*/
+		<![CDATA[
+			MERGE INTO LETTNEMPLYRSCRTYESTBS D
+			USING (
+			    SELECT
+			         #uniqId#     AS SCRTY_DTRMN_TRGET_ID,
+			         #mberTyCode# AS MBER_TY_CODE,
+			         #authorCode# AS AUTHOR_CODE
+			    FROM
+			         DUAL
+			) S
+			ON (D.SCRTY_DTRMN_TRGET_ID = S.SCRTY_DTRMN_TRGET_ID)
+			WHEN NOT MATCHED THEN
+			    INSERT (SCRTY_DTRMN_TRGET_ID, MBER_TY_CODE, AUTHOR_CODE)
+			    VALUES (S.SCRTY_DTRMN_TRGET_ID, S.MBER_TY_CODE, S.AUTHOR_CODE)
+		]]>
+	</insert>
 
 </sqlMap>

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#
 	</select>
 	

src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Oracle.xml

@@ -350,4 +350,24 @@
             WHERE ESNTL_ID=#delId#
         ]]>
     </delete>
+    
+    <select id="mberManageDAO.selectTMber" resultClass="kcc.let.uss.umt.service.MberManageVO">
+        /*	mberManageDAO.selectMber	*/
+        SELECT
+		    A.ESNTL_ID    UNIQID,
+		    C.AUTHOR_CODE AUTHORCODE
+		FROM
+		    COMVNUSERMASTER A
+		    LEFT OUTER JOIN (
+		        SELECT
+		            B.AUTHOR_CODE,
+		            B.SCRTY_DTRMN_TRGET_ID
+		        FROM
+		            LETTNEMPLYRSCRTYESTBS B
+		    ) C
+		    ON A.ESNTL_ID = C.SCRTY_DTRMN_TRGET_ID
+		WHERE
+		    ESNTL_ID= #uniqId#
+    </select>
+    
 </sqlMap>

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/edit.jsp

@@ -203,6 +203,16 @@
 							</select>
 						</div>
 					</div>
+					<div class="bbs-view-item">
+						<p class="item-title">권한</p>
+						<div class="item-box">
+							<select name="authorCode">
+								<c:forEach var="list" items="${authorList}" varStatus="sts">
+									<option value="${list.authorCode}" <c:if test="${mberManageVO.authorCode eq list.authorCode}">selected="selected"</c:if>><c:out value="${list.authorNm}"/></option>
+								</c:forEach>
+							</select>
+						</div>
+					</div>
 					<div class="bbs-view-item joinContent">
 						<p class="item-title">비고</p>
 						<div class="item-box">

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/write.jsp

@@ -198,6 +198,16 @@
 							</select>
 						</div>
 					</div>
+					<div class="bbs-view-item">
+						<p class="item-title">권한</p>
+						<div class="item-box">
+							<select name="authorCode">
+								<c:forEach var="list" items="${authorList}" varStatus="sts">
+									<option value="${list.authorCode}"><c:out value="${list.authorNm}"/></option>
+								</c:forEach>
+							</select>
+						</div>
+					</div>
 					<div class="bbs-view-item">
 						<p class="item-title">비고</p>
 						<div class="item-box">

src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp

@@ -899,7 +899,7 @@ function set_bbs(){
 													<%-- <input type="checkbox" id="${authorList.authorCode}" name="${authorList.authorCode}" value="${authorList.authorCode}"/>
 													<label for="${authorList.authorCode}"> ${authorList.authorNm} </label> --%>
 													<input name="authorChkList" id="<c:out value="${authorList.authorCode}"/>" title="Check <c:out value="${status.count}"/>" type="checkbox" value="${authorList.authorCode}"/>
-													<label for="<c:out value="${authorList.authorCode}"/>" style="position: unset;"><c:out value="${authorList.authorCode}"/></label>
+													<label for="<c:out value="${authorList.authorCode}"/>" style="position: unset;"><c:out value="${authorList.authorNm}"/>(<c:out value="${authorList.authorCode}"/>)</label>
 												</div>
 											</c:forEach>
 										</td>