Merge remote-tracking branch 'origin/master'

Conflicts: src/main/resources/egovframework/mapper/nlib/col/CollectionDAO_SQL.xml
2021-11-15 14:38:53 +09:00 · 2021-11-15 14:38:53 +09:00 · 70591f37e8
commit 70591f37e8
parent eaa31e1cd0 980d0d5865
11 changed files with 94 additions and 73 deletions
--- a/src/main/java/nlib/col/service/CollectionService.java
+++ b/src/main/java/nlib/col/service/CollectionService.java
@ -93,5 +93,11 @@ public interface CollectionService {
 	 * @return
 	 */
 	public List<CollectionVO> makeInfoListOfCollectionVO(String masterIds, String mbInfoId, String defaultThumbnailUrl) throws Exception;
+
+	/**
+	 * 자료상세조회 및 원문보기시에 로그
+	 * @param colVO
+	 */
+	public void insertDataInquiryLog(CollectionVO colVO) throws Exception;
 	
 }
--- a/src/main/java/nlib/col/service/impl/CollectionDAO.java
+++ b/src/main/java/nlib/col/service/impl/CollectionDAO.java
@ -8,4 +8,5 @@ public interface CollectionDAO {
 	
 	public CollectionVO selectMngOrgInfo(String masterId) throws Exception;
 	
+	public void insertDataInquiryLog(CollectionVO vo) throws Exception;
 }
--- a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java
+++ b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java
@ -296,5 +296,15 @@ public class CollectionServiceImpl implements CollectionService {
 		
 		return setDetailInfoForList(retList, mbInfoId, defaultThumbnailUrl);
 	}
+
+	/**
+	 * 자료상세조회 및 원문보기시에 로그 
+	 * 
+	 * @param colVO
+	 * @return
+	 */
+	public void insertDataInquiryLog(CollectionVO colVO) throws Exception {
+		collectionDAO.insertDataInquiryLog(colVO);
+	}
 		
 }
--- a/src/main/java/nlib/sch/web/NlibSearchController.java
+++ b/src/main/java/nlib/sch/web/NlibSearchController.java
@ -17,6 +17,7 @@ import java.util.regex.Pattern;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@ -45,6 +46,7 @@ import nlib.col.service.RisService;
 import nlib.sch.service.NlibSearchService;
 import nlib.sch.service.NlibSearchVO;
 import nlib.sch.util.NlibCmmUtil;
+import nlib.user.service.NlibLoginVO;
 import nlib.util.StringUtil;

@Controller
@ -89,6 +91,9 @@ public class NlibSearchController extends NlibCommonController {
 			, @ModelAttribute("searchVO") NlibSearchVO searchVO
  			, HttpServletRequest request
 			, HttpServletResponse res) throws Exception {
+		//사용자 정보를 가져온다.
+		NlibLoginVO loginVO = getNlibLoginVO(authentication);
+				
 		List<CollectionVO> operList = new ArrayList();
 		// 페이징 사이즈 코드 목록 조회 (DB방식으로 변경 2021.08.06 KNKIM)
 		List<Map<String,String>> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION");
@ -196,12 +201,50 @@ public class NlibSearchController extends NlibCommonController {
 	  	//자료유형
  		model.addAttribute("firstClassList", firstClassList);
  	    model.addAttribute("secondClassList", secondClassList);
+  	    
+  	    //로그인 상태인지 확인
+  	    model.addAttribute("loginVO", loginVO);
 	  	
  	    model.addAttribute("pdfUri", NlibProperty.getProperty("pdf.uri"));
 		searchVO.setQuery(searchVO.getQuery().replaceAll("\\\"", "&quot;"));
 		return "nlib/collection/searchList";
 	}
 		
+	/**
+	 * 자료상세조회 및 원문보기시에 로그 
+	 * @param req
+	 * @param authentication
+	 * @param paramMap
+	 * @param model
+	 * @param searchVO
+	 * @param request
+	 * @param res
+	 */
+	@RequestMapping(value = "/search/InsertDataInquiryLog.ajax")
+	@ResponseBody
+	public void InsertDataInquiryLog(HttpServletRequest req
+			, Authentication authentication
+			, @RequestParam Map<String, String> paramMap
+			, ModelMap model
+			, @ModelAttribute("searchVO") NlibSearchVO searchVO
+  			, HttpServletRequest request
+			, HttpServletResponse res
+			) throws Exception {
+		HttpSession session = request.getSession();
+		
+		String masterId = request.getParameter("masterId");
+		String mbInfoId = getMbInfoId(request);
+		String councilCd = (String)session.getAttribute("councilCd");
+		
+		CollectionVO colVO = new CollectionVO();
+		
+		colVO.setMasterId(masterId);
+		colVO.setMbInfoId(StringUtil.getString(mbInfoId,""));
+		colVO.setMngOrgCd(councilCd);
+		
+		collectionService.insertDataInquiryLog(colVO);
+	}
+			
 	/**
 	 * 소장자료 상세조회
 	 * 
@ -221,6 +264,9 @@ public class NlibSearchController extends NlibCommonController {
 		String masterId = request.getParameter("masterId");
 		String mbInfoId = getMbInfoId(request);
 		
+		//사용자 정보를 가져온다.
+		NlibLoginVO loginVO = getNlibLoginVO(authentication);
+		
 		CollectionVO vo = new CollectionVO();
 		vo.setMasterId(masterId);
 		vo.setMbInfoId(mbInfoId);
@ -238,6 +284,7 @@ public class NlibSearchController extends NlibCommonController {
 		}
 		model.addAttribute("result", vo);
 		model.addAttribute("searchVO", searchVO);
+		model.addAttribute("loginVO", loginVO);
 		model.addAttribute("pdfUri", NlibProperty.getProperty("pdf.uri"));
 		return "nlib/collection/searchItemDetail";
 	}
--- a/src/main/resources/egovframework/mapper/nlib/col/CollectionDAO_SQL.xml
+++ b/src/main/resources/egovframework/mapper/nlib/col/CollectionDAO_SQL.xml
@ -3,14 +3,14 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="nlib.col.service.impl.CollectionDAO">

- 	<select id="selectMngOrgInfo" parameterType="String" resultType="CollectionVO">
-		SELECT 
+    <select id="selectMngOrgInfo" parameterType="String" resultType="CollectionVO">
+        SELECT 
              A.MNG_ORG_CD 
            , B.DEPT_NM AS MNG_ORG_NM 
        FROM RG_MASTER A
        LEFT OUTER JOIN SM_DEPT B ON A.MNG_ORG_CD = B.ORG_CD  
-		WHERE A.MASTER_ID = #{masterId} 
- 	</select>
+        WHERE A.MASTER_ID = #{masterId} 
+    </select>
    
    <insert id="insertDataInquiryLog" parameterType="CollectionVO">
        INSERT INTO MB_VIEW_LOG(
--- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
@ -363,27 +363,4 @@ var swiper = new Swiper(".onlineSwiper", {
 });
 </script>

-      
-<section class="sec5">
-
-&nbsp;<br>
-&nbsp;<br>
-<h2>테스트를 위한 Windows hosts 파일 변경 안내</h2><br>
-관리자 권한으로 메모장을 실행한 후, C:\Windows\System32\drivers\etc\hosts 파일을 열고 다음의 테스트에 맞게 수정하여 테스트 수행  
-&nbsp;<br>
-&nbsp;<br>
-
-# 로컬PC 테스트용 문화원<br> 
-127.0.0.1 seoul.nculture.org<br>
-127.0.0.1 seoul2.nculture.org<br>
-&nbsp;<br>
-# 개발서버 테스트용 문화원 <br> 
-210.181.197.70 mapo-dev.nculture.org<br>
-210.181.197.70 jongro-dev.nculture.org<br>
-&nbsp;<br>
-# 로컬PC 테스트용할 경우 주석 제거<br> 
-#127.0.0.1 nlib-dev.nculture.org<br>
-&nbsp;<br>
-
-</section>

--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
@ -224,7 +224,7 @@
                 }
                 if(!fn_isEmpty(obj.interfaceId) && !fn_isEmpty(obj.openDivCd) && obj.openDivCd != '3' && obj.digitalReadYn == 'Y')
                 {
-                     t_btn+= "<button type=\"button\" class=\"btn-color\" onclick=\"gfn_showDocPdf('" + obj.interfaceId + "');\">원문보기</button>";     
+                     t_btn+= "<button type=\"button\" class=\"btn-color\" onclick=\"gfn_showDocPdf('" + obj.interfaceId + "','" + obj.masterId + "');\">원문보기</button>";     
                 }
                 t_btn+= "<button type=\"button\" class=\"btn-gray\" onclick=\"risShow('" + obj.masterId +"');\">RIS</button>";
                 
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
@ -46,6 +46,17 @@
 </head>
 <body>
 <script>
+$(document).ready(function(){
+	//로그
+	$.ajax({
+        type: "post",
+        url: "/search/InsertDataInquiryLog.ajax",
+        data: {"masterId" : '<c:out value="${result.masterId}"/>'}
+    }).done(function(response){
+    });
+	
+})
+
 function goList(){
    document.referenceDetailForm.action="/search/searchList.do";
    document.referenceDetailForm.submit();
@ -109,7 +120,7 @@ function goList(){
                    <div class="right">
                        <div class="con-1">
                        <c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId) && result.digitalReadYn eq 'Y'}">
-                            <button type="button" class="view" onclick="gfn_showDocPdf('<c:out value="${result.interfaceId}"/>')";>원문보기</button>
+                            <button type="button" class="view" onclick="gfn_showDocPdf('<c:out value="${result.interfaceId}"/>','<c:out value="${result.masterId}"/>')";>원문보기</button>
                        </c:if>
                            <button type="button" class="ris" onclick="risShow('<c:out value="${result.masterId}"/>')";>RIS</button>
                        <c:if test='${result.MUseYn == "Y"}'>
@ -266,15 +277,7 @@ function goList(){
                        <button type="button" class="down-btn">down-btn</button>
                    </div>
                    <div class="bottom h-down">
-                        <p><span>1부</span> <c:out value="${result.bookIndex }"/></p>
-                        <p><span>2부</span> 역사 속의 경주2 - 금오산을 바라본 조선문인의 시선</p>
-                        <p><span>3부</span> 경주문화제 핫이슈 - 타향살이 100년 ‘청와대 미남석불’, 이제는 고향 경주의 품으로</p>
-                        <p><span>4부</span> 경주문화제 핫이슈 - 타향살이 100년 ‘청와대 미남석불’, 이제는 고향 경주의 품으로</p>
-                        <p><span>5부</span> 경주문화제 핫이슈 - 타향살이 100년 ‘청와대 미남석불’, 이제는 고향 경주의 품으로</p>
-                        <p><span>6부</span> 경주문화제 핫이슈 - 타향살이 100년 ‘청와대 미남석불’, 이제는 고향 경주의 품으로</p>
-                        <p><span>7부</span> 경주문화제 핫이슈 - 타향살이 100년 ‘청와대 미남석불’, 이제는 고향 경주의 품으로</p>
-                        <p><span>8부</span> 경주문화제 핫이슈 - 타향살이 100년 ‘청와대 미남석불’, 이제는 고향 경주의 품으로</p>
-                        <p><span>9부</span> 경주문화제 핫이슈 - 타향살이 100년 ‘청와대 미남석불’, 이제는 고향 경주의 품으로</p>
+                        <p><c:out value="${result.bookIndex }"/></p>
                    </div>
                </div>
                
@ -537,38 +540,6 @@ function goList(){
        </div>
        </form>
    </div>
-    
-    <footer id="footer">
-        <button type="button" id="btn-go-top" class="btn-go-top"><span><img src="/images/icon/icon-arr-top.png" alt="상단 화살표"></span><p>TOP</p></button>
-        <div class="inner">
-            <div class="row-top">
-                <div class="footer-logo">
-                    <h1><a href="#"><img src="/images/img/img-footer-logo.png" alt="푸터 로고"></a></h1>
-                </div>
-                <div class="family_site">
-                    <p class="site_name">관련 사이트</p>
-                    <ul class="site_depth">
-                        <li><a href="/" target="_blank">01</a></li>
-                        <li><a href="/" target="_blank">02</a></li>
-                    </ul>
-                </div>
-            </div>
-            <div class="row-bottom">
-                <div class="left-side">
-                    <ul class="fnb">
-                        <li><a href="/">이용약관</a></li>
-                        <li><a href="/">개인정보처리방침</a></li>
-                        <li><a href="/">찾아오시는 길</a></li>
-                    </ul>
-                    <p class="copy">
-                        서울시 마포대로49 성우빌딩 308호 <span><a href="tel:02-704-2322">TEL. 02.704-2322</a></span> <span>FAX. 02.704-2377</span> <br>
-                        COPYRIGHT (C)2018 The Federation of Korea Culture Center. ALL RIGHT RESERVED.
-                    </p>
-                </div>
-            </div>
-        </div>
-    </footer>
-
 </div>

 <div class="popup pop-sharing" id="div_pop-sharing" style="display:none;">
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
@ -436,7 +436,7 @@ function fn_search_article(pageIndex) {
                                                                </c:otherwise>
                                                           </c:choose>
                                                            <c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId) && result.digitalReadYn eq 'Y'}">
-                                                               <button type="button" class="btn-color" onclick="gfn_showDocPdf('${result.interfaceId}')";>원문보기</button>
+                                                               <button type="button" class="btn-color" onclick="gfn_showDocPdf('${result.interfaceId}','${result.masterId}')";>원문보기</button>
                                                            </c:if>
                                                            <button type="button" class="btn-gray" onclick="risShow('${result.masterId}')";>RIS</button>
                                                        </div>
--- a/src/main/webapp/WEB-INF/tiles/inc/menu.jsp
+++ b/src/main/webapp/WEB-INF/tiles/inc/menu.jsp
@ -57,13 +57,14 @@ $(document).ready(function() {
                            <li><a href="javascript:void(0)" gotoUrl="${pageContext.request.contextPath}/rent/listRentItems.do" title="대출관리" reqLogin><span class="underline blue">대출관리</span></a></li>
                            <li><a href="javascript:void(0)" gotoUrl="${pageContext.request.contextPath}/read/listReadItems.do" title="방문열람관리" reqLogin><span class="underline blue">방문열람관리</span></a></li>
                            
-                            <!-- 개발진행 중 임시 추가 : 시작 DDDDDDDDDDDDDD -->
+                            <!-- 개발진행 중 임시 추가 : 시작 DDDDDDDDDDDDDD
                            <li>--- 이하 임시 추가 메뉴 ---</li>
                            <li><a href="javascript:void(0)" onclick="javascript:location.href='${pageContext.request.contextPath}/user/member/searchIdForm.do';" title="ID/PW찾기"><span class="underline blue">ID/PW찾기</span></a></li>
                            <li><a href="javascript:void(0)" onclick="javascript:location.href='${pageContext.request.contextPath}/sample/password/getSampleEncoder.do';" title="암호화"><span class="underline blue">암호화</span></a></li>
                            <li><a href="javascript:void(0)" onclick="javascript:location.href='${pageContext.request.contextPath}/system/reloadProperties.do';" title="환경설정갱신"><span class="underline blue">환경설정갱신</span></a></li>
                            <li><a href="javascript:void(0)" onclick="javascript:location.href='${pageContext.request.contextPath}/code/listCodes.do';" title="코드조회"><span class="underline blue">코드조회</span></a></li>
                            <li><a href="javascript:void(0)" onclick="javascript:location.href='${pageContext.request.contextPath}/sample/listRentItem.do';" title="API샘플"><span class="underline blue">API샘플</span></a></li>
+                            -->
                            <!-- 개발진행 중 임시 추가 : 종료 DDDDDDDDDDDDDD -->
                        </ul>
                    </li>                    
--- a/src/main/webapp/js/nlib.js
+++ b/src/main/webapp/js/nlib.js
@ -425,7 +425,15 @@ function fn_formatDateStr(yyyymmdd, defVal) {

 // 원문보기 
 var DOC_VIEW_URL = "https://port.nculture.org/npdfView.do?npdf=N";
-function gfn_showDocPdf(interfaceId) {
+function gfn_showDocPdf(interfaceId,masterId) {
+	//로그 
+	$.ajax({
+        type: "post",
+        url: "/search/InsertDataInquiryLog.ajax",
+        data: {"masterId" : masterId}
+    }).done(function(response){
+    });
+	
 	var openNewWindow = window.open(DOC_VIEW_URL + interfaceId, "_blank");
 }