From affa28fe23ce8b630aca384579c28d40e5c53fed Mon Sep 17 00:00:00 2001 From: KNKIM Date: Wed, 24 Nov 2021 17:10:43 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20DB=20=EC=BB=AC=EB=9F=BC=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=B2=98=EB=A6=AC=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/bbs/service/AttachFileVO.java | 28 ++++---- src/main/java/nlib/bbs/web/QnaController.java | 12 ++-- .../cmm/fileupload/FileUploadController.java | 10 +-- src/main/java/nlib/cmm/fileupload/FileVO.java | 64 ------------------- .../java/nlib/cmm/web/MainController.java | 4 +- .../java/nlib/col/web/CartController.java | 3 +- .../mapper/nlib/bbs/AttachFileDAO_SQL.xml | 20 +++--- .../mapper/nlib/cmm/MainDAO_SQL.xml | 6 +- .../WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp | 2 +- src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp | 33 +++++----- 10 files changed, 53 insertions(+), 129 deletions(-) delete mode 100644 src/main/java/nlib/cmm/fileupload/FileVO.java diff --git a/src/main/java/nlib/bbs/service/AttachFileVO.java b/src/main/java/nlib/bbs/service/AttachFileVO.java index 2334bb80..6b1ce4cc 100644 --- a/src/main/java/nlib/bbs/service/AttachFileVO.java +++ b/src/main/java/nlib/bbs/service/AttachFileVO.java @@ -18,6 +18,7 @@ import nlib.util.UUID; * @ 수정일 수정자 수정내용 * @ ------------ -------- --------------------------- * @ 2021. 9. 14. KNKIM 최초 생성 + * @ 2021.11. 24. KNKIM DB컬럼명 수정에 따른 변경 처리 (FILE_STRE_COURS -> FILE_STRE_PATH, FILE_EXTSN -> FILE_EXT) * * * @author 이씨플라자 * DIGITALSHIP KNKIM @@ -34,11 +35,10 @@ public class AttachFileVO { private String attachFileId; /* 첨부파일아이디 */ private int fileSn; /* 파일 순번 */ - private String fileStreCours; /* 파일 저장결올 */ + private String fileStrePath; /* 파일 저장결올 */ private String streFileNm; /* 저장파일명 */ private String orignlFileNm; /* 원본파일명 */ - private String fileExtsn; /* 파일확장자 */ - private String fileCn; /* 파일내용 */ + private String fileExt; /* 파일확장자 */ private int fileSize; /* 파일 사이즈 */ private String useAt; /* 사용영부 */ @@ -62,11 +62,11 @@ public class AttachFileVO { public void setFileSn(int fileSn) { this.fileSn = fileSn; } - public String getFileStreCours() { - return fileStreCours; + public String getFileStrePath() { + return fileStrePath; } - public void setFileStreCours(String fileStreCours) { - this.fileStreCours = fileStreCours; + public void setFileStrePath(String fileStrePath) { + this.fileStrePath = fileStrePath; } public String getStreFileNm() { return streFileNm; @@ -80,17 +80,11 @@ public class AttachFileVO { public void setOrignlFileNm(String orignlFileNm) { this.orignlFileNm = orignlFileNm; } - public String getFileExtsn() { - return fileExtsn; + public String getFileExt() { + return fileExt; } - public void setFileExtsn(String fileExtsn) { - this.fileExtsn = (fileExtsn == null ? null : fileExtsn.toLowerCase()); - } - public String getFileCn() { - return fileCn; - } - public void setFileCn(String fileCn) { - this.fileCn = fileCn; + public void setFileExt(String fileExt) { + this.fileExt = (fileExt == null ? null : fileExt.toLowerCase()); } public int getFileSize() { return fileSize; diff --git a/src/main/java/nlib/bbs/web/QnaController.java b/src/main/java/nlib/bbs/web/QnaController.java index 371a2658..bc5777a0 100644 --- a/src/main/java/nlib/bbs/web/QnaController.java +++ b/src/main/java/nlib/bbs/web/QnaController.java @@ -293,13 +293,13 @@ public class QnaController extends NlibCommonController { AttachFileVO fVO = new AttachFileVO(); fVO.setAttachFileId(attachFileId); - fVO.setFileStreCours(fileSStreCours); + fVO.setFileStrePath(fileSStreCours); fVO.setStreFileNm((String)finfo.get("streFileNm")); fVO.setOrignlFileNm((String)finfo.get("orignlFileNm")); - fVO.setFileExtsn((String)finfo.get("fileExtsn")); + fVO.setFileExt((String)finfo.get("fileExt")); fVO.setFileSize(((Integer)finfo.get("fileSize")).intValue()); - File f = new File(fVO.getFileStreCours() + fVO.getStreFileNm()); + File f = new File(fVO.getFileStrePath() + fVO.getStreFileNm()); if(!f.exists() || !f.isFile()) continue; attachFiles.add(fVO); @@ -404,13 +404,13 @@ public class QnaController extends NlibCommonController { AttachFileVO fVO = new AttachFileVO(); fVO.setAttachFileId(attachFileId); - fVO.setFileStreCours(fileSStreCours); + fVO.setFileStrePath(fileSStreCours); fVO.setStreFileNm((String)finfo.get("streFileNm")); fVO.setOrignlFileNm((String)finfo.get("orignlFileNm")); - fVO.setFileExtsn((String)finfo.get("fileExtsn")); + fVO.setFileExt((String)finfo.get("fileExt")); fVO.setFileSize(((Integer)finfo.get("fileSize")).intValue()); - File f = new File(fVO.getFileStreCours() + fVO.getStreFileNm()); + File f = new File(fVO.getFileStrePath() + fVO.getStreFileNm()); if(!f.exists() || !f.isFile()) continue; attachFiles.add(fVO); diff --git a/src/main/java/nlib/cmm/fileupload/FileUploadController.java b/src/main/java/nlib/cmm/fileupload/FileUploadController.java index 498399e6..b800a0f2 100644 --- a/src/main/java/nlib/cmm/fileupload/FileUploadController.java +++ b/src/main/java/nlib/cmm/fileupload/FileUploadController.java @@ -192,7 +192,7 @@ public class FileUploadController extends NlibCommonController { atvo.setAttachFileId(attachFileId); atvo.setStreFileNm(streFileNm); atvo.setOrignlFileNm(orignlFileNm); - atvo.setFileExtsn(fileExt); + atvo.setFileExt(fileExt); atvo.setFileSize(size); result.add(atvo); @@ -253,19 +253,19 @@ public class FileUploadController extends NlibCommonController { throw new Exception("잘못된 접근이므로 파일다운로드를 할 수 없습니다."); } - if(StringUtil.isEmpty(retAttachFileVO.getFileStreCours()) || StringUtil.isEmpty(retAttachFileVO.getStreFileNm())) { + if(StringUtil.isEmpty(retAttachFileVO.getFileStrePath()) || StringUtil.isEmpty(retAttachFileVO.getStreFileNm())) { throw new Exception("파일정보가 올바르지 않습니다."); } if(StringUtil.isEmpty(retAttachFileVO.getOrignlFileNm())) { - retAttachFileVO.setOrignlFileNm("첨부파일." + retAttachFileVO.getFileExtsn()); + retAttachFileVO.setOrignlFileNm("첨부파일." + retAttachFileVO.getFileExt()); } if(StringUtil.isEmpty(retAttachFileVO.getOrignlFileNm())) { - retAttachFileVO.setOrignlFileNm("첨부파일." + retAttachFileVO.getFileExtsn()); + retAttachFileVO.setOrignlFileNm("첨부파일." + retAttachFileVO.getFileExt()); } - String fullPath = retAttachFileVO.getFileStreCours() + retAttachFileVO.getStreFileNm(); + String fullPath = retAttachFileVO.getFileStrePath() + retAttachFileVO.getStreFileNm(); log.debug("downloadAttachFile > fullPath = " + fullPath); diff --git a/src/main/java/nlib/cmm/fileupload/FileVO.java b/src/main/java/nlib/cmm/fileupload/FileVO.java deleted file mode 100644 index 874e1046..00000000 --- a/src/main/java/nlib/cmm/fileupload/FileVO.java +++ /dev/null @@ -1,64 +0,0 @@ -package nlib.cmm.fileupload; - -/** - * 
- * @Class Name : AttachFileVO.java
- * 
- * @Description : 첨부파일 정보 VO 
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- *
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 9. 14. KNKIM 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP KNKIM - * @since 2021. 9. 14. - * @version 1.0 - * - */ -public class FileVO { - - private String subPathKey; /* 첨부파일서브경로 */ - private String fileMask; /* 첨부파일아이디 */ - private String fileId; /* 업무 아이디 */ - private int fileSeq; /* 파일 번호 */ - private String fileName; /* 파일 이름 */ - - public String getSubPathKey() { - return subPathKey; - } - public void setSubPathKey(String subPathKey) { - this.subPathKey = subPathKey; - } - public String getFileMask() { - return fileMask; - } - public void setFileMask(String fileMask) { - this.fileMask = fileMask; - } - public String getFileId() { - return fileId; - } - public void setFileId(String fileId) { - this.fileId = fileId; - } - public int getFileSeq() { - return fileSeq; - } - public void setFileSeq(int fileSeq) { - this.fileSeq = fileSeq; - } - public String getFileName() { - return fileName; - } - public void setFileName(String fileName) { - this.fileName = fileName; - } - -} diff --git a/src/main/java/nlib/cmm/web/MainController.java b/src/main/java/nlib/cmm/web/MainController.java index 00c3b280..ecc14689 100644 --- a/src/main/java/nlib/cmm/web/MainController.java +++ b/src/main/java/nlib/cmm/web/MainController.java @@ -187,9 +187,9 @@ public class MainController extends NlibCommonController { Map bannerInfo = mainService.getBannerInfo(bannerId); boolean exists = false; - if(bannerInfo != null && StringUtil.isNotEmpty(bannerInfo.get("fileStreCours")) && StringUtil.isNotEmpty(bannerInfo.get("streFileNm")) && StringUtil.isNotEmpty(bannerInfo.get("orignlFileNm"))) { + if(bannerInfo != null && StringUtil.isNotEmpty(bannerInfo.get("fileStrePath")) && StringUtil.isNotEmpty(bannerInfo.get("streFileNm")) && StringUtil.isNotEmpty(bannerInfo.get("orignlFileNm"))) { try { - String fileName = bannerInfo.get("fileStreCours") + bannerInfo.get("streFileNm"); + String fileName = bannerInfo.get("fileStrePath") + bannerInfo.get("streFileNm"); MimetypesFileTypeMap mimetypesFileTypeMap = new MimetypesFileTypeMap(); response.setContentType(mimetypesFileTypeMap.getContentType(bannerInfo.get("orignlFileNm"))); response.getOutputStream().write(Files.readAllBytes(Paths.get(fileName))); diff --git a/src/main/java/nlib/col/web/CartController.java b/src/main/java/nlib/col/web/CartController.java index 9fda5d1a..4512a9c6 100644 --- a/src/main/java/nlib/col/web/CartController.java +++ b/src/main/java/nlib/col/web/CartController.java @@ -271,7 +271,8 @@ public class CartController extends NlibCommonController if(message == null) message = "정상적으로 삭제되었습니다."; model.addAttribute("message", StringUtil.encodeUrl(message)); - return "redirect:/cart/listCartItems.do"; + model.addAttribute("cartTypeCd", cartVO.getCartTypeCd()); + return "redirect:/cart/listCartItems.do"; } /** diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/AttachFileDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/AttachFileDAO_SQL.xml index e4f1513f..d8d81b8d 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/AttachFileDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/AttachFileDAO_SQL.xml @@ -7,11 +7,10 @@ SELECT B.ATTACH_FILE_ID , B.FILE_SN - , B.FILE_STRE_COURS + , B.FILE_STRE_PATH , B.STRE_FILE_NM , B.ORIGNL_FILE_NM - , B.FILE_EXTSN - , B.FILE_CN + , B.FILE_EXT , B.FILE_SIZE FROM BD_FILE A JOIN BD_FILEDETAIL B ON (A.ATTACH_FILE_ID = B.ATTACH_FILE_ID) @@ -25,11 +24,10 @@ SELECT B.ATTACH_FILE_ID , B.FILE_SN - , B.FILE_STRE_COURS + , B.FILE_STRE_PATH , B.STRE_FILE_NM , B.ORIGNL_FILE_NM - , B.FILE_EXTSN - , B.FILE_CN + , B.FILE_EXT , B.FILE_SIZE FROM BD_FILE A JOIN BD_FILEDETAIL B ON (A.ATTACH_FILE_ID = B.ATTACH_FILE_ID) @@ -87,21 +85,19 @@ INSERT INTO BD_FILEDETAIL ( ATTACH_FILE_ID , FILE_SN - , FILE_STRE_COURS + , FILE_STRE_PATH , STRE_FILE_NM , ORIGNL_FILE_NM - , FILE_EXTSN - , FILE_CN + , FILE_EXT , FILE_SIZE , USE_AT ) VALUES ( #{attachFileId} , IFNULL(#{fileSn}, 1) - , #{fileStreCours} + , #{fileStrePath} , #{streFileNm} , #{orignlFileNm} - , #{fileExtsn} - , NULL + , #{fileExt} , #{fileSize} , 'Y' ) diff --git a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml index 7317363a..0a6a8fd1 100644 --- a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml @@ -155,10 +155,9 @@ , A.BANNER_DESC , A.URL , A.ATTACH_FILE_ID - , B.FILE_STRE_COURS + , B.FILE_STRE_PATH , B.STRE_FILE_NM , B.ORIGNL_FILE_NM - , B.FILE_EXTSN FROM BD_NLIB_BANNER A LEFT OUTER JOIN BD_FILEDETAIL B ON (A.ATTACH_FILE_ID = B.ATTACH_FILE_ID AND IFNULL(B.USE_AT,'Y') = 'Y') WHERE A.MNG_ORG_CD = #{mngOrgCd} @@ -181,10 +180,9 @@ , A.BANNER_DESC , A.URL , A.ATTACH_FILE_ID - , B.FILE_STRE_COURS + , B.FILE_STRE_PATH , B.STRE_FILE_NM , B.ORIGNL_FILE_NM - , B.FILE_EXTSN FROM BD_NLIB_BANNER A LEFT OUTER JOIN BD_FILEDETAIL B ON (A.ATTACH_FILE_ID = B.ATTACH_FILE_ID AND IFNULL(B.USE_AT,'Y') = 'Y') WHERE A.BANNER_ID = #{bannerId} diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp index 09c0bb9a..9c727acf 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp @@ -108,7 +108,7 @@ $(window.document).ready(function() { "attachFileId" : jobj[0].attachFileId, "streFileNm" : jobj[0].streFileNm, "orignlFileNm" : jobj[0].orignlFileNm, - "fileExtsn" : jobj[0].fileExtsn, + "fileExt" : jobj[0].fileExt, "fileSn" : jobj[0].fileSn, "fileSize" : jobj[0].fileSize }; diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp index 4a19d745..bf0d333a 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp @@ -92,7 +92,7 @@ function fn_listPops(typeDivCd) {
  • -
    슬라이드 이미지 1
    +
    메인 배너 이미지

    온라인 대출/알람예약 서비스를 통해
    문화원 소장자료들을 만나보세요.

    자료 검색을 통해 원하는 자료를 찾고, 대출/열람 예약 신청까지!
    온라인에서 쉽고 간편하게 할 수 있습니다.

    @@ -100,29 +100,28 @@ function fn_listPops(typeDivCd) {
    • - + - -
  • -
    + +
  • class="swiper-slide" > +
    - 메인 슬라이딩 배너 이미지 + 메인 배너 이미지 메인 슬라이딩 배너 이미지 -
    -
    -

    ${bannerItem.title }

    -

    ${bannerItem.bannerDesc }

    - -

    자세히 보기 >

    -     -
    -
    • -     + +
    +

    ${bannerItem.title }

    +

    ${bannerItem.bannerDesc }

    + +

    자세히 보기 >

    +     +
    + +     -