From b47244e63f2dad66f586765cef9375f053a3006c Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Tue, 6 Dec 2022 01:51:38 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=8B=9C=EB=AF=BC=EC=8B=A0=EA=B3=A0=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/ec/mapper/IEcCtznSttemntMapper.java | 8 +- .../kr/xit/fims/biz/ec/model/CtznStmtDTO.java | 11 + .../biz/ec/service/EcCtznSttemntService.java | 56 ++++ .../biz/ec/service/IEcCtznSttemntService.java | 25 ++ .../ec/service/IEcNatlNewspaperService.java | 2 +- .../biz/ec/web/EcCtznSttemntController.java | 86 +++++ .../biz/ec/web/EcNatlNewspaperController.java | 21 +- .../biz/cmm/web/CmmFileMgtController.java | 14 +- .../framework/core/model/ResultResponse.java | 6 - .../biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml | 43 ++- .../resources/xitProps/globals.properties | 8 +- .../jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp | 222 +++++++++++++ .../jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp | 313 ++++++++++++++++++ .../fims/biz/ec/ecNatlNewspaperMgtForm.jsp | 13 +- ...rMgtPopup.jsp => ecNatlNewspaperPopup.jsp} | 64 +++- .../layouts/tiles/biz/cmmn/BizIncludeBase.jsp | 4 +- .../resources/framework/js/cmm/XitCmmnUtil.js | 132 +++++++- .../resources/framework/js/cmm/cmmUtil.js | 41 +++ 18 files changed, 1019 insertions(+), 50 deletions(-) create mode 100644 src/main/java/kr/xit/fims/biz/ec/service/EcCtznSttemntService.java create mode 100644 src/main/java/kr/xit/fims/biz/ec/service/IEcCtznSttemntService.java create mode 100644 src/main/java/kr/xit/fims/biz/ec/web/EcCtznSttemntController.java create mode 100644 src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp rename src/main/webapp/WEB-INF/jsp/fims/biz/ec/{ecNatlNewspaperMgtPopup.jsp => ecNatlNewspaperPopup.jsp} (86%) diff --git a/src/main/java/kr/xit/fims/biz/ec/mapper/IEcCtznSttemntMapper.java b/src/main/java/kr/xit/fims/biz/ec/mapper/IEcCtznSttemntMapper.java index 5244a977..458f021f 100644 --- a/src/main/java/kr/xit/fims/biz/ec/mapper/IEcCtznSttemntMapper.java +++ b/src/main/java/kr/xit/fims/biz/ec/mapper/IEcCtznSttemntMapper.java @@ -10,12 +10,12 @@ import kr.xit.fims.biz.ec.model.CtznStmtDTO; @Mapper public interface IEcCtznSttemntMapper { - - int insertEcCtznSttemnt(final CtznStmtDTO dto); - List selectEcCtznSttemnts(Map paraMap, RowBounds rowBounds); + CtznStmtDTO selectEcCtznSttemnt(final CtznStmtDTO.Request dto); + List selectEcCtznSttemntDetails(final CtznStmtDTO.Request dto); + CtznStmtDTO.CtznStmtDtl selectEcCtznSttemntDetail(final CtznStmtDTO.Request dto); - + int insertEcCtznSttemnt(final CtznStmtDTO dto); int insertEcCtznSttemntDetail(final CtznStmtDTO.CtznStmtDtl dtl); } diff --git a/src/main/java/kr/xit/fims/biz/ec/model/CtznStmtDTO.java b/src/main/java/kr/xit/fims/biz/ec/model/CtznStmtDTO.java index 06ce8b40..47e0470a 100644 --- a/src/main/java/kr/xit/fims/biz/ec/model/CtznStmtDTO.java +++ b/src/main/java/kr/xit/fims/biz/ec/model/CtznStmtDTO.java @@ -208,4 +208,15 @@ public class CtznStmtDTO implements Serializable { //extends ExtlEsbDataType { private Set indexs = new HashSet<>(); } + + @Getter + @Setter + @NoArgsConstructor + @AllArgsConstructor + @Builder + @ToString + public static class Request { + private String ctznSttemntDetailSn; + private String interfaceSeqN; + } } diff --git a/src/main/java/kr/xit/fims/biz/ec/service/EcCtznSttemntService.java b/src/main/java/kr/xit/fims/biz/ec/service/EcCtznSttemntService.java new file mode 100644 index 00000000..a5b670f1 --- /dev/null +++ b/src/main/java/kr/xit/fims/biz/ec/service/EcCtznSttemntService.java @@ -0,0 +1,56 @@ +package kr.xit.fims.biz.ec.service; + +import java.util.List; +import java.util.Map; + +import org.apache.ibatis.session.RowBounds; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import kr.xit.fims.biz.ec.mapper.IEcCtznSttemntMapper; +import kr.xit.fims.biz.ec.model.CtznStmtDTO; +import kr.xit.framework.biz.cmm.service.ICmmFileService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@RequiredArgsConstructor +@Service +public class EcCtznSttemntService implements IEcCtznSttemntService { + + @Value("#{prop['file.upload.root']}") + private String uploadRoot; + + @Value("#{prop['file.upload.natl-newspaper.path']}") + private String uploadNewsPaperPath; + + private final IEcCtznSttemntMapper mapper; + + private final ICmmFileService cmmFileService; + + @Override + @Transactional(readOnly = true) + public List findCtznStmts(final Map paraMap, final RowBounds rowBounds) { + return mapper.selectEcCtznSttemnts(paraMap, rowBounds); + } + + @Override + @Transactional(readOnly = true) + public CtznStmtDTO findCtznStmt(final CtznStmtDTO.Request dto) { + return mapper.selectEcCtznSttemnt(dto); + } + + @Override + @Transactional(readOnly = true) + public List findCtznStmtDtls(final CtznStmtDTO.Request dto) { + return mapper.selectEcCtznSttemntDetails(dto); + } + + @Override + @Transactional(readOnly = true) + public CtznStmtDTO.CtznStmtDtl findCtznStmtDtl(final CtznStmtDTO.Request dto) { + return mapper.selectEcCtznSttemntDetail(dto); + } + +} diff --git a/src/main/java/kr/xit/fims/biz/ec/service/IEcCtznSttemntService.java b/src/main/java/kr/xit/fims/biz/ec/service/IEcCtznSttemntService.java new file mode 100644 index 00000000..14ec9618 --- /dev/null +++ b/src/main/java/kr/xit/fims/biz/ec/service/IEcCtznSttemntService.java @@ -0,0 +1,25 @@ +package kr.xit.fims.biz.ec.service; + +import java.util.List; +import java.util.Map; + +import org.apache.ibatis.session.RowBounds; +import org.apache.poi.ss.formula.functions.T; + +import kr.xit.fims.biz.ec.model.CtznStmtDTO; +import kr.xit.framework.core.utils.XitCmmnUtil; + +public interface IEcCtznSttemntService { + List findCtznStmts(final Map paraMap, final RowBounds rowBounds); + CtznStmtDTO findCtznStmt(final CtznStmtDTO.Request reqDTO); + List findCtznStmtDtls(final CtznStmtDTO.Request reqDTO); + CtznStmtDTO.CtznStmtDtl findCtznStmtDtl(final CtznStmtDTO.Request reqDTO); + + + + default String getUserUniqId(){ + return XitCmmnUtil.getUserUniqId(); + } + + +} diff --git a/src/main/java/kr/xit/fims/biz/ec/service/IEcNatlNewspaperService.java b/src/main/java/kr/xit/fims/biz/ec/service/IEcNatlNewspaperService.java index f0e9b812..ea5d6193 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/IEcNatlNewspaperService.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/IEcNatlNewspaperService.java @@ -11,7 +11,7 @@ import kr.xit.framework.core.utils.XitCmmnUtil; public interface IEcNatlNewspaperService { - List findEsbInterfaces(final Map paraMap, final RowBounds rowBounds); + List findEsbInterfaces(final Map paraMap, final RowBounds rowBounds); NatlNewspaperRcvDTO findEsbInterface(final String interfaceSeqN); void saveEsbRvcParse(final NatlNewspaperRcvReqDTO dto); diff --git a/src/main/java/kr/xit/fims/biz/ec/web/EcCtznSttemntController.java b/src/main/java/kr/xit/fims/biz/ec/web/EcCtznSttemntController.java new file mode 100644 index 00000000..8d0c9e82 --- /dev/null +++ b/src/main/java/kr/xit/fims/biz/ec/web/EcCtznSttemntController.java @@ -0,0 +1,86 @@ +package kr.xit.fims.biz.ec.web; + +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.Mapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + +import kr.xit.fims.biz.FimsConst; +import kr.xit.fims.biz.ec.model.CtznStmtDTO; +import kr.xit.fims.biz.ec.service.IEcCtznSttemntService; +import kr.xit.framework.biz.cmm.model.CmmFileDTO; +import kr.xit.framework.biz.cmm.service.ICmmFileService; +import kr.xit.framework.core.model.ResultResponse; +import kr.xit.framework.support.mybatis.MybatisUtils; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@RequiredArgsConstructor +@Controller +@RequestMapping(value = "/fims/biz/ec") +public class EcCtznSttemntController { + @Value("#{prop['file.rcv.root']}") + private String fileRcvRoot; + + @Value("#{prop['file.rcv.natl-newspaper.path']}") + private String rcvNatlNewspaperPath; + + private final IEcCtznSttemntService service; + private final ICmmFileService fileService; + + + @RequestMapping(value = "/ecCtznSttemntMgtForm") + public void ecCtznSttemntMgtForm(){ + } + + @RequestMapping(value = "/ecCtznSttemntMgtPopup") + @ResponseBody + public ModelAndView ecCtznSttemntMgtPopup(final String interfaceSeqN){ + ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"ec/ecCtznSttemntMgtPopup.popup"); + + CtznStmtDTO.Request reqDTO = CtznStmtDTO.Request.builder() + .interfaceSeqN(interfaceSeqN) + .ctznSttemntDetailSn("01").build(); + mav.addObject("interfaceSeqN", interfaceSeqN); + mav.addObject("ctznStmtDTO", service.findCtznStmt(reqDTO)); + mav.addObject("ctznStmtDtlDTOs", service.findCtznStmtDtls(reqDTO)); + return mav; + } + + @GetMapping(value = "/findCtznStmts") + public ModelAndView findCtznStmts(@RequestParam final Map paraMap) { + return ResultResponse.of(service.findCtznStmts(paraMap, MybatisUtils.getPagingInfo(paraMap))); + } + + @RequestMapping (value = "/findCtznStmtDtls") + public ModelAndView findCtznStmtDtls(final CtznStmtDTO.Request dto) { + return ResultResponse.of(service.findCtznStmtDtls(dto)); + } + + @GetMapping(value = "/findCtznStmtDtl") + public ModelAndView findCtznStmtDtl(final CtznStmtDTO.Request dto) { + return ResultResponse.of(service.findCtznStmtDtl(dto)); + } + + @RequestMapping("/findCtznStmtAttchFiles") + public ModelAndView findCtznStmtAttchFiles(final CtznStmtDTO.Request dto) { + return ResultResponse.of( + fileService.findFilesByEsbInterfaces( + CmmFileDTO.FileMst.builder() + .jobSeCode(FimsConst.FileJobSeCode.NATL_NEWS_PAPER_RCV.getCode()) + .fileJobId(dto.getInterfaceSeqN()+dto.getCtznSttemntDetailSn()) + .build()).stream() + .filter(dtl -> !Objects.equals("png", dtl.getFileExtsn())) + .collect(Collectors.toList()) + ); + } +} diff --git a/src/main/java/kr/xit/fims/biz/ec/web/EcNatlNewspaperController.java b/src/main/java/kr/xit/fims/biz/ec/web/EcNatlNewspaperController.java index a88e0dca..ec6ae026 100644 --- a/src/main/java/kr/xit/fims/biz/ec/web/EcNatlNewspaperController.java +++ b/src/main/java/kr/xit/fims/biz/ec/web/EcNatlNewspaperController.java @@ -1,8 +1,11 @@ package kr.xit.fims.biz.ec.web; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; +import javax.servlet.http.HttpServletResponse; + import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -53,10 +56,11 @@ public class EcNatlNewspaperController { return mav; } - @RequestMapping(value = "/ecNatlNewspaperMgtPopup") + @RequestMapping(value = "/ecNatlNewspaperPopup") public ModelAndView ecNatlNewspaperMgtPopup(final String interfaceSeqN){ - ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"ec/ecNatlNewspaperMgtPopup.popup"); + ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"ec/ecNatlNewspaperPopup.popup"); mav.addObject("rcvXmlDTO", service.findEsbInterface(interfaceSeqN)); + mav.addObject("interfaceSeqN", interfaceSeqN); mav.addObject("attchFiles", fileService.findFilesByEsbInterfaces( CmmFileDTO.FileMst.builder() .jobSeCode(FimsConst.FileJobSeCode.NATL_NEWS_PAPER_RCV.getCode()) @@ -89,4 +93,17 @@ public class EcNatlNewspaperController { public ModelAndView findNatlNewspaers(@RequestParam final Map paraMap) { return ResultResponse.of(service.findEsbInterfaces(paraMap, MybatisUtils.getPagingInfo(paraMap))); } + + @RequestMapping("/findNatlNewspaperAttchFiles") + public ModelAndView findNatlNewspaperAttchFiles(final String interfaceSeqN) { + return ResultResponse.of( + fileService.findFilesByEsbInterfaces( + CmmFileDTO.FileMst.builder() + .jobSeCode(FimsConst.FileJobSeCode.NATL_NEWS_PAPER_RCV.getCode()) + .fileJobId(interfaceSeqN) + .build()).stream() + .filter(dtl -> !Objects.equals("png", dtl.getFileExtsn())) + .collect(Collectors.toList()) + ); + } } diff --git a/src/main/java/kr/xit/framework/biz/cmm/web/CmmFileMgtController.java b/src/main/java/kr/xit/framework/biz/cmm/web/CmmFileMgtController.java index 20ebec8c..62bdb65d 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/web/CmmFileMgtController.java +++ b/src/main/java/kr/xit/framework/biz/cmm/web/CmmFileMgtController.java @@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.Mapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -91,16 +92,19 @@ public class CmmFileMgtController { download(absFile, "", response); } - @GetMapping("/download") - public void download(final String scDatagb, final Long scCode, String methodName, HttpServletResponse response) { + @RequestMapping("/download") + public void download(final CmmFileDTO.FileDtl fileDtlDTO, HttpServletResponse response) { - - String absFile = ""; + StringBuilder sb = new StringBuilder(); + sb.append(uploadRoot) + .append(fileDtlDTO.getFileCours()) + .append("/") + .append(fileDtlDTO.getFileId()); - download(absFile, "", response); + download(sb.toString(), fileDtlDTO.getOrginlFileNm(), response); } private void download(String absFile, String fileName, HttpServletResponse response) { diff --git a/src/main/java/kr/xit/framework/core/model/ResultResponse.java b/src/main/java/kr/xit/framework/core/model/ResultResponse.java index cde8a980..b760222f 100644 --- a/src/main/java/kr/xit/framework/core/model/ResultResponse.java +++ b/src/main/java/kr/xit/framework/core/model/ResultResponse.java @@ -160,12 +160,6 @@ public class ResultResponse implements IResponse, Serializable { return mav; } - // public static ResponseEntity of(HttpStatus httpStatus){ - // ResultResponse result = new ResultResponse(); - // result.message = new ResultMessage(SUCCESS, SUCCESS_MESSAGE); - // return new ResponseEntity<>(result, httpStatus); - // } - @Override public String toString() { GsonBuilder builder = new GsonBuilder().serializeNulls(); // value가 null값인 경우도 생성 diff --git a/src/main/resources/sqlmapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml b/src/main/resources/sqlmapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml index 465635da..c28ca36e 100644 --- a/src/main/resources/sqlmapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml @@ -6,7 +6,7 @@ - + SELECT interface_seq_n , instt_code , sys_code @@ -34,7 +34,13 @@ + + @@ -91,8 +97,41 @@ + + SELECT interface_seq_n + , ctzn_sttemnt_detail_sn + , vhcle_no + , reglt_id + , instt_code + , sys_code + , reglt_de_time + , reglt_place + , violt_dtls_nm + , gps_x + , gps_y + , ctzn_sttemnt_detail_process_sttus + , regist_dt + , register + , updt_dt + , updusr + FROM tb_ec_ctzn_sttemnt_detail + + + /* ec-ctzn-sttemnt-mysql-mapper|insertEcCtznSttemntDetail-시민신고 상세 등록|julim */ diff --git a/src/main/resources/xitProps/globals.properties b/src/main/resources/xitProps/globals.properties index f83966f9..ae9c5869 100644 --- a/src/main/resources/xitProps/globals.properties +++ b/src/main/resources/xitProps/globals.properties @@ -124,15 +124,15 @@ exception.log.trace=true # k byte file.upload.allow.max-size: 2048 file.upload.allow.ext= -#file.upload.root=/Users/minuk/data/fims/upload -file.upload.root=D:/data/fims/upload +file.upload.root=/Users/minuk/data/fims/upload +#file.upload.root=D:/data/fims/upload #file.upload.root=http://211.119.124.107:280/fimsdata/upload file.upload.natl-newspaper.path=/natl-newspaper #file.rcv.root=/Users/minuk/data/fims/rcv #file.rcv.natl-newspaper.path=/natl-newspaper/rcv -#file.rcv.root=/Users/minuk/project_data/fims/01. \uC5F0\uACC4/01. \uAD6D\uBBFC\uC2E0\uBB38\uACE0 -file.rcv.root=D:/project_data/fims/01. \uC5F0\uACC4/01. \uAD6D\uBBFC\uC2E0\uBB38\uACE0 +file.rcv.root=/Users/minuk/project_data/fims/01. \uC5F0\uACC4/01. \uAD6D\uBBFC\uC2E0\uBB38\uACE0 +#file.rcv.root=D:/project_data/fims/01. \uC5F0\uACC4/01. \uAD6D\uBBFC\uC2E0\uBB38\uACE0 #file.rcv.root=http://211.119.124.107:280/fimsdata/rcv #file.rcv.natl-newspaper.path=/natl-newspaper file.rcv.natl-newspaper.path=/rcv diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp new file mode 100644 index 00000000..a40adc0a --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp @@ -0,0 +1,222 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> + +
+
+ + + + + + + + + + + + + + + + + +
검색조건
+ + + + +
+
+
+ + +
+ +
전체 ㅣ
+ + + 등록 + +
+ + + +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp new file mode 100644 index 00000000..0d8623b5 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp @@ -0,0 +1,313 @@ +<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> + + + + + +
+
+

+ () 상세 +

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + + +
상세
기관코드 + + 시스템코드 + + 민원구분 + +
민원신청번호 + + 민원접수번호 + + 민원신청인명 + +
신청인이메일 + + 신청인우편번호 + + 신청인주소 + +
신청인핸드폰 + + 신청인전화 + + 처리상태 + +
민원신청제목 + +
민원신청내용 + +
민원신청일시 + + + 민원처리기간 + + + 민원등록일시 + + +
등록일시--%> +<%-- --%> +<%-- ' readonly>--%> +<%-- 등록인--%> +<%-- --%> +<%--
+
+ +
+ + + + + + + + + + + +<%-- --%> + + + + + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + + + +
상세
차량번호 +<%-- --%> +<%-- --%> +<%-- --%> + 순번 +<%-- --%> +<%-- --%> + 단속ID--%> +<%-- --%> +<%--
단속일시--%> +<%-- --%> +<%-- ' readonly>--%> +<%-- 단속장소--%> +<%-- --%> +<%-- 위반내역--%> +<%-- --%> +<%--
GPS위도--%> +<%-- --%> +<%-- GPS경도--%> +<%-- --%> +<%-- 기관코드--%> +<%-- --%> +<%--
과태료코드--%> +<%-- --%> +<%-- 처리상태--%> +<%-- --%> +<%-- 등록일시--%> +<%-- --%> +<%-- ' readonly>--%> +<%--
+ +
+
+
+ + 닫기 + +
+ +
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp index d924a9e8..17bcac76 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp @@ -64,8 +64,8 @@ let popOption; switch (flag) { case "detail": - url = ''; - popOption = {width: 1000, height:850}; + url = ''; + popOption = {width: 1000, height:900}; popTitle = "주민 신고 데이타 상세"; break; case "file": @@ -124,7 +124,7 @@ minWidth: 200, sortable: true, sortingType: 'desc', - //align: 'center', + align: 'center', renderer: { type: CustomButtonRenderer, options: { @@ -176,12 +176,7 @@ api: { readData: { url: '' - ,serializer: (params) => { - const schKey = $('#searchCondition').val(); - let schValue = $('input[name=searchKeyword]').val(); - if(schKey === 'tmplatSeCode') schValue = $('select[name=searchKeyword]').val(); - return getPageParam({[schKey]: schValue}, params); - } + ,serializer: (params) => fnAddPageInfo(document.frmSearch, params) } } }; diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperPopup.jsp similarity index 86% rename from src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtPopup.jsp rename to src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperPopup.jsp index d1e51356..5734fbf1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperPopup.jsp @@ -2,7 +2,7 @@ <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> <%--rcvXmlDTO--%> -<%----%> +
@@ -108,6 +108,7 @@ " readonly> + <%-- 첨부파일크기 @@ -136,6 +137,7 @@ " readonly> + --%> 등록일시 @@ -167,6 +169,7 @@ " readonly> + <%-- 처리구분2 @@ -195,9 +198,11 @@ " readonly> + --%> +
닫기 @@ -212,19 +217,54 @@ /************************************************************************** * Global Variable **************************************************************************/ - let orgData; +// let orgData; /* ******************************* * Biz function ******************************* */ const fnBiz = { - add: () => { + downloadImg: () => { - cmmBizAjax('add', { - url: '' - , data: $("#boardMaster").serialize() + cmmAjax({ + showSuccessMsg: false + ,url: '' + ,data: {interfaceSeqN: '${interfaceSeqN}'} + ,success: (res) => { + const url = ''; + res.data?.contents.forEach((dtl, idx) => { + + fetch( + url + , { + method: 'post' + , body: JSON.stringify(dtl) + } + ) + .then((response) => response.blob()) + .then((blob) => { + const url = URL.createObjectURL(blob); + + var x = document.createElement("img"); + x.setAttribute("src", url); + //x.style = 'width:150px; display: block;'; + x.style = 'height:150px;'; + //x.setAttribute("width", "304"); + //x.setAttribute("height", "228"); + x.setAttribute("alt", dtl.orginlFileNm); + document.querySelector('#ctznImg').appendChild(x); + + // Revoke Blob URL after DOM updates.. + //window.URL.revokeObjectURL(objectURL); + }); + }) + + } }) + }, + viewImg: () => { + + } }; @@ -232,13 +272,8 @@ * event **************************************************************************/ $(() => { - $('#choiceLink').on('click', () => { - CmmPopup.open( - '' - , {} - , {width: 900, height: 870} - , '프로그램 조회' - ); + $('img').on('click', () => { + fnBiz.viewImg() }); }); @@ -246,6 +281,7 @@ * initialize **************************************************************************/ $(document).ready(function () { - orgData = $('form').serialize(); +// orgData = $('form').serialize(); + fnBiz.downloadImg(); }); diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp index d8379968..4cb43c4c 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp @@ -69,7 +69,7 @@ //초기화 XitIncludeBase.init(); }); - +<%-- $.ajaxSetup({ cache : false, beforeSend:function(jqXhr, settings) { @@ -112,7 +112,7 @@ alert(jqxhr.responseText); } }); - +--%> diff --git a/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js b/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js index c563807e..ed85dfbb 100644 --- a/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js +++ b/src/main/webapp/resources/framework/js/cmm/XitCmmnUtil.js @@ -219,7 +219,11 @@ const cmmAjax = (param) => { ,data: param.data ,async: nvl(param.async, true) ,dataType: nvl(param.dataType, "json") - ,contentType: nvl(param.contentType, 'application/x-www-form-urlencoded') + ,contentType: nvl(param.contentType, 'application/x-www-form-urlencoded;charset=UTF-8') + ,cache : false + ,beforeSend: (jqXhr, settings) => { + jqXhr.setRequestHeader('AJAX',true); + } ,success: function (res) { if (param.showSuccessMsg === undefined || param.showSuccessMsg === true) { if(res.message) alert(res.message); @@ -228,6 +232,42 @@ const cmmAjax = (param) => { param.success(res) } } + ,error: function( event, jqxhr, settings, thrownError ){ + console.log('BizIncludeBase::ajaxError >>>>> ', thrownError) + if(settings.dataType==undefined){ + //html 문자열을 객체로 변환 후 메시지만 추출 + var doc = document.createElement("html"); + doc.innerHTML = jqxhr.responseText; + var msg = $(doc).find('.content_body').eq(0).text(); + if(msg == '') + msg = jqxhr.responseText; + alert(msg); + }else if(settings.dataType=='json'){ + //TODO: 에러처리 화면 깨지는 경우 체크해야 함 + //error 발생시 html type인 경우 반영 + //try{ + //const jsonObject = JSON.stringify(jqxhr.responseText); + //if(typeof jsonObject === 'object') alert(jsonObject.message) + //else return document.write(jqxhr.responseText); + + if(jqxhr.responseJSON?.message){ + alert(jqxhr.responseJSON?.message); + return false; + } + else { + document.write(jqxhr.responseText); + return false; + } + //}catch{ + // document.write(jqxhr.responseText); + // return false; + //} + + }else { + console.log('??? alert(jqxhr.responseText) 으로 처리 했는데 .... document.write(jqxhr.responseText)로 처리해야 하지 않을까????? 확인이 필요'); + alert(jqxhr.responseText); + } + } ,exception: function (res) { alert(res.message); if ($.type(param.exception) === 'function') { @@ -278,6 +318,96 @@ const cmmBizAjax = (workType, param, isPopup = true) => { } }; +const cmmDownloadAjax = (param) => { + $.ajax({ + url: param.url + ,type: nvl(param.type, "post") + ,data: param.data + ,async: nvl(param.async, true) + ,dataType: nvl(param.dataType, "json") + //,contentType: nvl(param.contentType, 'application/x-www-form-urlencoded;charset=UTF-8') + //,contentType: 'blob' + /* + ,xhr: function () { + let xhr = new XMLHttpRequest(); + xhr.onreadystatechange = function () { + //response 데이터를 바이너리로 처리한다. 세팅하지 않으면 default가 text + xhr.responseType = "blob"; + }; + return xhr; + } + */ + ,success: function (res, msg, xhr) { + if (xhr.readyState == 4 && xhr.status == 200) { + // 성공했을때만 파일 다운로드 처리하고 + let disposition = xhr.getResponseHeader('Content-Disposition'); + let filename; + if (disposition && disposition.indexOf('attachment') !== -1) { + let filenameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/; + let matches = filenameRegex.exec(disposition); + if (matches != null && matches[1]) filename = matches[1].replace(/['"]/g, ''); + } + let blob = new Blob([res]); + let link = document.createElement('a'); + link.href = window.URL.createObjectURL(blob); + link.download = filename; + link.click(); + }else{ + //실패했을때는 alert 메시지 출력 + alertPopup("다운로드에 실패하였습니다."); + } + + + if (param.showSuccessMsg === undefined || param.showSuccessMsg === true) { + if(res.message) alert(res.message); + } + if ($.type(param.success) === 'function') { + param.success(res) + } + } + ,exception: function (res) { + alert(res.message); + if ($.type(param.exception) === 'function') { + param.exception(res); + } + } + }); +}; + +function dataURLtoBlob(dataurl) { + var arr = dataurl.split(','), + mime = arr[0].match(/:(.*?);/)[1], + bstr = atob(arr[1]), + n = bstr.length, + u8arr = new Uint8Array(n); + while (n--) { + u8arr[n] = bstr.charCodeAt(n); + } + return new Blob([u8arr], { + type: mime + }); +} + +function downloadImg(imgSrc) { + var image = new Image(); + image.crossOrigin = "anonymous"; + image.src = imgSrc; + var fileName = image.src.split("/").pop(); + image.onload = function() { + var canvas = document.createElement('canvas'); + canvas.width = this.width; + canvas.height = this.height; + canvas.getContext('2d').drawImage(this, 0, 0); + if (typeof window.navigator.msSaveBlob !== 'undefined') { + window.navigator.msSaveBlob(dataURLtoBlob(canvas.toDataURL()), fileName); + } else { + var link = document.createElement('a'); + link.href = canvas.toDataURL(); + link.download = fileName; + link.click(); + } + }; +} /** * 
  * val 값이 null이면 ifNulVal(미지정시 '')
diff --git a/src/main/webapp/resources/framework/js/cmm/cmmUtil.js b/src/main/webapp/resources/framework/js/cmm/cmmUtil.js
index aaef9b61..540bbece 100644
--- a/src/main/webapp/resources/framework/js/cmm/cmmUtil.js
+++ b/src/main/webapp/resources/framework/js/cmm/cmmUtil.js
@@ -497,3 +497,44 @@ function serialize (formData) {
 
     return rtnData;
 }
+
+/**
+ * [downloadImage]
+ * @param  {[string]} img       [base64encoded image data]
+ * @param  {[string]} fileName  [new file name]
+ * @return [image file]
+ */
+function downloadImage(img, fileName) {
+    var imgData = atob(img.src.split(',')[1]),
+        len = imgData.length,
+        buf = new ArrayBuffer(len),
+        view = new Uint8Array(buf),
+        blob,
+        i;
+
+    for (i = 0; i < len; i++) {
+        view[i] = imgData.charCodeAt(i) & 0xff; // masking
+    }
+
+    blob = new Blob([view], {
+        type: 'application/octet-stream',
+    });
+
+    if (window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(blob, fileName);
+    } else {
+        //var url = URL.createObjectURL(blob);
+        var a = document.createElement('a');
+        a.style = 'display: none';
+        //a.href = url;
+        a.href = img.src;
+        a.download = fileName;
+        document.body.appendChild(a);
+        a.click();
+
+        setTimeout(function () {
+            document.body.removeChild(a);
+            //URL.revokeObjectURL(url);
+        }, 100);
+    }
+}