mb_site 관련 소스 제거 , 소장자료리스트 대출예약,방문 등의 상태 소스수정

src/main/java/nlib/col/service/CollectionVO.java

@@ -474,12 +474,8 @@ public class CollectionVO extends PagingVO {
 		this.operReadRangeCd = operReadRangeCd;
 	}
 	public String getOperReadRangeNm() {
-		/*  01:전체열람 02: 목록열람 03:열람불가 */
+		if(isAbleReadNow()) return "01"; //방문열람신청 가능
-		if("01".equals(operReadRangeCd)) return "전체열람";
+		else return "02";	//방문열람신청 불가
-		else if("02".equals(operReadRangeCd)) return "목록열람";
-		else if("03".equals(operReadRangeCd)) return "열람불가";
-		
-		return operReadRangeNm;
 	}
 	public void setOperReadRangeNm(String operReadRangeNm) {
 		this.operReadRangeNm = operReadRangeNm;
@@ -491,11 +487,9 @@ public class CollectionVO extends PagingVO {
 		this.operOutRangeCd = operOutRangeCd;
 	}
 	public String getOperOutRangeNm() {
-		/* 01:대출가능 02: 대출불가 */
+		if(isAbleRentAppNow()) return "01"; 	//대출신청 가능
-		if("01".equals(operOutRangeCd)) return "대출가능";
+		else if(isAbleRentResNow()) return "02"; //대출예약 가능
-		else if("02".equals(operOutRangeCd)) return "대출불가";
+		else return "03"; 						//대출신청/예약 불가
-		
-		return operOutRangeNm;
 	}
 	public void setOperOutRangeNm(String operOutRangeNm) {
 		this.operOutRangeNm = operOutRangeNm;

src/main/java/nlib/user/service/LoginService.java

@@ -35,8 +35,6 @@ public interface LoginService
 	
 	public int activateDormantAcc(NlibLoginVO loginVO);
 	
-	public int agreeProvInfo(NlibLoginVO loginVO);
-	
 	public NlibLoginVO selectLoginUserInfo(NlibLoginVO loginVO);
 	
 }

src/main/java/nlib/user/service/impl/LoginDAO.java

@@ -49,9 +49,4 @@ public class LoginDAO extends EgovComAbstractDAO {
 	public int activateDormantAcc(NlibLoginVO loginVO) {
 		return update("LoginDAO.activateDormantAcc", loginVO);
 	}
-	
-	public int agreeProvInfo(NlibLoginVO loginVO) {
-		return insert("LoginDAO.agreeProvInfo", loginVO);
-	}
-	
 }

src/main/java/nlib/user/service/impl/LoginServiceImpl.java

@@ -215,10 +215,6 @@ public class LoginServiceImpl implements LoginService
 		return loginDAO.activateDormantAcc(loginVO);
 	}
 	
-	public int agreeProvInfo(NlibLoginVO loginVO) {
-		return loginDAO.agreeProvInfo(loginVO);
-	}
-
 	public NlibLoginVO selectLoginUserInfo(NlibLoginVO loginVO) {
 		return loginDAO.selectLoginUserInfo(loginVO);
 	}

src/main/java/nlib/user/web/LoginController.java

@@ -683,85 +683,4 @@ public class LoginController extends NlibCommonController {
 
 		return "nlib/login/activateDormantAcc";
 	}
-
-	@RequestMapping("/login/agreeProvInfoForm.do")
-	public String agreeProvInfoForm(
-			HttpServletRequest req, 
-			RedirectAttributes redirectAttrs,
-			@RequestParam Map<String, String> paramMap,
-			Model model, 
-			HttpSession session) {
-		
-		//----------------------------------------------
-		// 지방문화원 사이트에서 접속한 경우, 지방문화원 정보 확인 
-		//----------------------------------------------
-		String councilJsessionId = (String)session.getAttribute("councilJsessionId");
-		String councilDnsHost    = (String)session.getAttribute("councilDnsHost");
-		String councilReturnUrl  = (String)session.getAttribute("councilReturnUrl");
-		String councilHomeUrl    = (String)session.getAttribute("councilHomeUrl");
-		String councilCd         = (String)session.getAttribute("councilCd");
-		String councilNm         = (String)session.getAttribute("councilNm");
-		
-		log.debug("activateDormantAccForm > sessionid=" + session.getId());
-		log.debug("activateDormantAccForm > councilDnsHost = " + councilDnsHost);
-		log.debug("activateDormantAccForm > councilReturnUrl = " + councilReturnUrl);
-		log.debug("activateDormantAccForm > councilHomeUrl = " + councilHomeUrl);
-		log.debug("activateDormantAccForm > councilCd = " + councilCd);
-		log.debug("activateDormantAccForm > councilNm = " + councilNm);
-	
-		OAuthUniversalUser oauthUser = SessionConfig.getLoginInfo(session.getId());
-		model.addAttribute("oauthUser", oauthUser);
-		model.addAttribute("councilCd", councilCd);
-		model.addAttribute("councilNm", councilNm);
-		
-		return "nlib/login/agreeProvInfoForm";
-	}
-	
-
-	@RequestMapping("/login/agreeProvInfo.do")
-	public String agreeProvInfo(
-			HttpServletRequest req, 
-			RedirectAttributes redirectAttrs,
-			@RequestParam Map<String, String> paramMap,
-			ModelMap model, 
-			HttpSession session) throws Exception {
-		
-		//----------------------------------------------
-		// 지방문화원 사이트에서 접속한 경우, 지방문화원 정보 확인 
-		//----------------------------------------------
-		String councilJsessionId = (String)session.getAttribute("councilJsessionId");
-		String councilDnsHost    = (String)session.getAttribute("councilDnsHost");
-		String councilReturnUrl  = (String)session.getAttribute("councilReturnUrl");
-		String councilHomeUrl    = (String)session.getAttribute("councilHomeUrl");
-		String councilCd         = (String)session.getAttribute("councilCd");
-		String councilNm         = (String)session.getAttribute("councilNm");
-		
-		String pCouncilCd = paramMap.get("councilCd");
-		
-		if(StringUtil.isEmpty(pCouncilCd) || StringUtil.isEmpty(councilCd) || !StringUtil.equalsIgnoreCase(councilCd, pCouncilCd)) {
-			throw new Exception("잘못된 접근입니다.");
-		}
-		
-		log.debug("agreeProvInfo > sessionid=" + session.getId());
-		log.debug("agreeProvInfo > councilDnsHost = " + councilDnsHost);
-		log.debug("agreeProvInfo > councilReturnUrl = " + councilReturnUrl);
-		log.debug("agreeProvInfo > councilHomeUrl = " + councilHomeUrl);
-		log.debug("agreeProvInfo > councilCd = " + councilCd);
-		log.debug("agreeProvInfo > councilNm = " + councilNm);
-		
-		// 지방문화원 추가 
-		OAuthUniversalUser oauthUser = SessionConfig.getLoginInfo(session.getId());
-		NlibLoginVO nlibLoginVO = oauthUser.getNlibVO();
-		nlibLoginVO.setJoinCouncilCd(pCouncilCd);
-		nlibLoginVO.setJoinType(oauthUser.getSnsType());
-		int resultCount = loginService.agreeProvInfo(nlibLoginVO);
-		
-		model.addAttribute("resultCount", resultCount);
-		model.addAttribute("oauthUser", oauthUser);
-		model.addAttribute("councilCd", councilCd);
-		model.addAttribute("councilNm", councilNm);
-		
-		return "nlib/login/agreeProvInfo";
-	}
-	
 }

src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml

@@ -96,30 +96,4 @@
 		    ,'02' /* 2021.10.05 추가 (소장자료관) */ 
 		)        
     </insert> 	
- 	
- 	
-    <insert id="agreeProvInfo" parameterType="NlibLoginVO">
-        INSERT INTO MB_SITE /* 가입문화원정보 */ 
-        (    MB_INFO_ID
-            ,JOIN_TYPE
-            ,JOIN_AGREE_DD
-            ,JOIN_COUNCIL_CD
-            ,MASTER_YN
-        )
-        SELECT 
-             #{mbInfoId}
-            ,#{joinType}
-            ,NOW()
-            ,#{joinCouncilCd}
-            ,'N'
-		FROM SM_DEPT 
-		WHERE ORG_CD = #{joinCouncilCd}
-		AND NOT EXISTS (
-		    SELECT MB_SITE_ID
-		    FROM MB_SITE S 
-		    WHERE S.MB_INFO_ID = #{mbInfoId}
-		    AND S.JOIN_COUNCIL_CD = #{joinCouncilCd}
-		)
-    </insert>   
-    
 </mapper>

src/main/resources/nlib/nlib.properties

@@ -30,8 +30,6 @@ login.url      = /login/loginForm.do
 login.back.url = /login/loginGuide.do
 # \ud734\uba74\uacc4\uc88c \ud574\uc9c0\uc548\ub0b4 \uc8fc\uc18c   
 login.dormant.url = /login/activateDormantAccForm.do
-# \uc2e0\uaddc \uc9c0\ubc29\ubb38\ud654\uc6d0 \uc815\ubcf4\uc81c\uacf5 \ub3d9\uc758 \uc8fc\uc18c    
-login.newcouncil.url = /login/agreeProvInfoForm.do
 
 # \uc9c0\ubc29\ubb38\ud654\uc6d0\uc5d0\uc11c \uc811\uc18d\uc2dc \ub9ac\ub2e4\uc774\ub809\ud2b8\ub420 URL \uc815\ubcf4 
 nculture.login.redirect.uri = /login/loginForm.do  

src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp

@@ -329,7 +329,7 @@ function goList(){
                             <div class="swiper-wrapper items cover">
                                 <c:forEach var="result" items="${similarListVO}" varStatus="status">
 	                                <div class="swiper-slide">
-	                                    <div class="List" onclick="gfn_getDetail('${result.masterId}','${result.domainHostNm }');">
+	                                    <div class="List" onclick="gfn_getDetail('${result.masterId}');">
 	                                        <div class="inner">
 	                                            <div class="thumbnail">
 	                                                <span class="image-frame"><img src="${result.rprsThumbUrlWithDefaultMiddle }" alt=""/></span>

src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp

@@ -473,16 +473,24 @@ function fn_search_article(pageIndex) {
                                                             </div>
                                                         </div>
                                                         <div class="t-btn nomagin">
-                                                           <c:choose>
+                                                               <p>
-                                                                <c:when test="${(!empty result.operOutRangeNm) && (!empty result.operReadRangeNm)}">
+                                                               <c:if test="${result.operOutRangeNm eq '01'}">
-                                                                      <p><span>${result.operOutRangeNm}</span><br><span>${result.operReadRangeNm}</span></p>
+                                                                    <span>대출신청 가능</span>
-                                                                </c:when>
+                                                               </c:if>
-                                                                <c:otherwise>
+                                                               <c:if test="${result.operOutRangeNm eq '02'}">
-                                                                    <c:if test="${(!empty result.operOutRangeNm) || (!empty result.operReadRangeNm) }">
+                                                                    <span>대출예약 가능</span>
-                                                                           <p><span>${result.operOutRangeNm}</span><span>${result.operReadRangeNm}</span></p>
+                                                               </c:if>
-                                                                    </c:if>
+                                                               <c:if test="${result.operOutRangeNm eq '03'}">
-                                                                </c:otherwise>
+                                                                    <span>대출신청/예약 불가</span>
-                                                           </c:choose> 
+                                                               </c:if>
+                                                                    <br>
+                                                              <c:if test="${result.operReadRangeNm eq '01'}">
+                                                                    <span>방문열람신청 가능</span>
+                                                               </c:if>
+                                                              <c:if test="${result.operReadRangeNm eq '02'}">
+                                                                    <span>방문열람신청 불가</span>
+                                                               </c:if>
+                                                               </p>
                                                             <c:if test="${result.ableOnline eq true}">
                                                                <button type="button" class="btn-color" onclick="gfn_showDocPdf('${result.interfaceId}','${result.masterId}','${result.typeDivCd}','${result.dtlsTypeDivCd}')";>원문보기</button>
                                                             </c:if>