diff --git a/src/main/java/nlib/cmm/interceptor/NlibInterceptor.java b/src/main/java/nlib/cmm/interceptor/NlibInterceptor.java index bf3a9f30..b4a7176a 100644 --- a/src/main/java/nlib/cmm/interceptor/NlibInterceptor.java +++ b/src/main/java/nlib/cmm/interceptor/NlibInterceptor.java @@ -60,6 +60,7 @@ public class NlibInterceptor extends HandlerInterceptorAdapter { String councilDnsHost = StringUtil.getHostName(request.getRequestURL().toString()); HashMap councilInfoMap = loginService.selectCouncilInfoByDnsHost(councilDnsHost); councilCd = councilInfoMap.get("councilCd"); + councilNm = councilInfoMap.get("councilNm"); if(StringUtil.isEmpty(councilCd)) councilCd = NlibProperty.getString("nlib.council.cd"); if(StringUtil.isEmpty(councilNm)) councilNm = NlibProperty.getString("nlib.council.nm"); diff --git a/src/main/java/nlib/info/service/impl/InformServiceImpl.java b/src/main/java/nlib/info/service/impl/InformServiceImpl.java index 8bf747d7..d6a1c7c4 100644 --- a/src/main/java/nlib/info/service/impl/InformServiceImpl.java +++ b/src/main/java/nlib/info/service/impl/InformServiceImpl.java @@ -134,10 +134,10 @@ public class InformServiceImpl implements InformService * (non-Javadoc) * @see nlib.info.service.InformService#selectNCultureLocationInfo(nlib.restful.service.DataApiReqVO) */ - public HashMap selectNCultureLocationInfo(String councilCd) throws Exception { + public HashMap selectNCultureLocationInfo(String orgCd) throws Exception { - HashMap locInfo = selectInfoContent(councilCd, "LOCATION"); - HashMap addrInfo = informDAO.selectNCultureAddr(councilCd); + HashMap locInfo = selectInfoContent(orgCd, "LOCATION"); + HashMap addrInfo = informDAO.selectNCultureAddr(orgCd); if(addrInfo != null) { for(String key : addrInfo.keySet()) { diff --git a/src/main/java/nlib/info/web/InformController.java b/src/main/java/nlib/info/web/InformController.java index 112907a0..a6c56d9e 100644 --- a/src/main/java/nlib/info/web/InformController.java +++ b/src/main/java/nlib/info/web/InformController.java @@ -148,9 +148,15 @@ public class InformController extends NlibCommonController { HashMap ret = informService.selectNCultureLocationInfo(getCurCouncilCd(request)); + model.addAttribute("mngOrgNm" , getCurCouncilNm(request)); + model.addAttribute("informTitle" , ret.get("TITLE")); model.addAttribute("informContent", ret.get("CONTENT")); - + + model.addAttribute("openTime", ret.get("OPEN_TIME")); + model.addAttribute("closeTime", ret.get("CLOSED_TIME")); + model.addAttribute("closingInfo", ret.get("CLOSING_INFO")); + model.addAttribute("zipCode" , ret.get("ZIP_CODE")); model.addAttribute("address" , ret.get("ADDRESS")); model.addAttribute("addressDetail", ret.get("ADDRESS_DETAIL")); diff --git a/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml index d7ee6f9f..1a087e4f 100644 --- a/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml @@ -51,6 +51,9 @@ , FAX_NO , LATITUDE , LONGITUDE + , OPEN_TIME + , CLOSED_TIME + , CLOSING_INFO FROM SM_DEPT A WHERE ORG_CD = #{orgCd} LIMIT 1 diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index b9df6176..1eed4bde 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -82,9 +82,9 @@ list.paging.page.size = 10 #---------------------------------------- # \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 # \ub85c\uceec LLLLLLLLLLLLLLL -fileupload.base.path = C:/iams/workspace/nlib/data/fileupload +#fileupload.base.path = C:/iams/workspace/nlib/data/fileupload # \uac1c\ubc1c\uc11c\ubc84 -#fileupload.base.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/data/fileupload +fileupload.base.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/data/fileupload # \uc784\uc2dc \uc800\uc7a5 \uc704\uce58 fileupload.temp.subpath = /temp @@ -95,11 +95,11 @@ fileupload.bbs.ancmnt.subpath = /bbs/ancmnt # \uba54\uc77c \uacbd\ub85c # \ub85c\uceec LLLLLLLLLLLLLLL -mailing.sender.membership.template = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/mail_template.html -mailing.sender.membership.pwdTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/pwd_mail_template.html +#mailing.sender.membership.template = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/mail_template.html +#mailing.sender.membership.pwdTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/pwd_mail_template.html # \uac1c\ubc1c\uc11c\ubc84 -#mailing.sender.membership.template = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/mail_template.html -#mailing.sender.membership.pwdTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/pwd_mail_template.html +mailing.sender.membership.template = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/mail_template.html +mailing.sender.membership.pwdTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/pwd_mail_template.html #\uba54\uc77c \ubcf4\ub0b4\ub294 \uc8fc\uc18c mailing.sender.membership.email = no-reply@nlib.org diff --git a/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureLocationInfo.jsp b/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureLocationInfo.jsp index 9fade325..ed4af395 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureLocationInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureLocationInfo.jsp @@ -31,88 +31,110 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> -찾아오시는 길 - - - -${pageTitle} - - - -

${pageTitle }

- -샘플팝업 - -
-${informContent } -
- -
-${zipCode }
-${address }
-${addressDetail }
-${phoneNo }
-${faxNo }
- -
- -
-
-

네이버 맵

+ +
+

찾아오시는길 섹션영역

+
+
+
+
    +
  • HOME
    • +
  • 자료관안내
    • +
  • 찾아오시는길
    • +
+
    +
  • 찾아오시는길
    • +
-
-
- - - - 
- - - +
화살표 아이콘
+
+
+
+

${mngOrgNm } 오시는 길

+
+
+ +
+
+
+ + + +
+
+

지도 아이콘

+

주소

+

(${zipCode }) ${address } ${addressDetail }

+
+
+

달력 아이콘

+

운영시간

+

월요일~금요일 / 오전 ${openTime } ~ 오후 ${closeTime }

+

매주 토요일, 일요일 휴관
${closingInfo }

+
+
+

전화 아이콘

+

전화

+

${phoneNo }

+
+
+

팩스 아이콘

+

팩스

+

${faxNo }

+
+
+
+
+
+ ${informContent } +
+ +
+ diff --git a/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureOperationInfo.jsp b/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureOperationInfo.jsp index cdde0748..c1917da8 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureOperationInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureOperationInfo.jsp @@ -31,22 +31,6 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> - -<% -String councilCd = (String)session.getAttribute("councilCd"); -String councilNm = (String)session.getAttribute("councilNm"); -%> - -이용안내 - - - -

이용안내 섹션영역