somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	src/main/webapp/css/default.css
This commit is contained in:
KNKIM 2021-11-24 14:42:25 +09:00
commit ab25d04aaa
10 changed files with 2071 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/nlib/col/service/CollectionVO.java
View File

@ -501,12 +501,8 @@ public class CollectionVO extends PagingVO {
this.operReadRangeCd = operReadRangeCd; this.operReadRangeCd = operReadRangeCd;
} }
public String getOperReadRangeNm() { 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) { public void setOperReadRangeNm(String operReadRangeNm) {
this.operReadRangeNm = operReadRangeNm; this.operReadRangeNm = operReadRangeNm;
@ -518,11 +514,9 @@ public class CollectionVO extends PagingVO {
this.operOutRangeCd = operOutRangeCd; this.operOutRangeCd = operOutRangeCd;
} }
public String getOperOutRangeNm() { 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) { public void setOperOutRangeNm(String operOutRangeNm) {
this.operOutRangeNm = operOutRangeNm; this.operOutRangeNm = operOutRangeNm;

2
src/main/java/nlib/user/service/LoginService.java
View File

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

5
src/main/java/nlib/user/service/impl/LoginDAO.java
View File

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

4
src/main/java/nlib/user/service/impl/LoginServiceImpl.java
View File

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

81
src/main/java/nlib/user/web/LoginController.java
View File

@ -683,85 +683,4 @@ public class LoginController extends NlibCommonController {
return "nlib/login/activateDormantAcc"; 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";
}
} }

26
src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml
View File

@ -96,30 +96,4 @@
,'02' /* 2021.10.05 추가 (소장자료관) */ ,'02' /* 2021.10.05 추가 (소장자료관) */
) )
</insert> </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> </mapper>

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

@ -329,7 +329,7 @@ function goList(){
<div class="swiper-wrapper items cover"> <div class="swiper-wrapper items cover">
<c:forEach var="result" items="${similarListVO}" varStatus="status"> <c:forEach var="result" items="${similarListVO}" varStatus="status">
<div class="swiper-slide"> <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="inner">
<div class="thumbnail"> <div class="thumbnail">
<span class="image-frame"><img src="${result.rprsThumbUrlWithDefaultMiddle }" alt=""/></span> <span class="image-frame"><img src="${result.rprsThumbUrlWithDefaultMiddle }" alt=""/></span>

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

@ -473,16 +473,24 @@ function fn_search_article(pageIndex) {
</div> </div>
</div> </div>
<div class="t-btn nomagin"> <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}"> <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> <button type="button" class="btn-color" onclick="gfn_showDocPdf('${result.interfaceId}','${result.masterId}','${result.typeDivCd}','${result.dtlsTypeDivCd}')";>원문보기</button>
</c:if> </c:if>

2041
src/main/webapp/css/default.css
View File

File diff suppressed because it is too large Load Diff

12
src/main/webapp/css/media.css
View File

@ -121,7 +121,7 @@ a.pop-logo img { margin-right: 10px; }
.sec2 .keyword-box { width: 100vw; } .sec2 .keyword-box { width: 100vw; }
section h3 { font-size: 22px; margin-bottom: 0px; } section h3 { font-size: 22px; margin-bottom: 0px; }
section .inner p.desc { font-size: 14px; margin-bottom: 16px; } section .inner p.desc { font-size: 14px; margin-bottom: 16px; }
section .inner ul.list-tag { height: 66px; overflow: hidden; } section .inner ul.list-tag { height: 66px; overflow: hidden;padding:5px 0px 0px; }
.sec3 { padding: 52px 0px 60px; } .sec3 { padding: 52px 0px 60px; }
.sec3 .pickSwiper::before, .sec3 .pickSwiper::before,
.sec3 .pickSwiper::after { display: none; } .sec3 .pickSwiper::after { display: none; }
@ -153,8 +153,8 @@ a.pop-logo img { margin-right: 10px; }
.popularSwiper .swiper-pagination-bullet-active { background: #376795; width: 35px; height: 10px; } .popularSwiper .swiper-pagination-bullet-active { background: #376795; width: 35px; height: 10px; }
.sec6 .onlineSwiper::before, .sec6 .onlineSwiper::before,
.sec6 .onlineSwiper::after { display: none; } .sec6 .onlineSwiper::after { display: none; }
.sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover strong { padding: 25px 0px 20px; margin-bottom: 16px; font-size: 16px; border-bottom: 1px solid rgba(255, 255, 255, 0.3); } .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover > a {margin-bottom: 16px; font-size: 16px; border-bottom: 1px solid rgba(255, 255, 255, 0.3); }
.sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box { bottom: 0; } .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box { }
.sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box .view { width: 100%; } .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box .view { width: 100%; }
.sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box .RIS { display: none; } .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box .RIS { display: none; }
.sec7 { padding: 54px 16px 60px; width: 100%; height: auto; box-sizing: border-box; } .sec7 { padding: 54px 16px 60px; width: 100%; height: auto; box-sizing: border-box; }
@ -280,8 +280,8 @@ a.pop-logo img { margin-right: 10px; }
.cart .inner .loan-confirm .tabs_item .visit-select-box { padding: 25px 0 15px; } .cart .inner .loan-confirm .tabs_item .visit-select-box { padding: 25px 0 15px; }
.cart .inner .loan-confirm .tabs_item .visit-select-box h3 { padding-top: 0; font-size: 18px; line-height: 27px; } .cart .inner .loan-confirm .tabs_item .visit-select-box h3 { padding-top: 0; font-size: 18px; line-height: 27px; }
.cart .inner .loan-confirm .tabs_item .visit-select-box .select-box { display: flex; flex-direction: column; font-size: 14px; } .cart .inner .loan-confirm .tabs_item .visit-select-box .select-box { display: flex; flex-direction: column; font-size: 14px; }
.cart .inner .loan-confirm .tabs_item .visit-select-box .select-box span { display: flex; align-items: center; margin-bottom: 10px; } .cart .inner .loan-confirm .tabs_item .visit-select-box .select-box > div { display: flex; align-items: center; margin-bottom: 10px; }
.cart .inner .loan-confirm .tabs_item .visit-select-box .select-box span select { flex: 1; } .cart .inner .loan-confirm .tabs_item .visit-select-box .select-box > div select { flex: 1; }
.cart .inner .tabs_item .list-cart-wrap .list-cart .list.t-tit-line { display: flex; align-items: center; justify-content: space-between; height: 45px; background: #fff; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; padding: 0 10px 0; box-sizing: border-box; } .cart .inner .tabs_item .list-cart-wrap .list-cart .list.t-tit-line { display: flex; align-items: center; justify-content: space-between; height: 45px; background: #fff; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; padding: 0 10px 0; box-sizing: border-box; }
.cart .inner .loan-confirm .tabs_item .list-cart-wrap .list-cart .list.t-tit-line { display: none; } .cart .inner .loan-confirm .tabs_item .list-cart-wrap .list-cart .list.t-tit-line { display: none; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div { color: #333333; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div { color: #333333; }
@ -295,7 +295,7 @@ a.pop-logo img { margin-right: 10px; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.title { padding: 5px 0 40px; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.title { padding: 5px 0 40px; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img { width: 189px; height: 144px; padding: 0; display: flex; align-items: center; justify-content: center; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img { width: 189px; height: 144px; padding: 0; display: flex; align-items: center; justify-content: center; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img a, .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img a,
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img img { height: 100%; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img img { width:100%;height: 100%;max-width:100px; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-state { width: 100%; position: absolute; text-align: left; bottom: 184px; padding: 0; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-state { width: 100%; position: absolute; text-align: left; bottom: 184px; padding: 0; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-date, .cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-date,
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-loan, .cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-loan,