Merge branch 'master' of

http://docs.nculture.org:30000/nculture/iams.nlib

Conflicts:
	src/main/webapp/css/default.css

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

@@ -107,7 +107,6 @@ public class CollectionVO extends PagingVO {
 	protected String regId;                       /* 등록자ID */
 	protected String modId;                       /* 변경자ID */
 	protected String mUseYn;                      /* 관심여부 */
-	protected String digitalReadYn;				  /* 디지털열람여부 */
 
 
 	//--------------------------------------------
@@ -156,7 +155,16 @@ public class CollectionVO extends PagingVO {
 	protected String deptNm;		/* 관리부서이름 */
 	protected String domainHostNm;	/* 관리부서 호스트주소 */
 	
-
+	//---------------------------------------------
+	// 자료 자체에 대한 서비스 가능 여부 (2021.11.24 추가, 2021.11.23 관계자 협의에 따라 최종 자료에 대한 서비스 가능 여부 API통해 전달받는 걸로 변경됨) 
+	//---------------------------------------------
+	protected String digitalReadYn;		/* 디지털열람여부 */
+	protected String onReqYn;	        /* 온라인열람 */
+	protected String lentYn;	        /* 대출가능여부 */
+	protected String offReqYn;	        /* 방문열람가능여부 */
+	protected String etcYn;	            /* 기타 여부 */
+	
+	
 	//---------------------------------------------
 	// 각종 상태 제공 서비스 
 	//---------------------------------------------
@@ -183,13 +191,18 @@ public class CollectionVO extends PagingVO {
 	 */
 	public boolean isAbleRead() {
 		
+		return "Y".equalsIgnoreCase(StringUtil.getString(getOnReqYn(), "N"));
+			
+		/* 각 서비스 가능 여부가 API에 별도 항목으로 추가됨에 따라 이하 주석 처리 2021.11.24) 
+		
 		// 기본공개 
 		if(!isPub()) return false;
 		
 		// 열람여부 
 		if(StringUtil.getString(operReadRangeCd, "03").equals("03")) return false;
-
 		return true;
+		
+		*/
 	}
 	
 	/**
@@ -198,13 +211,18 @@ public class CollectionVO extends PagingVO {
 	 */
 	public boolean isAbleRent() {
 		
+		return "Y".equalsIgnoreCase(StringUtil.getString(getLentYn(), "N"));
+		
+		/* 각 서비스 가능 여부가 API에 별도 항목으로 추가됨에 따라 이하 주석 처리 2021.11.24) 
+		
 		// 기본공개 
 		if(!isPub()) return false;
 		
 		// 대출구분
 		if(StringUtil.getString(operOutRangeCd, "02").equals("02")) return false;
 
-		return true;		
+		return true;
+		*/ 		
 	}
 	
 	/**
@@ -213,6 +231,9 @@ public class CollectionVO extends PagingVO {
 	 */
 	public boolean isAbleOnline() {
 
+		return "Y".equalsIgnoreCase(StringUtil.getString(getDigitalReadYn(), "N"));
+		
+		/* 각 서비스 가능 여부가 API에 별도 항목으로 추가됨에 따라 이하 주석 처리 2021.11.24) 
 		// 기본공개 
 		if(!isPub()) return false;
 		
@@ -223,6 +244,7 @@ public class CollectionVO extends PagingVO {
 		if(StringUtil.isEmpty(interfaceId)) return false;
 		
 		return true;	
+		*/
 	}
 	
 	/**
@@ -230,7 +252,10 @@ public class CollectionVO extends PagingVO {
 	 * @return
 	 */
 	public boolean isAbleOther() {
+		
+		return "Y".equalsIgnoreCase(StringUtil.getString(getEtcYn(), "N"));
 
+		/* 각 서비스 가능 여부가 API에 별도 항목으로 추가됨에 따라 이하 주석 처리 2021.11.24) 
 		// 방문열람여부 
 		if(isAbleRead()) return false;
 
@@ -241,6 +266,8 @@ public class CollectionVO extends PagingVO {
 		if(isAbleOnline()) return false;
 
 		return true;
+		*/
+		
 	}
 	
 	/**
@@ -514,7 +541,8 @@ public class CollectionVO extends PagingVO {
 			04 : 열람대기(대출가능)
 			05 : 이용가능
 			06 : 열람대기(대출불가능)
-			07 : 온라인열람만"
+			07 : 온라인열람만
+			99 : 서비스 불가 
 		 */
 		if("01".equals(useStatus)) return "이용가능";
 		else if("02".equals(useStatus)) return String.format("대출중 (대기자 %s명)", awaiterCnt);
@@ -523,8 +551,9 @@ public class CollectionVO extends PagingVO {
 		else if("05".equals(useStatus)) return "이용가능";
 		else if("06".equals(useStatus)) return "열람대기(대출불가능)";
 		else if("07".equals(useStatus)) return "온라인열람만";
+		else if("99".equals(useStatus)) return "서비스 불가";
 		
-		return useStatusNm;
+		return useStatusNm; // 이외인 경우, 별도 설정 처리된 문구 반환 
 	}
 	public void setUseStatusNm(String useStatusNm) {
 		this.useStatusNm = useStatusNm;
@@ -1039,5 +1068,39 @@ public class CollectionVO extends PagingVO {
 	public void setDigitalReadYn(String digitalReadYn) {
 		this.digitalReadYn = digitalReadYn;
 	}
+
+	public String getOnReqYn() {
+		return onReqYn;
+	}
+
+	public void setOnReqYn(String onReqYn) {
+		this.onReqYn = onReqYn;
+	}
+
+	public String getLentYn() {
+		return lentYn;
+	}
+
+	public void setLentYn(String lentYn) {
+		this.lentYn = lentYn;
+	}
+
+	public String getOffReqYn() {
+		return offReqYn;
+	}
+
+	public void setOffReqYn(String offReqYn) {
+		this.offReqYn = offReqYn;
+	}
+
+	public String getEtcYn() {
+		return etcYn;
+	}
+
+	public void setEtcYn(String etcYn) {
+		this.etcYn = etcYn;
+	}
+	
+	
 }
 

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/cmm/home.jsp

@@ -296,13 +296,12 @@ function fn_listPops(typeDivCd) {
                                 <div class="thumbnail">
                                     <span class="image-frame"><img src="${itemOnline.rprsThumbUrlWithDefaultMiddle }" alt="썸네일"  /></span>
                                     <div class="detail-cover">
-                                        <strong>${itemOnline.title }</strong>
+                                        <a href="javascript:void(0)" title="상세화면 보기" onclick="gfn_getDetail('${itemOnline.masterId }')" ><strong>${itemOnline.title }</strong></a>
                                         <ul>
                                             <li><em>자료유형</em><c:if test="${empty itemOnline.typeDivNm }">-</c:if>${itemOnline.typeDivNm }</li>
                                             <li><em>주제분야</em><c:if test="${empty itemOnline.subjectNmUp }">-</c:if>${itemOnline.subjectNmUp }</li>
                                             <li><em>생산기관</em><c:if test="${empty itemOnline.orgNm }">-</c:if>${itemOnline.orgNm }</span></li>
-                                            <li><em>생산년도</em><c:if test="${empty itemOnline.creatYyyy }">-</c:if>${itemOnline.creatYyyy }
+                                            <li><em>생산년도</em><c:if test="${empty itemOnline.creatYyyy }">-</c:if>${itemOnline.creatYyyy }</li>
-                                            ${itemOnline.masterId }</li>
                                         </ul>
                                         <div class="btn-box">
                                             <div class="view"><a href="javascript:void(0)" onclick="gfn_showDocPdf('${itemOnline.interfaceId }','${itemOnline.masterId }','${itemOnline.typeDivCd}','${itemOnline.dtlsTypeDivCd}')">원문보기</a></div>

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

@@ -117,8 +117,6 @@ function goList(){
                     <div class="right">
                         <div class="con-1">
                         <c:if test="${result.ableOnline eq true}">
-                            <!-- 모바일에서만 노출되는 버튼(class='original') -->
-                            <button type="button" class="original" onclick="gfn_showDocPdf('<c:out value="${result.interfaceId}"/>','<c:out value="${result.masterId}"/>','<c:out value="${result.typeDivCd}"/>','<c:out value="${result.dtlsTypeDivCd}"/>')";>원문보기</button>
                             <button type="button" class="view" onclick="gfn_showDocPdf('<c:out value="${result.interfaceId}"/>','<c:out value="${result.masterId}"/>','<c:out value="${result.typeDivCd}"/>','<c:out value="${result.dtlsTypeDivCd}"/>')";>원문보기</button>
                         </c:if>
                             <button type="button" class="ris" onclick="risShow('<c:out value="${result.masterId}"/>');">RIS</button>
@@ -130,7 +128,7 @@ function goList(){
                         </c:if>
                             <button type="button" class="share" onclick="gfn_setSnsShare('<c:out value="${result.masterId}"/>')";>공유</button>
                         </div>
-                        <div class="con-2">
+                        <div class="con-2"> 
                             <div class="de-data">
                                 <ul>
                                     <li>
@@ -329,7 +327,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.ableRentAppNow eq true}">
-                                                                      <p><span>${result.operOutRangeNm}</span><br><span>${result.operReadRangeNm}</span></p>
+                                                                    <span>대출신청 가능</span>
-                                                                </c:when>
+                                                               </c:if>
-                                                                <c:otherwise>
+                                                               <c:if test="${result.ableRentAppNow eq false and result.ableRentResNow eq true}">
-                                                                    <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.ableRentNow eq false}">
-                                                                </c:otherwise>
+                                                                    <span>대출신청/예약 불가</span>
-                                                           </c:choose> 
+                                                               </c:if>
+                                                                    <br>
+                                                              <c:if test="${result.ableReadNow eq true}">
+                                                                    <span>방문열람신청 가능</span>
+                                                               </c:if>
+                                                              <c:if test="${result.ableReadNow eq false}">
+                                                                    <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>

src/main/webapp/css/media.css

@@ -389,11 +389,12 @@ a.pop-logo img { margin-right: 10px; }
  .greeting .inner .row-bottom .greeting-box .gree .left p.text strong { font-size: 18px; } 
  .greeting .inner .row-bottom .greeting-box .gree .right h3 { font-size: 20px; margin-bottom: 20px; } 
  .greeting .inner .row-bottom .greeting-box .gree .right p { font-size: 14px; line-height: 20px; } 
+ .greeting .inner .row-bottom .greeting-box .gree .right p br {display:none;}
 
  /* 이용안내 */
  .guide .inner .row-bottom { width: 100%; padding: 0px 16px 80px; box-sizing: border-box; } 
  .guide .inner .row-bottom .guide-box .banner { display: flex; flex-direction: column; height: auto; margin-bottom: 24px; } 
- .guide .inner .row-bottom .guide-box .banner .left { width: 100%; height: auto; padding: 24px 30px 40px; box-sizing: border-box; background: url("/images/img/img-guide-bg-mo.jpg") no-repeat; } 
+ .guide .inner .row-bottom .guide-box .banner .left { display:inline-block;width: 100%; height: auto; padding: 24px 30px 40px; box-sizing: border-box; background: url("/images/img/img-guide-bg-mo.jpg") no-repeat; } 
  .guide .inner .row-bottom .guide-box .banner .left .top { margin-bottom: 24px; } 
  .guide .inner .row-bottom .guide-box .banner .left .top p:nth-child(1) { font-size: 18px; margin-bottom: 16px; } 
  .guide .inner .row-bottom .guide-box .banner .left .top p:nth-child(2) { font-size: 36px; } 
@@ -426,12 +427,14 @@ a.pop-logo img { margin-right: 10px; }
  .map .inner .row-bottom .map-box .info > div p:nth-of-type(2) { display: inline-block; font-size: 18px; margin-bottom: 10px; margin-left: 6px; line-height: 28px; vertical-align: bottom; } 
  .map .inner .row-bottom .map-box .info > div p:nth-of-type(3) { font-size: 16px; } 
  .map .inner .row-bottom .map-box .info > div p:nth-of-type(4) { font-size: 14px; } 
- .map .inner .row-bottom .info-box .info-sec h3 { font-size: 18px; } 
+ 
- .map .inner .row-bottom .info-box .info-sec .text-box > div.box { width: 115%; margin-left: -20px; box-sizing: border-box; padding: 20px; } 
+ .map .inner .info-box {width: 100%;padding: 0 16px 80px;box-sizing: border-box;}
- .map .inner .row-bottom .info-box .info-sec .text-box > div.box p { text-indent: 0; } 
+ .map .inner .info-box .info-sec h3 { font-size: 18px; } 
- .map .inner .row-bottom .info-box .info-sec .text-box > div.box span::before { display: none; } 
+ .map .inner .info-box .info-sec .text-box > div.box { width: 115%; margin-left: -20px; box-sizing: border-box; padding: 20px; } 
- .map .inner .row-bottom .info-box .info-sec { margin-bottom: 24px; } 
+ .map .inner .info-box .info-sec .text-box > div.box p { text-indent: 0; } 
- .map .inner .row-bottom .map-box .info #map {height:155px !important;}
+ .map .inner .info-box .info-sec .text-box > div.box span::before { display: none; } 
+ .map .inner .info-box .info-sec { margin-bottom: 24px; } 
+ .map .inner .map-box .info #map {height:155px !important;}
 
  /* 소장자료 */
  .data .inner .row-bottom { width: 100%; padding: 0 0 100px 16px; box-sizing: border-box; } 
@@ -637,6 +640,7 @@ a.pop-logo img { margin-right: 10px; }
  .faq .list-accordion .question .type::before { display: none; } 
  .faq .list-accordion .question span { height: auto; font-size: 14px; line-height: 21px; } 
  .faq .list-accordion .answer { padding: 20px; font-size: 14px; } 
+ .faq .list-accordion .answer img {width:100%;}
  .faq .list-accordion .answer::before { left: 10px; top: 26px; } 
 
  /* qna */