diff --git a/src/main/java/nlib/bbs/web/QnaController.java b/src/main/java/nlib/bbs/web/QnaController.java index 2a239aad..94cab854 100644 --- a/src/main/java/nlib/bbs/web/QnaController.java +++ b/src/main/java/nlib/bbs/web/QnaController.java @@ -109,7 +109,7 @@ public class QnaController extends NlibCommonController { totRecordCount = qnaService.countArticles(searchArticleVO); } else { list = new ArrayList(); - message = "로그인이 필요합니다."; + message = "로그인 후, 이용하여 주시기 바랍니다"; } //------------------------------- diff --git a/src/main/java/nlib/col/service/ReadService.java b/src/main/java/nlib/col/service/ReadService.java index d536a404..89fe5d84 100644 --- a/src/main/java/nlib/col/service/ReadService.java +++ b/src/main/java/nlib/col/service/ReadService.java @@ -75,12 +75,5 @@ public interface ReadService { */ public DataApiResVO cancelReadItem(CollectionVO searchVO); - /** - * 사용자의 방문열람현황을 조회한다. - * - * @param mbInfoId - * @return - */ - public Map getReadStats(String mbInfoId); } diff --git a/src/main/java/nlib/col/service/impl/ReadDAO.java b/src/main/java/nlib/col/service/impl/ReadDAO.java index 138a1bfc..7a7271dc 100644 --- a/src/main/java/nlib/col/service/impl/ReadDAO.java +++ b/src/main/java/nlib/col/service/impl/ReadDAO.java @@ -14,12 +14,4 @@ public interface ReadDAO { public List> listReadMngOrg(String mbInfoId); - /** - * 사용자의 방문열람현황을 조회한다. - * - * @param mbInfoId - * @return - */ - public Map getReadStats(String mbInfoId); - } diff --git a/src/main/java/nlib/col/service/impl/ReadServiceImpl.java b/src/main/java/nlib/col/service/impl/ReadServiceImpl.java index 572c3f02..49c7823a 100644 --- a/src/main/java/nlib/col/service/impl/ReadServiceImpl.java +++ b/src/main/java/nlib/col/service/impl/ReadServiceImpl.java @@ -261,14 +261,4 @@ public class ReadServiceImpl implements ReadService { return dataApi.request(reqVO); } - /** - * 사용자의 방문열람현황을 조회한다. - * - * @param mbInfoId - * @return - */ - public Map getReadStats(String mbInfoId) { - return readDAO.getReadStats(mbInfoId); - } - } diff --git a/src/main/java/nlib/col/service/impl/RentServiceImpl.java b/src/main/java/nlib/col/service/impl/RentServiceImpl.java index d53670f2..71eb691e 100644 --- a/src/main/java/nlib/col/service/impl/RentServiceImpl.java +++ b/src/main/java/nlib/col/service/impl/RentServiceImpl.java @@ -202,7 +202,34 @@ public class RentServiceImpl implements RentService * @return */ public Map getRentStats(String mbInfoId) { - return rentDAO.getRentStats(mbInfoId); + + if(StringUtil.isEmpty(mbInfoId)) return null; + + DataApiReqVO reqVO = new DataApiReqVO("/uac/service/nlib/col/getLentReqStatCnt", HttpMethod.GET); + reqVO.setMbInfoId(mbInfoId); // 통신 시, 암호화되어 송수신됨 + DataApiResVO resVO = dataApi.request(reqVO); + Map retMap = new HashMap(); + + if(StringUtil.isNotEmpty(resVO.getResultCode()) && resVO.getResultCode().charAt(0) == 'S') { + + retMap.put("lentAppCnt" , resVO.getInfoItem("lentAppCnt" , "0")); // 대출-신청 + retMap.put("lentResvCnt" , resVO.getInfoItem("lentResvCnt" , "0")); // 대출-예약 + retMap.put("lentCancelCnt", resVO.getInfoItem("lentCancelCnt", "0")); // 대출-취소 + retMap.put("lentCnt" , resVO.getInfoItem("lentCnt" , "0")); // 대출-대출중 + retMap.put("lentRtnCnt" , resVO.getInfoItem("lentRtnCnt" , "0")); // 대출-반납 + retMap.put("lentOverCnt" , resVO.getInfoItem("lentOverCnt" , "0")); // 대출-연체 + + retMap.put("reqAppCnt" , resVO.getInfoItem("reqAppCnt" , "0")); // 열람현황-신청 + retMap.put("reqCancelCnt" , resVO.getInfoItem("reqCancelCnt" , "0")); // 열람현황-취소 + retMap.put("reqOkCnt" , resVO.getInfoItem("reqOkCnt" , "0")); // 열람현황-승인 + retMap.put("reqCompCnt" , resVO.getInfoItem("reqCompCnt" , "0")); // 열람현황-반려 + + } else { + + retMap.put("resultMessage" , resVO.getResultMessage()); + } + + return retMap; } diff --git a/src/main/java/nlib/user/service/impl/LoginServiceImpl.java b/src/main/java/nlib/user/service/impl/LoginServiceImpl.java index 70616f52..20c9f1d1 100644 --- a/src/main/java/nlib/user/service/impl/LoginServiceImpl.java +++ b/src/main/java/nlib/user/service/impl/LoginServiceImpl.java @@ -170,10 +170,15 @@ public class LoginServiceImpl implements LoginService nlibLoginVO.setJoinCouncilCd((String)session.getAttribute("councilCd")); nlibLoginVO.setJoinCouncilNm((String)session.getAttribute("councilNm")); + OAuthUniversalUser ousr = SessionConfig.getLoginInfo(sessionId); + nlibLoginVO.setSnsType(ousr.getSnsType()); + // 실제 SecurityContext 에 authentication 정보를 등록한다. SecurityContextHolder.getContext().setAuthentication(authentication); + SessionConfig.removeLoginInfo(sessionId); + } catch (DisabledException e) { log.error("loginProcSecurity > " + ERR_CODE_LOCKED); if(nlibLoginVO == null) nlibLoginVO = new NlibLoginVO(); diff --git a/src/main/java/nlib/user/web/UserInfoController.java b/src/main/java/nlib/user/web/UserInfoController.java index cf974b20..3bb0e2d5 100644 --- a/src/main/java/nlib/user/web/UserInfoController.java +++ b/src/main/java/nlib/user/web/UserInfoController.java @@ -319,15 +319,10 @@ public class UserInfoController extends NlibCommonController { List> visitedOrgs = userInfoService.getVisitedOrgs(loginVO.getMbInfoId()); model.addAttribute("visitedOrgs", visitedOrgs); - // 대출현황 + // 대출/방문열람 현황 Map rentStats = rentService.getRentStats(loginVO.getMbInfoId()); model.addAttribute("rentStats", rentStats); - // 방문열람현황 - Map readStats = readService.getReadStats(loginVO.getMbInfoId()); - model.addAttribute("readStats", readStats); - - CollectionVO searchCollectionVO = new CollectionVO(); searchCollectionVO.setMbInfoId(loginVO.getMbInfoId()); searchCollectionVO.setPageSize(5); diff --git a/src/main/resources/egovframework/mapper/nlib/col/ReadDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/col/ReadDAO_SQL.xml index 1e4f885c..0026496c 100644 --- a/src/main/resources/egovframework/mapper/nlib/col/ReadDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/col/ReadDAO_SQL.xml @@ -43,17 +43,4 @@ ORDER BY B.DEPT_NM - - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp index 166a8679..8223472a 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp @@ -159,6 +159,11 @@ }); } + + if(!fn_isEmpty(jsonObj.message)) { + alert(jsonObj.message); + } + pageLoad("fn_searchArticle", jsonObj.pagingPageIndex, jsonObj.pagingTotRecordCount, jsonObj.pagingStartPage, jsonObj.pagingEndPage, jsonObj.pagingLastPage); }).fail(function (jqXHR, textStatus, errorThrown) { diff --git a/src/main/webapp/WEB-INF/jsp/nlib/member/accountConsolidationForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/member/accountConsolidationForm.jsp index c6d3ad94..307f356c 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/member/accountConsolidationForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/member/accountConsolidationForm.jsp @@ -1,86 +1,86 @@ -<% -/** - * 
- * @Class Name : accountConsolidationForm.jsp
- * 
- * @Description : 계정통합처리 알림폼
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- *
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 9. 1. JSYOO 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP JSYOO - * @since 2021. 9. 1. - * @version 1.0 - * - */ - %> -<%@ page language="java" contentType="text/html; charset=UTF-8" %> -<%@ page import="java.util.Date" %> -<%@ page import="java.text.SimpleDateFormat" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> -<% - Date nowTime = new Date(); - SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd"); - SimpleDateFormat sf2 = new SimpleDateFormat("a hh:mm:ss"); -%> - - - - -Insert title here - - - -
-

계정연결완료 섹션영역

-
-
-
자물쇠 아이콘
-

계정연결 완료

-
-
-
-
-
-

기가입 계정에 - - 네이버 - 카카오 - 구글 - 계정이 통합되었습니다. -

-

-
-
-
- 네이버 아이콘 - 카카오 아이콘 - 구글 아이콘 -
-
-

-

<%= sf.format(nowTime) %><%= sf2.format(nowTime) %> 연결완료

-
-
-
- 소장자료관으로 -
-
-
-
-
-
- +<% +/** + * 
+ * @Class Name : accountConsolidationForm.jsp
+ * 
+ * @Description : 계정통합처리 알림폼
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ * + * @ ------------ -------- --------------------------- + * @ 수정일 수정자 수정내용 + * @ ------------ -------- --------------------------- + * @ 2021. 9. 1. JSYOO 최초 생성 + * + * + * @author 이씨플라자 * DIGITALSHIP JSYOO + * @since 2021. 9. 1. + * @version 1.0 + * + */ + %> +<%@ page language="java" contentType="text/html; charset=UTF-8" %> +<%@ page import="java.util.Date" %> +<%@ page import="java.text.SimpleDateFormat" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> +<% + Date nowTime = new Date(); + SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat sf2 = new SimpleDateFormat("a hh:mm:ss"); +%> + + + + +Insert title here + + + +
+

계정연결완료 섹션영역

+
+
+
자물쇠 아이콘
+

계정연결 완료

+
+
+
+
+
+

기가입 계정에 + + 네이버 + 카카오 + 구글 + 계정이 통합되었습니다. +

+

+
+
+
+ 네이버 아이콘 + 카카오 아이콘 + 구글 아이콘 +
+
+

+

<%= sf.format(nowTime) %><%= sf2.format(nowTime) %> 연결완료

+
+
+
+ 소장자료관으로 +
+
+
+
+
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyHome.jsp b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyHome.jsp index b51132c5..1b25df5a 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyHome.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyHome.jsp @@ -70,26 +70,27 @@
+

대출현황

-

${rentStats.cntApp }/${rentStats.cntRes }

+

${rentStats.lentAppCnt }/${rentStats.lentResvCnt }

신청/예약

-

${rentStats.cntCancel }

+

${rentStats.lentCancelCnt }

취소

-

${rentStats.cntOut }

+

${rentStats.lentCnt }

대출중

-

${rentStats.cntReturn }

+

${rentStats.lentRtnCnt }

반납

-

${rentStats.cntDelay }

+

${rentStats.lentOverCnt }

연체

@@ -98,19 +99,19 @@

방문열람현황

-

${readStats.cntApp }

+

${rentStats.reqAppCnt }

신청

-

${readStats.cntCancel }

+

${rentStats.reqCancelCnt }

취소

-

${readStats.cntProv }

+

${rentStats.reqOkCnt }

승인

-

${readStats.cntRej }

+

${rentStats.reqCompCnt }

반려