diff --git a/src/main/java/nlib/col/service/CollectionService.java b/src/main/java/nlib/col/service/CollectionService.java index 05c22a7d..ba11fce9 100644 --- a/src/main/java/nlib/col/service/CollectionService.java +++ b/src/main/java/nlib/col/service/CollectionService.java @@ -36,16 +36,6 @@ public interface CollectionService { */ public CollectionVO getItemInfo(CollectionVO searchVO) throws Exception; - /** - * 자료 상세정보를 조회한다. - * 썸네일이 정보가 없는 경우, defaultThumnailUrl로 설정한다. - * @param searchVO - * @param defaultThumnailUrl - * @return - * @throws Exception - */ - public CollectionVO getItemInfo(CollectionVO searchVO, String defaultThumnailUrl) throws Exception; - /** * 목록의 자료정보에 상세정보를 조회하여 설정한 후 리턴한다. * diff --git a/src/main/java/nlib/col/service/CollectionVO.java b/src/main/java/nlib/col/service/CollectionVO.java index 184acfdb..91c784db 100644 --- a/src/main/java/nlib/col/service/CollectionVO.java +++ b/src/main/java/nlib/col/service/CollectionVO.java @@ -42,14 +42,17 @@ public class CollectionVO extends PagingVO { protected String regDd; /* 등록일자 */ protected String mngOrgNm; /* 관리처리과명 */ protected String mngOrgCd; /* 관리처리과코드 */ + protected String typeDivCd; /* 상위자료유형코드 */ protected String typeDivNm; /* 상위자료유형명 (도서간행물/문서/도면 등) : API 이름이 변경됨 typeCodeNm -> typeDivNm */ protected String dtlsTypeDivCd; /* 세부유형코드 */ protected String dtlsTypeDivNm; /* 세부유형명 */ - protected String subjectNmUp; /* 상위주제분야명*/ - protected String subjectCodeUp ; /* 상위주제분야코드*/ - protected String subjectNm; /* 주제분야명 */ - protected String subjectCode; /* 주제분야코드 */ + + protected String subjectNmUp; /* 상위주제분야명(대) */ + protected String subjectCdUp ; /* 상위주제분야코드(대) */ + protected String subjectNm; /* 주제분야명(소) */ + protected String subjectCd; /* 주제분야코드(소) */ + protected String orgNm; /* 생산기관명 */ protected String creatYyyy; /* 생산년도 */ protected String interfaceId; /* 지역N문화서비스ID */ @@ -210,23 +213,34 @@ public class CollectionVO extends PagingVO { this.title = title; } public String getRprsThumbUrl() { - return rprsThumbUrl; + return StringUtil.isNotEmpty(rprsThumbUrl) ? NlibProperty.getString("thumbnail.image.url.prefix", "") + rprsThumbUrl : ""; } - public String getRprsThumbUrlWithDefault() { - return StringUtil.isEmpty(rprsThumbUrl) ? NlibProperty.getString("thumbnail.image.url.middle") : rprsThumbUrl; + + public String getRprsThumbUrlWithDefaultSmall() { + return getRprsThumbUrlWithDefaultId("thumbnail.image.url.small"); } + public String getRprsThumbUrlWithDefaultMiddle() { + return getRprsThumbUrlWithDefaultId("thumbnail.image.url.middle"); + } + public String getRprsThumbUrlWithDefaultBig() { + return getRprsThumbUrlWithDefaultId("thumbnail.image.url.big"); + } + public String getRprsThumbUrlWithDefaultId(String propName) { + + if(StringUtil.isEmpty(rprsThumbUrl)) return NlibProperty.getString(propName); + if(rprsThumbUrl.startsWith("http")) return rprsThumbUrl; + + return NlibProperty.getString("thumbnail.image.url.prefix", "") + rprsThumbUrl; + } + public void setRprsThumbUrl(String rprsThumbUrl) { - setRprsThumbUrl(rprsThumbUrl, null); - } - public void setRprsThumbUrl(String rprsThumbUrl, String defaultImgUrl) { if(StringUtil.isEmpty(rprsThumbUrl) || !(rprsThumbUrl.startsWith("/") || rprsThumbUrl.startsWith("http"))) { - // 썸네일이 비어있거나, 유효하지 않은 문자로 시작되는 경우, defaultImgUrl로 입력 - this.rprsThumbUrl = defaultImgUrl; + // 썸네일이 비어있거나, 유효하지 않은 문자로 시작되는 경우 + this.rprsThumbUrl = null; } else { // 그렇지 않은 경우, 입력된 썸네일로 설정 - if(rprsThumbUrl.startsWith("http")) this.rprsThumbUrl = rprsThumbUrl; - else this.rprsThumbUrl = NlibProperty.getString("thumbnail.image.url.prefix", "") + rprsThumbUrl; + this.rprsThumbUrl = rprsThumbUrl; } } public String getUseYn() { @@ -755,20 +769,20 @@ public class CollectionVO extends PagingVO { this.subjectNmUp = subjectNmUp; } - public String getSubjectCodeUp() { - return subjectCodeUp; + public String getSubjectCdUp() { + return subjectCdUp; } - public void setSubjectCodeUp(String subjectCodeUp) { - this.subjectCodeUp = subjectCodeUp; + public void setSubjectCdUp(String subjectCdUp) { + this.subjectCdUp = subjectCdUp; } - public String getSubjectCode() { - return subjectCode; + public String getSubjectCd() { + return subjectCd; } - public void setSubjectCode(String subjectCode) { - this.subjectCode = subjectCode; + public void setSubjectCd(String subjectCd) { + this.subjectCd = subjectCd; } public String getRsrvDivCd() { diff --git a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java index b37ca195..18ed6c52 100644 --- a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java +++ b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java @@ -63,20 +63,6 @@ public class CollectionServiceImpl implements CollectionService { */ public CollectionVO getItemInfo(CollectionVO searchVO) throws Exception { - return getItemInfo(searchVO, null); - } - - /** - * 자료 상세정보를 조회한다. - * 썸네일이 정보가 없는 경우, defaultThumnailUrl로 설정한다. - * - * @param searchVO - * @param defaultThumnailUrl - * @return - * @throws Exception - */ - public CollectionVO getItemInfo(CollectionVO searchVO, String defaultThumnailUrl) throws Exception { - String message = null; // 입력값 확인 @@ -103,7 +89,6 @@ public class CollectionServiceImpl implements CollectionService { return null; } - if(StringUtil.isEmpty(retVO.getRprsThumbUrl())) retVO.setRprsThumbUrl(defaultThumnailUrl); retVO.setResultCode(resVO.getResultCode()); retVO.setResultMessage(resVO.getResultMessage()); @@ -185,26 +170,36 @@ public class CollectionServiceImpl implements CollectionService { if(cVO == null) continue; vo.setTitle (cVO.getTitle()); - vo.setTypeDivCd (cVO.getTypeDivCd()); - vo.setTypeCodeNm (cVO.getTypeCodeNm()); - vo.setSubjectNm (cVO.getSubjectNm()); - vo.setOrgNm (cVO.getOrgNm()); - vo.setCreatYyyy (cVO.getCreatYyyy()); - vo.setRprsThumbUrl (cVO.getRprsThumbUrl(), defaultThumbnailUrl); - vo.setInterfaceId (cVO.getInterfaceId()); - vo.setOpenDivCd (cVO.getOpenDivCd()); - vo.setOperReadRangeCd(cVO.getOperReadRangeCd()); - vo.setOperOutRangeCd (cVO.getOperOutRangeCd()); - vo.setUseStatus (cVO.getUseStatus()); - vo.setRtnExpctDd (StringUtil.formatDateStr(cVO.getRtnExpctDd(), "-")); - vo.setAwaiterCnt (cVO.getAwaiterCnt()); - vo.setBookLentPsblYn (cVO.getBookLentPsblYn()); - vo.setRsrvPsblYn (cVO.getRsrvPsblYn()); - vo.setReqPsblYn (cVO.getReqPsblYn()); - vo.setInterestYn (cVO.getInterestYn()); - vo.setMUseYn (cVO.getMUseYn()); - vo.setMngOrgCd (cVO.getMngOrgCd()); - vo.setMngOrgNm (cVO.getMngOrgNm()); + + vo.setTypeDivCd (StringUtil.getString(cVO.getTypeDivCd() , vo.getTypeDivCd())); + vo.setTypeCodeNm (StringUtil.getString(cVO.getTypeCodeNm() , vo.getTypeCodeNm())); + vo.setDtlsTypeDivCd (StringUtil.getString(cVO.getDtlsTypeDivCd() , vo.getDtlsTypeDivCd())); + vo.setDtlsTypeDivNm (StringUtil.getString(cVO.getDtlsTypeDivNm() , vo.getDtlsTypeDivNm())); + + vo.setSubjectCdUp (StringUtil.getString(cVO.getSubjectCdUp() , vo.getSubjectCdUp())); + vo.setSubjectNmUp (StringUtil.getString(cVO.getSubjectNmUp() , vo.getSubjectNmUp())); + vo.setSubjectCd (StringUtil.getString(cVO.getSubjectCd() , vo.getSubjectCd())); + vo.setSubjectNm (StringUtil.getString(cVO.getSubjectNm() , vo.getSubjectNm())); + + vo.setOrgNm (StringUtil.getString(cVO.getOrgNm() , vo.getOrgNm())); + vo.setCreatYyyy (StringUtil.getString(cVO.getCreatYyyy() , vo.getCreatYyyy())); + vo.setRprsThumbUrl (StringUtil.getString(cVO.getRprsThumbUrl() , vo.getRprsThumbUrl())); + vo.setInterfaceId (StringUtil.getString(cVO.getInterfaceId() , vo.getInterfaceId())); + vo.setOpenDivCd (StringUtil.getString(cVO.getOpenDivCd() , vo.getOpenDivCd())); + vo.setOperReadRangeCd(StringUtil.getString(cVO.getOperReadRangeCd(), vo.getOperReadRangeCd())); + vo.setOperOutRangeCd (StringUtil.getString(cVO.getOperOutRangeCd() , vo.getOperOutRangeCd())); + vo.setUseStatus (StringUtil.getString(cVO.getUseStatus() , vo.getUseStatus())); + vo.setRtnExpctDd (StringUtil.formatDateStr(cVO.getRtnExpctDd() , "-")); + vo.setAwaiterCnt (StringUtil.getInt (cVO.getAwaiterCnt() , vo.getAwaiterCnt())); + vo.setBookLentPsblYn (StringUtil.getString(cVO.getBookLentPsblYn() , vo.getBookLentPsblYn())); + vo.setRsrvPsblYn (StringUtil.getString(cVO.getRsrvPsblYn() , vo.getRsrvPsblYn())); + vo.setReqPsblYn (StringUtil.getString(cVO.getReqPsblYn() , vo.getReqPsblYn())); + vo.setInterestYn (StringUtil.getString(cVO.getInterestYn() , vo.getInterestYn())); + vo.setMUseYn (StringUtil.getString(cVO.getMUseYn() , vo.getMUseYn())); + vo.setDigitalReadYn (StringUtil.getString(cVO.getDigitalReadYn() , vo.getDigitalReadYn())); + + vo.setMngOrgCd (StringUtil.getString(cVO.getMngOrgCd() , vo.getMngOrgCd())); + vo.setMngOrgNm (StringUtil.getString(cVO.getMngOrgNm() , vo.getMngOrgNm())); } return list; diff --git a/src/main/java/nlib/sample/service/SampleDataApiService.java b/src/main/java/nlib/sample/service/SampleDataApiService.java deleted file mode 100644 index 4cca94d2..00000000 --- a/src/main/java/nlib/sample/service/SampleDataApiService.java +++ /dev/null @@ -1,33 +0,0 @@ -package nlib.sample.service; - -import nlib.restful.service.DataApiReqVO; -import nlib.restful.service.DataApiResVO; - -/** - *
- * @Class Name : SampleDataApiService.java - * - * @Description : RESTful API 호출 샘플 - * - * - * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021) - * - *- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 6. 22. KNKIM 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP KNKIM - * @since 2021. 6. 22. - * @version 1.0 - * - */ -public interface SampleDataApiService { - - public DataApiResVO getSampleInfo(DataApiReqVO reqVO) throws Exception; - - public DataApiResVO getItemInfo(DataApiReqVO reqVO) throws Exception; -} diff --git a/src/main/java/nlib/sample/service/impl/SampleDataApiServiceImpl.java b/src/main/java/nlib/sample/service/impl/SampleDataApiServiceImpl.java deleted file mode 100644 index 25cb9642..00000000 --- a/src/main/java/nlib/sample/service/impl/SampleDataApiServiceImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -package nlib.sample.service.impl; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import nlib.restful.DataApi; -import nlib.restful.service.DataApiReqVO; -import nlib.restful.service.DataApiResVO; -import nlib.sample.service.SampleDataApiService; - -/** - *
- * @Class Name : SampleDataApiServiceImpl.java - * - * @Description : RESTful API 호출 샘플 - * - * - * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021) - * - *- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 6. 22. KNKIM 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP KNKIM - * @since 2021. 6. 22. - * @version 1.0 - * - */ -@Service("sampleDataApiService") -public class SampleDataApiServiceImpl implements SampleDataApiService { - - /** RESTFul API 송수신 모듈 */ - @Resource(name = "dataApi") - private DataApi dataApi; - - public DataApiResVO getSampleInfo(DataApiReqVO reqVO) throws Exception { - return dataApi.request(reqVO); - } - - public DataApiResVO getItemInfo(DataApiReqVO reqVO) throws Exception { - return dataApi.request(reqVO); - } -} diff --git a/src/main/java/nlib/sample/web/SampleDataApiController.java b/src/main/java/nlib/sample/web/SampleDataApiController.java deleted file mode 100644 index 95955993..00000000 --- a/src/main/java/nlib/sample/web/SampleDataApiController.java +++ /dev/null @@ -1,176 +0,0 @@ -package nlib.sample.web; - -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpMethod; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import nlib.cmm.NlibCommonController; -import nlib.restful.service.DataApiReqVO; -import nlib.restful.service.DataApiResVO; -import nlib.restful.service.DataApiVO; -import nlib.sample.service.SampleDataApiService; -import nlib.user.service.NlibLoginVO; -import nlib.util.StringUtil; - -/** - *
- * @Class Name : SampleDataApiController.java - * - * @Description : RESTful API 호출 샘플 - * - * - * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021) - * - *- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 6. 22. KNKIM 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP KNKIM - * @since 2021. 6. 22. - * @version 1.0 - * - */ -@Controller -public class SampleDataApiController extends NlibCommonController { - - /** SampleDataApiService */ - @Resource(name = "sampleDataApiService") - private SampleDataApiService sampleDataApiService; - - - /* DataApi 접속 서버 정보 */ - @Value("#{properties['dataapi.server.ip']}") - private String dataapiServerIp; - - @Value("#{properties['dataapi.server.port']}") - private String dataapiServerPort; - - @Value("#{properties['dataapi.server.protocol']}") - private String dataapiServerProtocol; - - - @RequestMapping("/sample/getSampleInfoForm.do") - public String getSampleInfoForm(ModelMap model) throws Exception { - - model.addAttribute("serverProtocol", dataapiServerIp); - model.addAttribute("serverIp", dataapiServerPort); - model.addAttribute("serverPort", dataapiServerProtocol); - return "nlib/sample/getSampleInfoForm"; - } - - @RequestMapping("/sample/getSampleInfo.do") - public String getSampleInfo(@RequestParam Map