From 5213c1f158e8c942f49f382466991b46fdf052a2 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 26 Dec 2022 12:51:29 +0900 Subject: [PATCH 01/22] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20(?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90,=20=EC=82=AC=EC=9A=A9=EC=9E=90)sns?= =?UTF-8?q?=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=A3=BC=EC=84=9D=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=20-=20(=EC=82=AC=EC=9A=A9=EC=9E=90)=20=EA=B2=BD?= =?UTF-8?q?=EC=A0=95=EC=8B=A0=EC=B2=AD=20=EC=8B=9C=20=EC=9D=B4=EB=A9=94?= =?UTF-8?q?=EC=9D=BC=20=EC=9E=85=EB=A0=A5=EC=A0=9C=ED=95=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=20-=20(=EC=82=AC=EC=9A=A9=EC=9E=90)=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95=EC=8B=A0=EC=B2=AD=203step=20=EB=AF=B8=EB=A6=AC?= =?UTF-8?q?=EB=B3=B4=EA=B8=B0=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20=20=20=20?= =?UTF-8?q?=20-=20=ED=95=84=EC=88=98=EA=B0=92=20=EC=B2=B4=ED=81=AC=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=20=20=20=20=20-=20=EA=B3=B5=EB=B0=B1=20?= =?UTF-8?q?=EC=8B=9C=20'null=20data'=20=EB=9D=BC=EA=B3=A0=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjst/web/AdjstReqWebController.java | 9 + .../kccadr/certDoc/web/CertDocController.java | 808 +++++++++--------- .../jsp/kccadr/adjPgrMgr/arm/armDetail.jsp | 4 +- .../jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp | 4 +- .../jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp | 4 +- .../jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp | 4 +- .../jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp | 4 +- .../jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp | 4 +- .../kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp | 4 +- .../jsp/kccadr/adjPgrMgr/ent/entDetail.jsp | 4 +- .../jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp | 4 +- .../web/kccadr/accdnt/arc/corReqCreate.jsp | 16 +- .../web/kccadr/accdnt/arc/corReqDetail.jsp | 12 +- .../kccadr/kccadrCom/kccadrConstantsJsp.jsp | 25 +- 14 files changed, 460 insertions(+), 446 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 3cb611c2..25b5c40e 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -1709,6 +1709,15 @@ public class AdjstReqWebController { String reqCn1 = adjReqVO.getReqCn1().replaceAll("\r\n", "\\\\r\\\\n"); //신청취지 String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n"); //신청원인 + // 조정신청 3step 미리보기 시 신청 취지/원인에 데이터가 없으면 'null data'로 찍혀서 공백을 띄어쓰기 한칸으로 넣기_이준호_221226 + if("".equals(reqCn1)) { + reqCn1 = " "; + } + + if("".equals(reqCn2)) { + reqCn2 = " "; + } + if(!rpplNm.equals("")) { diff --git a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java index 22af4c2f..0c0bc53c 100644 --- a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java +++ b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java @@ -1,404 +1,404 @@ -package kcc.kccadr.certDoc.web; - -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -import com.dreamsecurity.magicline.util.Log; - -import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; -import kcc.com.cmm.EgovMessageSource; -import kcc.com.cmm.util.StringUtil; -import kcc.com.utl.user.service.CheckLoginUtil; -import kcc.kccadr.adjPgrMgr.arm.service.CmntVO; -import kcc.kccadr.adjPgrMgr.cmm.service.CloseVO; -import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; -import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; -import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoDetailVO; -import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; -import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; -import kcc.kccadr.adjPgrMgr.dnt.service.DntService; -import kcc.kccadr.adjPgrMgr.dnt.service.DntVO; -import kcc.kccadr.adjPgrMgr.drt.service.AssVO; -import kcc.kccadr.adjPgrMgr.drt.service.DrtService; -import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; -import kcc.kccadr.adjPgrMgr.drtctr.service.AssCtrVO; -import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrService; -import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrVO; -import kcc.kccadr.adjRppl.service.AdjRpplService; -import kcc.kccadr.adjRppl.service.AdjRpplVO; -import kcc.kccadr.adjcclt.service.AdjstConciliatorService; -import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; -import kcc.kccadr.cmm.KccadrConstants; -import kcc.let.utl.fcc.service.EgovCryptoUtil; - -/** - * 대국민(사용자) - * 인증을 통한 송달서류 조회 controller 클래스를 정의한다. - * @author 김봉호 - * @since 2022.08.29 - * @version 1.0 - * @see - * - * 
- * << 개정이력(Modification Information) >>
- *
- *   수정일      수정자           수정내용
- *  -------    --------    ---------------------------
- *   2022.08.29  안주영          최초 생성
- *
- *
- */ -@Controller -public class CertDocController { - - //private static final Logger LOGGER = LoggerFactory.getLogger(AdjstChangeDateController.class); - - // eGov 공통 메세지 - @Resource(name = "egovMessageSource") - EgovMessageSource egovMessageSource; - - //로그인 체크 util - @Resource(name = "checkLoginUtil") - private CheckLoginUtil checkLoginUtil; - //암복호화 유틸 - @Resource(name = "egovCryptoUtil") - EgovCryptoUtil egovCryptoUtil; - - @Resource(name = "pgrCmmService") - private PgrCmmService cmmService; - - @Resource(name = "dlvinfoService") - private DlvinfoService dlvinfoService; - - @Resource(name = "drtCtrService") - private DrtCtrService drtCtrService; - - @Resource(name = "dntService") - private DntService dntService; - - @Resource(name = "drtService") - private DrtService drtService; - - @Resource(name="adjstConciliatorService") - private AdjstConciliatorService adjstConciliatorService; - - @Resource(name="adjRpplService") - private AdjRpplService adjRpplService; - - - /** - * 송달문서조회용 SNS 로그인 페이지 - */ - @RequestMapping("/web/kccadr/certDoc/snsLoginPage.do") - public String snsLoginPage(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { - - model.addAttribute("info", dlvinfoVO); - return "/web/kccadr/login/SsoLoginUsrSns"; - - } - - /** - * 송달문서조회용 SNS 로그인 callback 페이지 - */ - @RequestMapping("/web/kccadr/certDoc/snsCallBack.do") - public String snsCallBack(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { - - model.addAttribute("info", dlvinfoVO); - return "/web/kccadr/login/snsCallBack"; - - } - - - /** - * 송달서류 상세 - */ - @RequestMapping("/web/kccadr/certDoc/certDocInfo.do") - public String dlvDocInfo(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model, RedirectAttributes rs) throws Exception { - - AdjRpplVO rpplVO = new AdjRpplVO(); - rpplVO.setRpplSeq(dlvinfoVO.getRpplSeq()); - - rpplVO = adjRpplService.selectAdjRpplDetail(rpplVO); - - - String encEmail = egovCryptoUtil.encrypt(dlvinfoVO.getEmail()).trim(); - - String returnUrl = ""; - - System.out.println("+ 입력 Email :: "+ dlvinfoVO.getEmail()); - System.out.println("+ 입력 암호화 EmailencEmail :: "+ encEmail); - System.out.println("+ DB Email :: "+ rpplVO.getRpplEmail()); - /* - * dlvinfoVO.getEmail() :: hehihoho3@naver.com - * encEmail :: Lxt7qHEUH1ibf5qrdTjfZzHDaSMb28cFTu/hzZuU3ys= - * rpplVO.getRpplEmail() :: mrPLsRpt72UNCRSsLGnZnQ== - * */ - //둘 다 암호화된 값으로 비교해서 틀렸을 경우 메인페이지로 return - - if(!encEmail.equals(rpplVO.getRpplEmail())){ - rs.addFlashAttribute("returnMsg", "신청정보(이메일)가 일치하지 않습니다."); - rs.addFlashAttribute("logout", "Y"); - returnUrl = dlvinfoVO.getUrl(); - - return "redirect:" + returnUrl; - - //메인페이지로 - //return "redirect:/"; - } - - - //dlvrySeq로 기존 데이터 가져오기 - DlvinfoVO dlvinfoDetail = new DlvinfoVO(); - dlvinfoDetail = dlvinfoService.selectDlvryInfo(dlvinfoVO); - - //로그인 성공 시 adr_dlvry_social 테이블에 값 update - DlvinfoDetailVO dlvSocialVO = new DlvinfoDetailVO(); - dlvSocialVO.setDlvrySeq(dlvinfoVO.getDlvrySeq()); - dlvSocialVO.setRpplSeq(rpplVO.getRpplSeq()); - dlvSocialVO.setSocialType(dlvinfoVO.getSocialType()); // 1:카카오, 2:naver - dlvSocialVO.setDlvryDocTy(dlvinfoDetail.getDlvryDocTy()); - - dlvinfoService.updateAdjustDeliverySocialInfo(dlvSocialVO); - - - if(KccadrConstants.ADR_CLOSE_DOC_TY_80.equals(dlvSocialVO.getDlvryDocTy())) { //확정증명원 - - PgrCmmVO cmmVO = new PgrCmmVO(); - - cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - //사건 정보 불러오기 - model.addAttribute("info", cmmService.selectPgrCmm(cmmVO)); - - //종결문서에서 확정증명서 불러오기 - CloseVO closeVO = new CloseVO(); - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_80); - - model.addAttribute("closeDocInfo", cmmService.selectCloseDoc(closeVO)); - - returnUrl = "/web/kccadr/certDoc/cfrmDetail"; - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_10.equals(dlvSocialVO.getDlvryDocTy())) { //기일통지서 - - PgrCmmVO cmmVO = new PgrCmmVO(); - - cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - PgrCmmVO dntVO = getDntInfo(cmmVO); - model.addAttribute("info", dntVO); - - if(cmmVO.getSearchKeyword().equals("update")) { - // 조정기일 변경 조회 - DntVO dntNoticeVO = new DntVO(); - dntNoticeVO.setAdrSn(cmmVO.getAdrSn()); - dntNoticeVO.setAdrSeq(cmmVO.getAdrSeq()); - DntVO selectDateNoticeDate = dntService.selectDateNoticeDate(dntNoticeVO); - model.addAttribute("date",selectDateNoticeDate); - } - - returnUrl = "/web/kccadr/certDoc/dntDetail"; - - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_20.equals(dlvSocialVO.getDlvryDocTy())) { //기일조서 - - - PgrCmmVO cmmVO = new PgrCmmVO(); - - cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - DrtVO drtVO = new DrtVO(); - - drtVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - drtVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - List assList = drtService.selectAssList(drtVO); - - PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); - - model.addAttribute("assList", assList); - model.addAttribute("info", info); - - //조정위원 정보 불러오기 - PgrCmmVO dntVO = getDntInfo(cmmVO); - model.addAttribute("uiwonInfo", dntVO); - - returnUrl = "/web/kccadr/certDoc/drtDetail"; - - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_30.equals(dlvSocialVO.getDlvryDocTy())) { //조정권고안 - - CloseVO closeVO = new CloseVO(); - - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - - //조정기일 배석 정보 불러오기 - DrtCtrVO drtCtrVO = new DrtCtrVO(); - drtCtrVO.setAdrSeq(closeVO.getAdrSeq()); - drtCtrVO.setAdrSn(closeVO.getAdrSn()); - List assList = drtCtrService.selectAssList(drtCtrVO); - - //기일조서 정보 불러오기 - PgrCmmVO pgrCmmVO = new PgrCmmVO(); - pgrCmmVO.setAdrSeq(closeVO.getAdrSeq()); - pgrCmmVO.setPrtclSeq(closeVO.getPrtclSeq()); - PgrCmmVO info = cmmService.selectPgrCmm(pgrCmmVO); - - - //직권조정 조서 정보 가져오기 - model.addAttribute("assList", assList); - model.addAttribute("info", info); - - closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_30); - model.addAttribute("drtCtrVO", cmmService.selectCloseDoc(closeVO)); - - CmntVO cmntVO = new CmntVO(); - cmntVO.setAdrSeq(closeVO.getAdrSeq()); - cmntVO.setAdrSn(closeVO.getAdrSn()); - cmntVO.setCmntSeq(closeVO.getCmntSeq()); - cmntVO.setCmntTy(KccadrConstants.ADR_CLOSE_DOC_TY_30); - - //조정위원 의견 리스트 - model.addAttribute("list", cmmService.selectCmnList(cmntVO)); - - returnUrl = "/web/kccadr/certDoc/armDetail"; - - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_40.equals(dlvSocialVO.getDlvryDocTy())) { //조정조서 - - DrtCtrVO drtCtrVO = new DrtCtrVO(); - - drtCtrVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - drtCtrVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - PgrCmmVO cmmVO = new PgrCmmVO(); - - cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - - //조정기일 배석 정보 불러오기 - List assList = drtCtrService.selectAssList(drtCtrVO); - - //기일조서 정보 불러오기 - PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); - - //조정조서 정보 불러오기 - DrtCtrVO resultDrtCtrVO = drtCtrService.selectDrtCtrReport(drtCtrVO); - - model.addAttribute("assList", assList); - model.addAttribute("info", info); - model.addAttribute("drtCtrVO", resultDrtCtrVO); - - returnUrl = "/web/kccadr/certDoc/drtCtrDetail"; - - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_50.equals(dlvSocialVO.getDlvryDocTy())) { //취하종결통보서 - - CloseVO closeVO = new CloseVO(); - - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - model.addAttribute("info", cmmService.selectPgrCmm(closeVO)); - - returnUrl = "/web/kccadr/certDoc/entDetail"; - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_60.equals(dlvSocialVO.getDlvryDocTy())) { //직권조정결정서 - - CloseVO closeVO = new CloseVO(); - - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - //조정기일 배석 정보 불러오기 - DrtCtrVO drtCtrVO = new DrtCtrVO(); - drtCtrVO.setAdrSeq(closeVO.getAdrSeq()); - drtCtrVO.setAdrSn(closeVO.getAdrSn()); - List assList = drtCtrService.selectAssList(drtCtrVO); - model.addAttribute("assList", assList); - - //기일조서 정보 불러오기 - PgrCmmVO pgrCmmVO = new PgrCmmVO(); - pgrCmmVO.setAdrSeq(closeVO.getAdrSeq()); - pgrCmmVO.setPrtclSeq(closeVO.getPrtclSeq()); - PgrCmmVO info = cmmService.selectPgrCmm(pgrCmmVO); - model.addAttribute("info", info); - - //직권조정 조서 정보 가져오기 - closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_60); - model.addAttribute("drtCtrVO", cmmService.selectCloseDoc(closeVO)); - - //조정위원들 의견 정보 불러오기(전체 불러오기 - memSeq로 그룹핑해서 중복 제거했음) 20220209 - 우영두 추가 - AdjstConciliatorVO adjstConciliatorVO = new AdjstConciliatorVO(); - adjstConciliatorVO.setAdrSeq(closeVO.getAdrSeq()); - adjstConciliatorVO.setAdrSn(closeVO.getAdrSn()); - adjstConciliatorVO.setCmntTy(dlvinfoDetail.getDlvryDocTy()); //문서종류 코드 번호 전달 - - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(adjstConciliatorVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(100); - paginationInfo.setPageSize(adjstConciliatorVO.getPageSize()); - - adjstConciliatorVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - adjstConciliatorVO.setLastIndex(paginationInfo.getLastRecordIndex()); - adjstConciliatorVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - List cmnList = adjstConciliatorService.selectAdjstRecommendationCommentListGroup(adjstConciliatorVO); - - model.addAttribute("cmnList",cmnList); - - returnUrl = "/web/kccadr/certDoc/oadDetail"; - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_70.equals(dlvSocialVO.getDlvryDocTy())) { //불성립조정통보서 - - CloseVO closeVO = new CloseVO(); - - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - model.addAttribute("info", cmmService.selectPgrCmm(closeVO)); - - returnUrl = "/web/kccadr/certDoc/crtDetail"; - - } - - return returnUrl; - - } - - - @SuppressWarnings("unused") - private PgrCmmVO getDntInfo(PgrCmmVO cmmVO) throws Exception { - PgrCmmVO dntVO = cmmService.selectPgrCmm(cmmVO); - if (!StringUtil.isEmpty(dntVO.getMemNames())) { - String[] memNames = dntVO.getMemNames().split(", "); - String[] assSeqes = dntVO.getAssSeqes().split(", "); - - if(memNames.length==1) { - dntVO.setAddUsrNm0(memNames[0]); - dntVO.setAssSeq0(assSeqes[0]); - }else if(memNames.length>1) { - dntVO.setAddUsrNm0(memNames[0]); - dntVO.setAssSeq0(assSeqes[0]); - dntVO.setAddUsrNm1(memNames[1]); - dntVO.setAssSeq1(assSeqes[1]); - } - - } - return dntVO; - } - -} +package kcc.kccadr.certDoc.web; + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.dreamsecurity.magicline.util.Log; + +import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.EgovMessageSource; +import kcc.com.cmm.util.StringUtil; +import kcc.com.utl.user.service.CheckLoginUtil; +import kcc.kccadr.adjPgrMgr.arm.service.CmntVO; +import kcc.kccadr.adjPgrMgr.cmm.service.CloseVO; +import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; +import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; +import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoDetailVO; +import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; +import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; +import kcc.kccadr.adjPgrMgr.dnt.service.DntService; +import kcc.kccadr.adjPgrMgr.dnt.service.DntVO; +import kcc.kccadr.adjPgrMgr.drt.service.AssVO; +import kcc.kccadr.adjPgrMgr.drt.service.DrtService; +import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; +import kcc.kccadr.adjPgrMgr.drtctr.service.AssCtrVO; +import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrService; +import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrVO; +import kcc.kccadr.adjRppl.service.AdjRpplService; +import kcc.kccadr.adjRppl.service.AdjRpplVO; +import kcc.kccadr.adjcclt.service.AdjstConciliatorService; +import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; +import kcc.kccadr.cmm.KccadrConstants; +import kcc.let.utl.fcc.service.EgovCryptoUtil; + +/** + * 대국민(사용자) + * 인증을 통한 송달서류 조회 controller 클래스를 정의한다. + * @author 김봉호 + * @since 2022.08.29 + * @version 1.0 + * @see + * + * 
+ * << 개정이력(Modification Information) >>
+ *
+ *   수정일      수정자           수정내용
+ *  -------    --------    ---------------------------
+ *   2022.08.29  안주영          최초 생성
+ *
+ *
+ */ +@Controller +public class CertDocController { + + //private static final Logger LOGGER = LoggerFactory.getLogger(AdjstChangeDateController.class); + + // eGov 공통 메세지 + @Resource(name = "egovMessageSource") + EgovMessageSource egovMessageSource; + + //로그인 체크 util + @Resource(name = "checkLoginUtil") + private CheckLoginUtil checkLoginUtil; + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + @Resource(name = "pgrCmmService") + private PgrCmmService cmmService; + + @Resource(name = "dlvinfoService") + private DlvinfoService dlvinfoService; + + @Resource(name = "drtCtrService") + private DrtCtrService drtCtrService; + + @Resource(name = "dntService") + private DntService dntService; + + @Resource(name = "drtService") + private DrtService drtService; + + @Resource(name="adjstConciliatorService") + private AdjstConciliatorService adjstConciliatorService; + + @Resource(name="adjRpplService") + private AdjRpplService adjRpplService; + + + /** + * 송달문서조회용 SNS 로그인 페이지 + */ + /*@RequestMapping("/web/kccadr/certDoc/snsLoginPage.do") + public String snsLoginPage(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { + + model.addAttribute("info", dlvinfoVO); + return "/web/kccadr/login/SsoLoginUsrSns"; + + }*/ + + /** + * 송달문서조회용 SNS 로그인 callback 페이지 + */ + @RequestMapping("/web/kccadr/certDoc/snsCallBack.do") + public String snsCallBack(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { + + model.addAttribute("info", dlvinfoVO); + return "/web/kccadr/login/snsCallBack"; + + } + + + /** + * 송달서류 상세 + */ + @RequestMapping("/web/kccadr/certDoc/certDocInfo.do") + public String dlvDocInfo(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model, RedirectAttributes rs) throws Exception { + + AdjRpplVO rpplVO = new AdjRpplVO(); + rpplVO.setRpplSeq(dlvinfoVO.getRpplSeq()); + + rpplVO = adjRpplService.selectAdjRpplDetail(rpplVO); + + + String encEmail = egovCryptoUtil.encrypt(dlvinfoVO.getEmail()).trim(); + + String returnUrl = ""; + + System.out.println("+ 입력 Email :: "+ dlvinfoVO.getEmail()); + System.out.println("+ 입력 암호화 EmailencEmail :: "+ encEmail); + System.out.println("+ DB Email :: "+ rpplVO.getRpplEmail()); + /* + * dlvinfoVO.getEmail() :: hehihoho3@naver.com + * encEmail :: Lxt7qHEUH1ibf5qrdTjfZzHDaSMb28cFTu/hzZuU3ys= + * rpplVO.getRpplEmail() :: mrPLsRpt72UNCRSsLGnZnQ== + * */ + //둘 다 암호화된 값으로 비교해서 틀렸을 경우 메인페이지로 return + + if(!encEmail.equals(rpplVO.getRpplEmail())){ + rs.addFlashAttribute("returnMsg", "신청정보(이메일)가 일치하지 않습니다."); + rs.addFlashAttribute("logout", "Y"); + returnUrl = dlvinfoVO.getUrl(); + + return "redirect:" + returnUrl; + + //메인페이지로 + //return "redirect:/"; + } + + + //dlvrySeq로 기존 데이터 가져오기 + DlvinfoVO dlvinfoDetail = new DlvinfoVO(); + dlvinfoDetail = dlvinfoService.selectDlvryInfo(dlvinfoVO); + + //로그인 성공 시 adr_dlvry_social 테이블에 값 update + DlvinfoDetailVO dlvSocialVO = new DlvinfoDetailVO(); + dlvSocialVO.setDlvrySeq(dlvinfoVO.getDlvrySeq()); + dlvSocialVO.setRpplSeq(rpplVO.getRpplSeq()); + dlvSocialVO.setSocialType(dlvinfoVO.getSocialType()); // 1:카카오, 2:naver + dlvSocialVO.setDlvryDocTy(dlvinfoDetail.getDlvryDocTy()); + + dlvinfoService.updateAdjustDeliverySocialInfo(dlvSocialVO); + + + if(KccadrConstants.ADR_CLOSE_DOC_TY_80.equals(dlvSocialVO.getDlvryDocTy())) { //확정증명원 + + PgrCmmVO cmmVO = new PgrCmmVO(); + + cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + //사건 정보 불러오기 + model.addAttribute("info", cmmService.selectPgrCmm(cmmVO)); + + //종결문서에서 확정증명서 불러오기 + CloseVO closeVO = new CloseVO(); + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_80); + + model.addAttribute("closeDocInfo", cmmService.selectCloseDoc(closeVO)); + + returnUrl = "/web/kccadr/certDoc/cfrmDetail"; + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_10.equals(dlvSocialVO.getDlvryDocTy())) { //기일통지서 + + PgrCmmVO cmmVO = new PgrCmmVO(); + + cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + PgrCmmVO dntVO = getDntInfo(cmmVO); + model.addAttribute("info", dntVO); + + if(cmmVO.getSearchKeyword().equals("update")) { + // 조정기일 변경 조회 + DntVO dntNoticeVO = new DntVO(); + dntNoticeVO.setAdrSn(cmmVO.getAdrSn()); + dntNoticeVO.setAdrSeq(cmmVO.getAdrSeq()); + DntVO selectDateNoticeDate = dntService.selectDateNoticeDate(dntNoticeVO); + model.addAttribute("date",selectDateNoticeDate); + } + + returnUrl = "/web/kccadr/certDoc/dntDetail"; + + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_20.equals(dlvSocialVO.getDlvryDocTy())) { //기일조서 + + + PgrCmmVO cmmVO = new PgrCmmVO(); + + cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + DrtVO drtVO = new DrtVO(); + + drtVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + drtVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + List assList = drtService.selectAssList(drtVO); + + PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + + model.addAttribute("assList", assList); + model.addAttribute("info", info); + + //조정위원 정보 불러오기 + PgrCmmVO dntVO = getDntInfo(cmmVO); + model.addAttribute("uiwonInfo", dntVO); + + returnUrl = "/web/kccadr/certDoc/drtDetail"; + + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_30.equals(dlvSocialVO.getDlvryDocTy())) { //조정권고안 + + CloseVO closeVO = new CloseVO(); + + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + + //조정기일 배석 정보 불러오기 + DrtCtrVO drtCtrVO = new DrtCtrVO(); + drtCtrVO.setAdrSeq(closeVO.getAdrSeq()); + drtCtrVO.setAdrSn(closeVO.getAdrSn()); + List assList = drtCtrService.selectAssList(drtCtrVO); + + //기일조서 정보 불러오기 + PgrCmmVO pgrCmmVO = new PgrCmmVO(); + pgrCmmVO.setAdrSeq(closeVO.getAdrSeq()); + pgrCmmVO.setPrtclSeq(closeVO.getPrtclSeq()); + PgrCmmVO info = cmmService.selectPgrCmm(pgrCmmVO); + + + //직권조정 조서 정보 가져오기 + model.addAttribute("assList", assList); + model.addAttribute("info", info); + + closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_30); + model.addAttribute("drtCtrVO", cmmService.selectCloseDoc(closeVO)); + + CmntVO cmntVO = new CmntVO(); + cmntVO.setAdrSeq(closeVO.getAdrSeq()); + cmntVO.setAdrSn(closeVO.getAdrSn()); + cmntVO.setCmntSeq(closeVO.getCmntSeq()); + cmntVO.setCmntTy(KccadrConstants.ADR_CLOSE_DOC_TY_30); + + //조정위원 의견 리스트 + model.addAttribute("list", cmmService.selectCmnList(cmntVO)); + + returnUrl = "/web/kccadr/certDoc/armDetail"; + + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_40.equals(dlvSocialVO.getDlvryDocTy())) { //조정조서 + + DrtCtrVO drtCtrVO = new DrtCtrVO(); + + drtCtrVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + drtCtrVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + PgrCmmVO cmmVO = new PgrCmmVO(); + + cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + + //조정기일 배석 정보 불러오기 + List assList = drtCtrService.selectAssList(drtCtrVO); + + //기일조서 정보 불러오기 + PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + + //조정조서 정보 불러오기 + DrtCtrVO resultDrtCtrVO = drtCtrService.selectDrtCtrReport(drtCtrVO); + + model.addAttribute("assList", assList); + model.addAttribute("info", info); + model.addAttribute("drtCtrVO", resultDrtCtrVO); + + returnUrl = "/web/kccadr/certDoc/drtCtrDetail"; + + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_50.equals(dlvSocialVO.getDlvryDocTy())) { //취하종결통보서 + + CloseVO closeVO = new CloseVO(); + + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + model.addAttribute("info", cmmService.selectPgrCmm(closeVO)); + + returnUrl = "/web/kccadr/certDoc/entDetail"; + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_60.equals(dlvSocialVO.getDlvryDocTy())) { //직권조정결정서 + + CloseVO closeVO = new CloseVO(); + + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + //조정기일 배석 정보 불러오기 + DrtCtrVO drtCtrVO = new DrtCtrVO(); + drtCtrVO.setAdrSeq(closeVO.getAdrSeq()); + drtCtrVO.setAdrSn(closeVO.getAdrSn()); + List assList = drtCtrService.selectAssList(drtCtrVO); + model.addAttribute("assList", assList); + + //기일조서 정보 불러오기 + PgrCmmVO pgrCmmVO = new PgrCmmVO(); + pgrCmmVO.setAdrSeq(closeVO.getAdrSeq()); + pgrCmmVO.setPrtclSeq(closeVO.getPrtclSeq()); + PgrCmmVO info = cmmService.selectPgrCmm(pgrCmmVO); + model.addAttribute("info", info); + + //직권조정 조서 정보 가져오기 + closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_60); + model.addAttribute("drtCtrVO", cmmService.selectCloseDoc(closeVO)); + + //조정위원들 의견 정보 불러오기(전체 불러오기 - memSeq로 그룹핑해서 중복 제거했음) 20220209 - 우영두 추가 + AdjstConciliatorVO adjstConciliatorVO = new AdjstConciliatorVO(); + adjstConciliatorVO.setAdrSeq(closeVO.getAdrSeq()); + adjstConciliatorVO.setAdrSn(closeVO.getAdrSn()); + adjstConciliatorVO.setCmntTy(dlvinfoDetail.getDlvryDocTy()); //문서종류 코드 번호 전달 + + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(adjstConciliatorVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(100); + paginationInfo.setPageSize(adjstConciliatorVO.getPageSize()); + + adjstConciliatorVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + adjstConciliatorVO.setLastIndex(paginationInfo.getLastRecordIndex()); + adjstConciliatorVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + List cmnList = adjstConciliatorService.selectAdjstRecommendationCommentListGroup(adjstConciliatorVO); + + model.addAttribute("cmnList",cmnList); + + returnUrl = "/web/kccadr/certDoc/oadDetail"; + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_70.equals(dlvSocialVO.getDlvryDocTy())) { //불성립조정통보서 + + CloseVO closeVO = new CloseVO(); + + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + model.addAttribute("info", cmmService.selectPgrCmm(closeVO)); + + returnUrl = "/web/kccadr/certDoc/crtDetail"; + + } + + return returnUrl; + + } + + + @SuppressWarnings("unused") + private PgrCmmVO getDntInfo(PgrCmmVO cmmVO) throws Exception { + PgrCmmVO dntVO = cmmService.selectPgrCmm(cmmVO); + if (!StringUtil.isEmpty(dntVO.getMemNames())) { + String[] memNames = dntVO.getMemNames().split(", "); + String[] assSeqes = dntVO.getAssSeqes().split(", "); + + if(memNames.length==1) { + dntVO.setAddUsrNm0(memNames[0]); + dntVO.setAssSeq0(assSeqes[0]); + }else if(memNames.length>1) { + dntVO.setAddUsrNm0(memNames[0]); + dntVO.setAssSeq0(assSeqes[0]); + dntVO.setAddUsrNm1(memNames[1]); + dntVO.setAssSeq1(assSeqes[1]); + } + + } + return dntVO; + } + +} diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp index 0c1eeec2..65332dd6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp @@ -513,7 +513,7 @@ - + <%--

* 송달정보 URL로 전송하기



@@ -595,7 +595,7 @@ - + --%>
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp index ac531efc..d4bc27fa 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp @@ -372,7 +372,7 @@ $(document).ready(function() { - + <%--

* 송달정보 URL로 전송하기



@@ -454,7 +454,7 @@ $(document).ready(function() {
- + --%> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp index ca6157a1..cdd30f55 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp @@ -614,7 +614,7 @@ - + <%--

* 송달정보 URL로 전송하기



@@ -696,7 +696,7 @@ - + --%>
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp index c761c1e5..e6c1a699 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp @@ -429,7 +429,7 @@ - + <%--

* 송달정보 URL로 전송하기



@@ -511,7 +511,7 @@
- + --%>
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp index 717bd27c..4285c412 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp @@ -585,7 +585,7 @@ - + <%--

* 송달정보 URL로 전송하기



@@ -667,7 +667,7 @@
- + --%>
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp index b54ab56d..5dde7971 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp @@ -788,7 +788,7 @@
- + <%--

* 송달정보 URL로 전송하기



@@ -870,7 +870,7 @@
- + --%>
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp index b144146d..5350824a 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp @@ -596,7 +596,7 @@
- + <%--

* 송달정보 URL로 전송하기



@@ -678,7 +678,7 @@
- + --%> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp index 3f82dc66..55f1214d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp @@ -437,7 +437,7 @@ - + <%--

* 송달정보 URL로 전송하기



@@ -519,7 +519,7 @@ - + --%>
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp index ac3cc05d..3d263c3e 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp @@ -508,7 +508,7 @@
- + <%--

* 송달정보 URL로 전송하기



@@ -590,7 +590,7 @@ - + --%>
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp index 51886759..6b7c0d35 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp @@ -92,7 +92,7 @@ result = false; return false; } - if (isEmpty($('input[name=rpplEmail01]').eq(idx).val())) { + /* if (isEmpty($('input[name=rpplEmail01]').eq(idx).val())) { alert('이메일1을 입력해 주세요.'); $('input[name=rpplEmail01]').eq(idx).focus(); result = false; @@ -103,7 +103,7 @@ $('input[name=rpplEmail02]').eq(idx).focus(); result = false; return false; - } + } */ if (isEmpty($('select[name=rpplPhone01]').eq(idx).val())) { alert('연락처1를 입력해 주세요.'); $('select[name=rpplPhone01]').eq(idx).focus(); @@ -317,18 +317,18 @@ -

+

이메일

- "> + " onkeyup="onlyAlphabetNumberEmail(this)"> @ - "> + " onkeyup="onlyAlphabetNumberEmail(this)"> - "> + " onkeyup="onlyNumber(this)"> - - "> + " onkeyup="onlyNumber(this)"> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp index ab3b539e..aecf7400 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp @@ -383,18 +383,18 @@ function fn_submit(){ -

+

이메일

"> - "> + " onkeyup="onlyAlphabetNumberEmail(this)"> @ - "> + " onkeyup="onlyAlphabetNumberEmail(this)"> <%-- - - "> + " onkeyup="onlyNumber(this)"> - - "> + " onkeyup="onlyNumber(this)"> "> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index 53a06c6c..5b0212ae 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -525,9 +525,11 @@ var AdjstReq = { }, step3Save : function(mode, previewYn, adrSeq){ // previewYn : 조정신청등록 3단계 미리보기 버튼 클릭시 > 3단계 저장 처리후 팝업오픈 - if(!this.validStep(this.STEP)){ - return false; - } + if(previewYn != 'Y'){ + if(!this.validStep(this.STEP)){ + return false; + } + } var data = new FormData($("#"+this.STEP)[0]); //첨부파일 등록 처리 @@ -549,12 +551,13 @@ var AdjstReq = { // 등록 구분 코드 삽입.. data.append("mode" , mode); - - if(!confirm(msg)){ - if(mode == "${KccadrConstants.ADR_MODE_UPT_TO_GOPREV}"){ // 수정 후 전 페이지 - AdjstReq.fncGoPrev(); - } - return false; + if(previewYn != 'Y'){ + if(!confirm(msg)){ + if(mode == "${KccadrConstants.ADR_MODE_UPT_TO_GOPREV}"){ // 수정 후 전 페이지 + AdjstReq.fncGoPrev(); + } + return false; + } } var depth = this.expDivision(this.STEP); @@ -572,7 +575,9 @@ var AdjstReq = { cache: false, success: function (returnData, status) { if(returnData.result == 'SUCCESS'){ - alert(endMsg); + if(previewYn != 'Y'){ + alert(endMsg); + } $("#atchFileId").val(returnData.rsVO.atchFileId); if(mode == "${KccadrConstants.ADR_MODE_SMT}"){ AdjstReq.fncGoMyAdjstListPage(); From 991c5ad78956f80bec70e746d044e6272233b0bd Mon Sep 17 00:00:00 2001 From: tolag3 Date: Tue, 27 Dec 2022 10:16:39 +0900 Subject: [PATCH 02/22] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=ED=99=94=EB=A9=B4=20=EB=8C=80=EC=8B=9C=EB=B3=B4?= =?UTF-8?q?=EB=93=9C=20=EC=86=8D=EB=8F=84=20=EA=B0=9C=EC=84=A0=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/let/main/web/EgovMainController.java | 302 +++++++++--------- 1 file changed, 151 insertions(+), 151 deletions(-) diff --git a/src/main/java/kcc/let/main/web/EgovMainController.java b/src/main/java/kcc/let/main/web/EgovMainController.java index a6b9541f..628e3c70 100644 --- a/src/main/java/kcc/let/main/web/EgovMainController.java +++ b/src/main/java/kcc/let/main/web/EgovMainController.java @@ -214,157 +214,157 @@ public class EgovMainController { } } - PaginationInfo paginationInfo = new PaginationInfo(); - {//일일관리자 접속 리스트 - LoginLog loginLog = new LoginLog(); - paginationInfo.setCurrentPageNo(loginLog.getPageIndex()); - paginationInfo.setRecordCountPerPage(loginLog.getPageUnit()); - paginationInfo.setPageSize(loginLog.getPageSize()); - - loginLog.setFirstIndex(paginationInfo.getFirstRecordIndex()); - loginLog.setLastIndex(paginationInfo.getLastRecordIndex()); - loginLog.setRecordCountPerPage(10); //50개까지 보여주기 - //if(null != loginVO){ loginLog.setSiteId(loginVO.getSiteId()); } - List adminLogList = loginLogService.selectMainAmdinLog(loginLog); - int adminLogListCnt = loginLogService.selectMainAmdinLogTotCnt(loginLog); - paginationInfo.setTotalRecordCount(adminLogListCnt); - model.addAttribute("paginationInfo", paginationInfo); - model.addAttribute("adminLogList", adminLogList); - } - {// 최근 게시물 / 새개시물 카운트 - //0번째 부터 6개의 항목만 조회 - boardVO.setFirstIndex(0); - boardVO.setRecordCountPerPage(5); - // 최신날짜 우선순위 조회 - boardVO.setSearchSortCnd("frstRegisterPnttm"); - boardVO.setSearchSortOrd("desc"); - List adminBoardList = bbsMngService.selectAdminMainBoard(boardVO); - model.addAttribute("adminBoardList", adminBoardList); - - int adminMainNewBoardCnt = bbsMngService.selectAdminMainNewBoardCnt(boardVO); - model.addAttribute("adminMainNewBoardCnt", adminMainNewBoardCnt); - - } - {// 관리자 로그관리 리스트 - LoginLog loginLog = new LoginLog(); - //0번째 부터 6개의 항목만 조회 - loginLog.setFirstIndex(0); - loginLog.setRecordCountPerPage(6); - // 최신날짜 우선순위 조회 - loginLog.setSearchSortCnd("creatDt"); - loginLog.setSearchSortOrd("desc"); - List adminLogList = loginLogService.selectAmdinLog(loginLog); - model.addAttribute("adminLogList", adminLogList); - - } - {//신규가입회원 목록 - UserDefaultVO userSearchVO = new UserDefaultVO(); - - //0번째 부터 4개의 항목만 조회 - userSearchVO.setFirstIndex(0); - userSearchVO.setRecordCountPerPage(4); - - // 가입일시 우선순위 조회 - userSearchVO.setSearchSortCnd("sbscrbDe"); - userSearchVO.setSearchSortOrd("desc"); - - userSearchVO.setAdminYn("N"); - List userList = userManageService.selectUserList(userSearchVO); - model.addAttribute("userList", userList); - - UserDefaultVO userCount = userManageService.selectUserCount(); - model.addAttribute("userCount", userCount); - } - - {//접속통계 사용자만 - StatsVO statsVO = new StatsVO(); - statsVO.setRecordCountPerPage(20); //일카운터(20개) - statsVO.setFirstIndex(0); - List statsDayList = conectStatsService.selectMainStatsDay(statsVO); //일일접속카운터(관리자) - List statsMonthList = conectStatsService.selectMainStatsMonth(statsVO); //월별접속카운터(관리자) - List statsYearList = conectStatsService.selectMainStatsYear(statsVO); //연도변접속카운터(관리자) - {//일일통계 /* 연도없애기 */ - JSONObject statsObject = new JSONObject(); - JSONArray cntArray = new JSONArray(); - JSONArray dateArray = new JSONArray(); - for(StatsVO tempStatsVO : statsDayList){ - cntArray.add(tempStatsVO.getCnt()); - dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length())); - } - statsObject.put("cnt" , cntArray); - statsObject.put("date" , dateArray); - model.addAttribute("statsDayList", statsObject); - } - {//월통계 - JSONObject statsObject = new JSONObject(); - JSONArray cntArray = new JSONArray(); - JSONArray dateArray = new JSONArray(); - for(StatsVO tempStatsVO : statsMonthList){ - cntArray.add(tempStatsVO.getCnt()); - dateArray.add(tempStatsVO.getStatsDate()); - } - statsObject.put("cnt" , cntArray); - statsObject.put("date" , dateArray); - model.addAttribute("statsMonthList", statsObject); - } - {//년통계 - JSONObject statsObject = new JSONObject(); - JSONArray cntArray = new JSONArray(); - JSONArray dateArray = new JSONArray(); - cntArray.add(0); //데이터가 2018 한건만 조회 되어서 2017년도 0 넣어줌 - dateArray.add("2017"); - for(StatsVO tempStatsVO : statsYearList){ - cntArray.add(tempStatsVO.getCnt()); - dateArray.add(tempStatsVO.getStatsDate()); - } - statsObject.put("cnt" , cntArray); - statsObject.put("date" , dateArray); - model.addAttribute("statsYearList", statsObject); - } - - //PC, 모바일 접속통계(주간) - statsVO.setRecordCountPerPage(7); //일카운터(7일 : 일주일) - statsVO.setFirstIndex(0); - List statsPcDayList = conectStatsService.selectPcMainStatsDay(statsVO); //일일접속카운터(사용자) - List statsMobileDayList = conectStatsService.selectMobileMainStatsDay(statsVO); //일일접속카운터(사용자) - List statsAllDayList = conectStatsService.selectPcMobileMainStatsDay(statsVO); //모바일+PC(사용자) - {//PC - JSONObject statsObject = new JSONObject(); - JSONArray cntArray = new JSONArray(); - JSONArray dateArray = new JSONArray(); - for(StatsVO tempStatsVO : statsPcDayList){ - cntArray.add(tempStatsVO.getCnt()); - dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) ); - } - statsObject.put("cnt" , cntArray); - statsObject.put("date" , dateArray); - model.addAttribute("statsPcDayList", statsObject); - } - {//모바일 - JSONObject statsObject = new JSONObject(); - JSONArray cntArray = new JSONArray(); - JSONArray dateArray = new JSONArray(); - for(StatsVO tempStatsVO : statsMobileDayList){ - cntArray.add(tempStatsVO.getCnt()); - dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) ); - } - statsObject.put("cnt" , cntArray); - statsObject.put("date" , dateArray); - model.addAttribute("statsMobileDayList", statsObject); - } - {//전체 - JSONObject statsObject = new JSONObject(); - JSONArray cntArray = new JSONArray(); - JSONArray dateArray = new JSONArray(); - for(StatsVO tempStatsVO : statsAllDayList){ - cntArray.add(tempStatsVO.getCnt()); - dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) ); - } - statsObject.put("cnt" , cntArray); - statsObject.put("date" , dateArray); - model.addAttribute("statsPcMobileDayList", statsObject); - } - } +// PaginationInfo paginationInfo = new PaginationInfo(); +// {//일일관리자 접속 리스트 +// LoginLog loginLog = new LoginLog(); +// paginationInfo.setCurrentPageNo(loginLog.getPageIndex()); +// paginationInfo.setRecordCountPerPage(loginLog.getPageUnit()); +// paginationInfo.setPageSize(loginLog.getPageSize()); +// +// loginLog.setFirstIndex(paginationInfo.getFirstRecordIndex()); +// loginLog.setLastIndex(paginationInfo.getLastRecordIndex()); +// loginLog.setRecordCountPerPage(10); //50개까지 보여주기 +// //if(null != loginVO){ loginLog.setSiteId(loginVO.getSiteId()); } +// List adminLogList = loginLogService.selectMainAmdinLog(loginLog); +// int adminLogListCnt = loginLogService.selectMainAmdinLogTotCnt(loginLog); +// paginationInfo.setTotalRecordCount(adminLogListCnt); +// model.addAttribute("paginationInfo", paginationInfo); +// model.addAttribute("adminLogList", adminLogList); +// } +// {// 최근 게시물 / 새개시물 카운트 +// //0번째 부터 6개의 항목만 조회 +// boardVO.setFirstIndex(0); +// boardVO.setRecordCountPerPage(5); +// // 최신날짜 우선순위 조회 +// boardVO.setSearchSortCnd("frstRegisterPnttm"); +// boardVO.setSearchSortOrd("desc"); +// List adminBoardList = bbsMngService.selectAdminMainBoard(boardVO); +// model.addAttribute("adminBoardList", adminBoardList); +// +// int adminMainNewBoardCnt = bbsMngService.selectAdminMainNewBoardCnt(boardVO); +// model.addAttribute("adminMainNewBoardCnt", adminMainNewBoardCnt); +// +// } +// {// 관리자 로그관리 리스트 +// LoginLog loginLog = new LoginLog(); +// //0번째 부터 6개의 항목만 조회 +// loginLog.setFirstIndex(0); +// loginLog.setRecordCountPerPage(6); +// // 최신날짜 우선순위 조회 +// loginLog.setSearchSortCnd("creatDt"); +// loginLog.setSearchSortOrd("desc"); +// List adminLogList = loginLogService.selectAmdinLog(loginLog); +// model.addAttribute("adminLogList", adminLogList); +// +// } +// {//신규가입회원 목록 +// UserDefaultVO userSearchVO = new UserDefaultVO(); +// +// //0번째 부터 4개의 항목만 조회 +// userSearchVO.setFirstIndex(0); +// userSearchVO.setRecordCountPerPage(4); +// +// // 가입일시 우선순위 조회 +// userSearchVO.setSearchSortCnd("sbscrbDe"); +// userSearchVO.setSearchSortOrd("desc"); +// +// userSearchVO.setAdminYn("N"); +// List userList = userManageService.selectUserList(userSearchVO); +// model.addAttribute("userList", userList); +// +// UserDefaultVO userCount = userManageService.selectUserCount(); +// model.addAttribute("userCount", userCount); +// } +// +// {//접속통계 사용자만 +// StatsVO statsVO = new StatsVO(); +// statsVO.setRecordCountPerPage(20); //일카운터(20개) +// statsVO.setFirstIndex(0); +// List statsDayList = conectStatsService.selectMainStatsDay(statsVO); //일일접속카운터(관리자) +// List statsMonthList = conectStatsService.selectMainStatsMonth(statsVO); //월별접속카운터(관리자) +// List statsYearList = conectStatsService.selectMainStatsYear(statsVO); //연도변접속카운터(관리자) +// {//일일통계 /* 연도없애기 */ +// JSONObject statsObject = new JSONObject(); +// JSONArray cntArray = new JSONArray(); +// JSONArray dateArray = new JSONArray(); +// for(StatsVO tempStatsVO : statsDayList){ +// cntArray.add(tempStatsVO.getCnt()); +// dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length())); +// } +// statsObject.put("cnt" , cntArray); +// statsObject.put("date" , dateArray); +// model.addAttribute("statsDayList", statsObject); +// } +// {//월통계 +// JSONObject statsObject = new JSONObject(); +// JSONArray cntArray = new JSONArray(); +// JSONArray dateArray = new JSONArray(); +// for(StatsVO tempStatsVO : statsMonthList){ +// cntArray.add(tempStatsVO.getCnt()); +// dateArray.add(tempStatsVO.getStatsDate()); +// } +// statsObject.put("cnt" , cntArray); +// statsObject.put("date" , dateArray); +// model.addAttribute("statsMonthList", statsObject); +// } +// {//년통계 +// JSONObject statsObject = new JSONObject(); +// JSONArray cntArray = new JSONArray(); +// JSONArray dateArray = new JSONArray(); +// cntArray.add(0); //데이터가 2018 한건만 조회 되어서 2017년도 0 넣어줌 +// dateArray.add("2017"); +// for(StatsVO tempStatsVO : statsYearList){ +// cntArray.add(tempStatsVO.getCnt()); +// dateArray.add(tempStatsVO.getStatsDate()); +// } +// statsObject.put("cnt" , cntArray); +// statsObject.put("date" , dateArray); +// model.addAttribute("statsYearList", statsObject); +// } +// +// //PC, 모바일 접속통계(주간) +// statsVO.setRecordCountPerPage(7); //일카운터(7일 : 일주일) +// statsVO.setFirstIndex(0); +// List statsPcDayList = conectStatsService.selectPcMainStatsDay(statsVO); //일일접속카운터(사용자) +// List statsMobileDayList = conectStatsService.selectMobileMainStatsDay(statsVO); //일일접속카운터(사용자) +// List statsAllDayList = conectStatsService.selectPcMobileMainStatsDay(statsVO); //모바일+PC(사용자) +// {//PC +// JSONObject statsObject = new JSONObject(); +// JSONArray cntArray = new JSONArray(); +// JSONArray dateArray = new JSONArray(); +// for(StatsVO tempStatsVO : statsPcDayList){ +// cntArray.add(tempStatsVO.getCnt()); +// dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) ); +// } +// statsObject.put("cnt" , cntArray); +// statsObject.put("date" , dateArray); +// model.addAttribute("statsPcDayList", statsObject); +// } +// {//모바일 +// JSONObject statsObject = new JSONObject(); +// JSONArray cntArray = new JSONArray(); +// JSONArray dateArray = new JSONArray(); +// for(StatsVO tempStatsVO : statsMobileDayList){ +// cntArray.add(tempStatsVO.getCnt()); +// dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) ); +// } +// statsObject.put("cnt" , cntArray); +// statsObject.put("date" , dateArray); +// model.addAttribute("statsMobileDayList", statsObject); +// } +// {//전체 +// JSONObject statsObject = new JSONObject(); +// JSONArray cntArray = new JSONArray(); +// JSONArray dateArray = new JSONArray(); +// for(StatsVO tempStatsVO : statsAllDayList){ +// cntArray.add(tempStatsVO.getCnt()); +// dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) ); +// } +// statsObject.put("cnt" , cntArray); +// statsObject.put("date" , dateArray); +// model.addAttribute("statsPcMobileDayList", statsObject); +// } +// } //조정 목록, 이번달 현황 조회(최근 접수, 진행 사건, 처리현황) PgrCmmVO cmmVO = new PgrCmmVO(); From 696263128c5fdc5d65f1d5d3cb35336e3ec4ac44 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 28 Dec 2022 09:32:41 +0900 Subject: [PATCH 03/22] =?UTF-8?q?refactor:=20=ED=8C=8C=EC=9D=BC=EC=97=85?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cmm/service/AdrInnorixFileEnumVO.java | 2 +- .../kcc/com/cmm/service/AdrInnorixFileVO.java | 9 + .../service/impl/InnorixFileServiceImpl.java | 5 +- .../com/cmm/web/InnorixFileController.java | 11 +- .../kccadr/adjPgrMgr/apm/popup/docRegPop.jsp | 136 ++------ .../adjPgrMgr/apm/popup/updtRpplPop.jsp | 297 ++++++------------ .../adjReqMgrPast/adjReqMgrPastFileRegist.jsp | 95 +++--- src/main/webapp/innorix/exam/upload.jsp | 29 +- ...{upload_test_220916.jsp => upload_ori.jsp} | 29 +- .../webapp/js/kccadr/adm/common/common.js | 2 + .../js/kccadr/adm/common/innorixCommon.js | 111 +++++++ 11 files changed, 322 insertions(+), 404 deletions(-) rename src/main/webapp/innorix/exam/{upload_test_220916.jsp => upload_ori.jsp} (77%) create mode 100644 src/main/webapp/js/kccadr/adm/common/innorixCommon.js diff --git a/src/main/java/kcc/com/cmm/service/AdrInnorixFileEnumVO.java b/src/main/java/kcc/com/cmm/service/AdrInnorixFileEnumVO.java index 371cf040..cd91c4e4 100644 --- a/src/main/java/kcc/com/cmm/service/AdrInnorixFileEnumVO.java +++ b/src/main/java/kcc/com/cmm/service/AdrInnorixFileEnumVO.java @@ -15,7 +15,7 @@ public enum AdrInnorixFileEnumVO { // history 값 private final String p_code_desc; - // history 값 + // history stat 값 private final String p_stat_cd; private final String p_adrHstryMgrSeq; private final String p_updateQuery; diff --git a/src/main/java/kcc/com/cmm/service/AdrInnorixFileVO.java b/src/main/java/kcc/com/cmm/service/AdrInnorixFileVO.java index e75b01e6..83354311 100644 --- a/src/main/java/kcc/com/cmm/service/AdrInnorixFileVO.java +++ b/src/main/java/kcc/com/cmm/service/AdrInnorixFileVO.java @@ -43,6 +43,7 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { public String openYn = ""; public String atchFileId = ""; public String mode = ""; + public String successMsg = ""; public boolean isAdrRpplDoc; /* @@ -225,6 +226,14 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { public void setAdrRpplDoc(boolean isAdrRpplDoc) { this.isAdrRpplDoc = isAdrRpplDoc; } + + public String getSuccessMsg() { + return successMsg; + } + + public void setSuccessMsg(String successMsg) { + this.successMsg = successMsg; + } diff --git a/src/main/java/kcc/com/cmm/service/impl/InnorixFileServiceImpl.java b/src/main/java/kcc/com/cmm/service/impl/InnorixFileServiceImpl.java index 2dc43ecf..67bb90be 100644 --- a/src/main/java/kcc/com/cmm/service/impl/InnorixFileServiceImpl.java +++ b/src/main/java/kcc/com/cmm/service/impl/InnorixFileServiceImpl.java @@ -109,7 +109,8 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); } - return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now()); + System.out.println("adrInnorixFileListVO :: "+ adrInnorixFileListVO.getSuccessMsg()); + return new RestResponse(HttpStatus.OK, adrInnorixFileListVO.getSuccessMsg(), adrInnorixFileListVO.getAtchFileId(),LocalDateTime.now()); } /** @@ -128,8 +129,6 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I List result = this.fileChange(innorixVO, atchFileId, 0); - - log.info(" // file data 반복문 끝 "); // 파일 업로드 fileManageDAO.insertFileInfs(result); diff --git a/src/main/java/kcc/com/cmm/web/InnorixFileController.java b/src/main/java/kcc/com/cmm/web/InnorixFileController.java index 7c7bdd80..5c0fbfca 100644 --- a/src/main/java/kcc/com/cmm/web/InnorixFileController.java +++ b/src/main/java/kcc/com/cmm/web/InnorixFileController.java @@ -44,7 +44,16 @@ public class InnorixFileController { @Resource(name = "InnorixFileService") protected InnorixFileService innorixService; - @RequestMapping(value = {"/kccadr/common/insertInnorixFileAjax.do"}, method = RequestMethod.POST) + /** + * @methodName : insertInnorixFileAjax + * @author : 이호영 + * @date : 2022.12.26 + * @description : 파일등록 외에 rpplDoc 과 history 관련 Controller + * @param adrInnorixFileVO + * @return + * @throws Exception + */ + @RequestMapping(value = {"/kccadr/common/insertInnorixFileAndRpplAjax.do"}, method = RequestMethod.POST) public ResponseEntity insertInnorixFileAjax(@RequestBody AdrInnorixFileVO adrInnorixFileVO) throws Exception { //로그인 권한정보 불러오기 diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp index 3bda36b7..52c0df26 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp @@ -26,6 +26,7 @@ + @@ -225,60 +226,21 @@ //등록 버튼 function fncReg() { - var f = document.getElementById("listForm"); - var data = new FormData(f); - _fileForm2.forEach(function(obj, idx) { - if (obj) - data.append("file" + idx, obj.fileObj); - }); if (validation()) { if(confirm("사건문서를 등록 하시겠습니까?")){ - if(control.getUploadFiles().length > 0){ - var postObj = new Object(); postObj.innoDirPath = $('#innoDirPath').val(); control.setPostData(postObj); // 업로드시 함께 전달될 POST Param 추가 control.upload(); // 업로드 시작 - }else{ - alert("등록된 첨부파일이 없습니다."); return false; - } - -// $.ajax({ -// type : "POST", -// enctype : 'multipart/form-data', -// url : "/kccadr/adjPgrMgr/apm/docRegPopAjax.do", -// data : data, -// dataType : 'json', -// async : false, -// processData : false, -// contentType : false, -// cache : false, -// success : function(returnData, status) { -// if (returnData.result == 'success') { -// alert("사건문서 제출이 완료되었습니다."); -// opener.location.reload(true); -// self.close(); -// } else { -// alert(returnData.message); -// } - -// }, -// error : function(e) { -// alert("사건문서 제출에 실패하였습니다."); -// console.log("ERROR : ", e); -// } -// }); } - } - } // 파일 업로드 솔루션 init 셋팅 @@ -289,15 +251,14 @@ el: '#fileControl' // 컨트롤 출력 HTML 객체 ID , transferMode: 'both' // 업로드, 다운로드 혼합사용 , installUrl: '/innorix/install/install.html' // Agent 설치 페이지 - , uploadUrl: '/innorix/exam/upload_test_220916.jsp' // 업로드 URL + , uploadUrl: '/innorix/exam/upload.jsp' // 업로드 URL , height:80 , width: 635 }); // 업로드 완료 이벤트 control.on('uploadComplete', function (p) { - fn_insertFile(p.files); // 파일 정보 DB isnert function - control.removeAllFiles(); // control 초기화 + fn_callBackInnorix(p.files); // 파일 정보 DB isnert function }); }; @@ -305,12 +266,14 @@ /* * 파일 정보 DB insert Ajax * */ - function fn_insertFile(data){ + function fn_callBackInnorix(data){ + + var url = ""; var filePath = location.pathname; var jspFileName = filePath.substring(filePath.lastIndexOf("/")+1, filePath.lastIndexOf(".")); - - var resultData = { + + var sendData = { "adrSeq": $('#adrSeq').val() , "adrSn": $('#adrSn').val() , "adrDocTy": $('#adrDocTy').val() @@ -319,37 +282,19 @@ , "openYn": $('#openYn').val() , "jspFileName": jspFileName , "innorixFileListVO": data + , "successMsg" : "사건문서 제출이 완료되었습니다." } - - console.log('resultData :: ', resultData); - $.ajax({ - type: "POST", - url: "", - data: JSON.stringify(resultData), - dataType:'json', - async: false, - processData: false, - contentType: "application/json", - cache: false, - success: function (returnData) { - if(returnData.status == "OK"){ - alert("사건문서 제출이 완료되었습니다."); - opener.location.reload(true); - self.close(); - }else{ - alert(returnData.data); - return false; - } - }, - error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } - }); - + /* + * 공통 : innorixCommon.js + * fn_insertInnorixFileAndRpplAjax() 호출 후 status가 성공(OK)이면 실행 + */ + if(fn_insertInnorixFileAndRpplAjax(sendData, url) == "OK") + { + opener.location.reload(true); + self.close(); + } } - - - - 사건관련문서 등록 diff --git a/src/main/webapp/innorix/exam/upload.jsp b/src/main/webapp/innorix/exam/upload.jsp index 65dffe30..dd898bf4 100644 --- a/src/main/webapp/innorix/exam/upload.jsp +++ b/src/main/webapp/innorix/exam/upload.jsp @@ -1,15 +1,18 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page import="com.innorix.transfer.InnorixUpload" %> - +<%-- <%@ page import="egovframework.rte.fdl.property.EgovPropertyService" %> --%> <% // CORS체크를 위한 OPTIONS 메소드가 들어오므로 POST 일 경우에만 동작하도록 조건 추가 if (request.getMethod().equals("POST")) { String directory = InnorixUpload.getServletAbsolutePath(request); - System.out.println("========== directory :: " + directory + " =========="); - directory = directory.substring(0, directory.lastIndexOf("/") + 1) + "data"; +// directory = directory.substring(0, directory.lastIndexOf("/") + 1) + "data"; +// directory = PropertyService.getString("Globals.fileStorePath"); + directory = "/usr/local/tomcat/file/sht/"; int maxPostSize = 2147482624; // bytes + + InnorixUpload uploader = new InnorixUpload(request, response, maxPostSize, directory); /* @@ -32,6 +35,26 @@ if (request.getMethod().equals("POST")) String _type = uploader.getParameter("type"); // 커스텀 정의 POST Param 1 String _part = uploader.getParameter("part"); // 커스텀 정의 POST Param 2 String _transferId = uploader.getParameter("_transferId"); // TransferId + String _innoFilePath = uploader.getParameter("innoDirPath"); // 커스텀 정의 POST Param 2 + + /* + + 현재 페이지를 호출하는 jsp에서 + " /> + 위 코드를 작성하고 + + control.upload() 전에 + + + var postObj = new Object(); + postObj.innoDirPath = $('#innoDirPath').val(); + control.setPostData(postObj); // 업로드시 함께 전달될 POST Param 추가 + + 위 코드를 넣어 줘야 함 + + */ + uploader.setDirectory(_innoFilePath); + String _run_retval = uploader.run(); // 개별파일 업로드 완료 diff --git a/src/main/webapp/innorix/exam/upload_test_220916.jsp b/src/main/webapp/innorix/exam/upload_ori.jsp similarity index 77% rename from src/main/webapp/innorix/exam/upload_test_220916.jsp rename to src/main/webapp/innorix/exam/upload_ori.jsp index dd898bf4..65dffe30 100644 --- a/src/main/webapp/innorix/exam/upload_test_220916.jsp +++ b/src/main/webapp/innorix/exam/upload_ori.jsp @@ -1,18 +1,15 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page import="com.innorix.transfer.InnorixUpload" %> -<%-- <%@ page import="egovframework.rte.fdl.property.EgovPropertyService" %> --%> + <% // CORS체크를 위한 OPTIONS 메소드가 들어오므로 POST 일 경우에만 동작하도록 조건 추가 if (request.getMethod().equals("POST")) { String directory = InnorixUpload.getServletAbsolutePath(request); -// directory = directory.substring(0, directory.lastIndexOf("/") + 1) + "data"; -// directory = PropertyService.getString("Globals.fileStorePath"); - directory = "/usr/local/tomcat/file/sht/"; + System.out.println("========== directory :: " + directory + " =========="); + directory = directory.substring(0, directory.lastIndexOf("/") + 1) + "data"; int maxPostSize = 2147482624; // bytes - - InnorixUpload uploader = new InnorixUpload(request, response, maxPostSize, directory); /* @@ -35,26 +32,6 @@ if (request.getMethod().equals("POST")) String _type = uploader.getParameter("type"); // 커스텀 정의 POST Param 1 String _part = uploader.getParameter("part"); // 커스텀 정의 POST Param 2 String _transferId = uploader.getParameter("_transferId"); // TransferId - String _innoFilePath = uploader.getParameter("innoDirPath"); // 커스텀 정의 POST Param 2 - - /* - - 현재 페이지를 호출하는 jsp에서 - " /> - 위 코드를 작성하고 - - control.upload() 전에 - - - var postObj = new Object(); - postObj.innoDirPath = $('#innoDirPath').val(); - control.setPostData(postObj); // 업로드시 함께 전달될 POST Param 추가 - - 위 코드를 넣어 줘야 함 - - */ - uploader.setDirectory(_innoFilePath); - String _run_retval = uploader.run(); // 개별파일 업로드 완료 diff --git a/src/main/webapp/js/kccadr/adm/common/common.js b/src/main/webapp/js/kccadr/adm/common/common.js index 66af5970..d7b1bafb 100644 --- a/src/main/webapp/js/kccadr/adm/common/common.js +++ b/src/main/webapp/js/kccadr/adm/common/common.js @@ -29,4 +29,6 @@ function openExampleAdminPop(exmpCd) { // commonPopWindowopenForm("/web/kccadr/adjst/popup/"+uri, '500', '400', "openExampleAdminPop", $('#pop')); commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/"+uri, '600', '400', "openExampleAdminPop", $('#pop')); + + fn_data_reg(atchfileId); } diff --git a/src/main/webapp/js/kccadr/adm/common/innorixCommon.js b/src/main/webapp/js/kccadr/adm/common/innorixCommon.js new file mode 100644 index 00000000..1bfb4ed8 --- /dev/null +++ b/src/main/webapp/js/kccadr/adm/common/innorixCommon.js @@ -0,0 +1,111 @@ +/** + * + * @author : 이호영 + * @fileName : InnorixCommon.js + * @date : 2022.12.26 + * @description : innorix 대용량 파일 업로드 솔루션 공통 js + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- * + * 2022.11.01 이호영 최초 생성 + * + * + * + */ + + +var innoJquery = innorix._load("innoJquery"); + +var urlBase = location.href.substring(0, location.href.lastIndexOf("/") + 1); +var control = new Object(); // 파일전송 컨트롤 객체선언 +var downFileArr = new Array(); // 다운로드 목록 정보 +var resetFileArr = new Array(); // 다운로드 목록 초기화 정보 +var delFileArr = new Array(); // 삭제된 파일 정보 +var removeFlag = true; // 삭제 이벤트 조건 플래그 + +function fn_insertInnorixFileAndRpplAjax(sendData, url){ + + var successData; + + $.ajax({ + type: "POST", + url: url, + data: JSON.stringify(sendData), + dataType:'json', + async: false, + processData: false, + contentType: "application/json", + cache: false, + success: function (returnData) { + console.log('returnData : ', returnData); + if(returnData.status == "OK"){ + if(returnData.data != "") + alert(returnData.data); + successData = returnData.status; + }else{ + alert(returnData.data); + return false; + } + }, + error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } + }); + return successData; + + +} + +/* 등록되어 있는 파일 삭제버튼 클릭시 */ +function innorixDelAtchFile(itemId , fileSn){ + + $.ajax({ + type: "POST", + url: "/uss/ion/fms/fmsfileDeleteAjax.do", + data:{ "atchFileId" : itemId , "fileSn" : fileSn}, + dataType:'json', + cache: false, + async: false, + timeout: 600000, + success: function (returnData, status) { + if(status == 'success'){ + if(returnData.result == 'fail'){ + alert("삭제처리가 실패하였습니다."); + }else if(returnData.result == 'auth_fail'){ + alert("세션이 종료되었습니다."); + }else if(returnData.result =='success'){ + alert("삭제되었습니다."); + } + }else{ + alert("삭제처리에 실패하였습니다."); + } + }, + error: function (e) { + console.log("ERROR : ", e); + alert("삭제처리에 실패하였습니다."); + } + }); +} + +/* +* loadComplete에서 불러온 최초 파일 array에서 +* 삭제된 파일 정보 삭제 +*/ +function deleteFromResetFileArr(value) { + + $(resetFileArr).each(function(index, element){ + if(element.printFileName === value) + resetFileArr.splice(index, 1); + }); +} + +/* +* 파일 삭제 confire 아니요 클릭 시 +* 솔루션에서 진행하는 자동 파일 삭제 후 +* reset을 통해 파일 배열 다시 불러옴 +*/ +function fileListReset() { + removeFlag = false; + delFileArr = new Array(); // 삭제정보 초기화 + control.removeAllFiles(); // 리스트 컨트롤에서 파일을 삭제 + control.presetDownloadFiles(resetFileArr); // 다운로드 목록 초기화 +} + From dabdcb34cd86e675b57c4ea841cca5c381c5c789 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 28 Dec 2022 09:39:01 +0900 Subject: [PATCH 04/22] =?UTF-8?q?refactor:=20src/main/webapp/js/kccadr/inn?= =?UTF-8?q?orixCommon.js=20=EC=9C=84=EC=B9=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp | 2 +- .../WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop.jsp | 2 +- .../jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp | 2 +- src/main/webapp/js/kccadr/{adm/common => }/innorixCommon.js | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename src/main/webapp/js/kccadr/{adm/common => }/innorixCommon.js (100%) diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp index 52c0df26..3993789d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp @@ -26,7 +26,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop.jsp index 7bfe4086..cb6c61be 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop.jsp @@ -50,7 +50,7 @@ $(document).ready(function(){ - + <%-- 원자력 --%> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp index 622b70ff..8a0d2b84 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp @@ -29,7 +29,7 @@ - + + + + + + + + @@ -331,6 +403,7 @@ function wrapWindowByMask(){ +" />
@@ -500,74 +573,10 @@ function wrapWindowByMask(){ 서명이미지 - - -
- - - - - - - - - - - - - - - - - - - -
파일 명종류크기삭제
-

첨부하실 파일을 마우스로 끌어서 넣어주세요.

-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - -
파일 명종류크기삭제
- - - - "> - - "> - - -
-
+ + +

* 첨부파일을 등록해 주세요. (최대3개)

+

@@ -578,7 +587,7 @@ function wrapWindowByMask(){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert_ing.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert_ing.jsp new file mode 100644 index 00000000..99199d85 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert_ing.jsp @@ -0,0 +1,653 @@ +<%-- + Class Name : EgovUserInsert.jsp + Description : 사용자등록View JSP + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2009.03.03 JJY 최초 생성 + 2011.08.31 JJY 경량환경 버전 생성 + + author : 공통서비스 개발팀 JJY + since : 2009.03.03 +--%> +<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> + + + + +" /> + +
+
+ + +
+

관리자등록

+
    +
    • +
  • +

    관리자관리

    +
    • +
  • +

    관리자관리

    +
    • +
  • 관리자등록
    • +
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + <%-- + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + +
사이트명 + +
관리자아이디 + + + + + + +
비밀번호 + + +
+ + 비밀번호 문자 + 숫자 + 특수 문자 포함, 최소 8~20자리 + +
비밀번호확인 + +
로그인 유형 +
+ +
+
이름 + + +
권한 + +
직책 + + + + + +
부서 + +
전화번호 + + +
팩스번호 + + +
담당업무 + + +
이메일주소 + + +
서명이미지 + + +

* 첨부파일을 등록해 주세요. (최대3개)

+

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

아이디 중복 확인

+ +
+
+

+

+ 사용할 아이디 +
+
+
+ 중복확인을 실행하십시오 +
+ +

+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp index 3993789d..45ce1bf4 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp @@ -287,9 +287,9 @@ /* * 공통 : innorixCommon.js - * fn_insertInnorixFileAndRpplAjax() 호출 후 status가 성공(OK)이면 실행 + * fn_innorixCmmAjax() 호출 후 status가 성공(OK)이면 실행 */ - if(fn_insertInnorixFileAndRpplAjax(sendData, url) == "OK") + if(fn_innorixCmmAjax(sendData, url) == "OK") { opener.location.reload(true); self.close(); @@ -361,13 +361,8 @@ -

* 첨부파일을 등록해 주세요. (최대3개)

- -

- - diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop.jsp index cb6c61be..e25b291c 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop.jsp @@ -56,8 +56,7 @@ $(document).ready(function(){ <%-- 원자력 --%> + + - - + + + + " />
@@ -145,72 +207,10 @@ $( document ).ready(function(){ 첨부파일 - - -
- - - - - - - - - - - - - - - - - - - -
파일 명종류크기삭제
-

첨부하실 파일을 마우스로 끌어서 넣어주세요.

-
-
-
- - - - - - - - - - - - - - - - - - - - - <%-- --%> - - - - -
파일 명종류크기삭제
- ${fileList.orignlFileNm} - - "> - - "> - - -
-
+ + +

* 첨부파일을 등록해 주세요. (최대3개)

+

@@ -221,7 +221,7 @@ $( document ).ready(function(){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp index 8a0d2b84..18f53fe9 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp @@ -130,9 +130,9 @@ function fn_callBackInnorix(data){ /* * 공통 : innorixCommon.js - * fn_insertInnorixFileAndRpplAjax() 호출 후 status가 성공(OK)이면 실행 + * fn_innorixCmmAjax() 호출 후 status가 성공(OK)이면 실행 */ - if(fn_insertInnorixFileAndRpplAjax(sendData, url) == "OK") + if(fn_innorixCmmAjax(sendData, url) == "OK") { fn_selectFileList(); // 파일 정보 list select function fn_initFileRegForm(); diff --git a/src/main/webapp/js/kccadr/innorixCommon.js b/src/main/webapp/js/kccadr/innorixCommon.js index 1bfb4ed8..7dc8314b 100644 --- a/src/main/webapp/js/kccadr/innorixCommon.js +++ b/src/main/webapp/js/kccadr/innorixCommon.js @@ -14,8 +14,6 @@ */ -var innoJquery = innorix._load("innoJquery"); - var urlBase = location.href.substring(0, location.href.lastIndexOf("/") + 1); var control = new Object(); // 파일전송 컨트롤 객체선언 var downFileArr = new Array(); // 다운로드 목록 정보 @@ -23,7 +21,7 @@ var resetFileArr = new Array(); // 다운로드 목록 초기화 정보 var delFileArr = new Array(); // 삭제된 파일 정보 var removeFlag = true; // 삭제 이벤트 조건 플래그 -function fn_insertInnorixFileAndRpplAjax(sendData, url){ +function fn_innorixCmmAjax(sendData, url){ var successData; @@ -39,6 +37,7 @@ function fn_insertInnorixFileAndRpplAjax(sendData, url){ success: function (returnData) { console.log('returnData : ', returnData); if(returnData.status == "OK"){ + $('#atchFileId').val(returnData.dataSub); if(returnData.data != "") alert(returnData.data); successData = returnData.status; From 543d974d03e0735754c55f58ce11033c10e6f7f8 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 2 Jan 2023 12:52:07 +0900 Subject: [PATCH 08/22] =?UTF-8?q?refactor:stearm=20docs=20=EC=8B=A4=20?= =?UTF-8?q?=EC=84=9C=EB=B2=84=20url=20=EC=9E=85=EB=A0=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/egovframework/egovProps/globals_svr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index 1127ba14..86692b05 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -203,7 +203,7 @@ Globals.pay.siteDomain=https://adr.copyright.or.kr/web/kccadr/payment/inipay Globals.MagicDB.PolicyName=POLICY001 #Streamdocs \ub4f1\ub85d URL -Globals.Streamdocs.Url= +Globals.Streamdocs.Url=http://192.168.39.144:8080/streamdocs/v4/documents # \uce74\uce74\uc624\uc54c\ub9bc\ud1a1(\ube44\uc988\ubfcc\ub9ac\uc624) API URL #\uac1c\ubc1c\uc11c\ubc84 From f514e6781daf8bf86381546395516554f718f11b Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 2 Jan 2023 16:16:06 +0900 Subject: [PATCH 09/22] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20?= =?UTF-8?q?=EC=98=A4=EC=A6=88=EC=8A=A4=EC=BC=80=EC=A5=B4=EB=9F=AC=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java | 3 ++- .../egovframework/egovProps/globals_local.properties | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java b/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java index ddba5751..7573974f 100644 --- a/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java +++ b/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java @@ -195,7 +195,8 @@ public class OzSchdExportUtil { if(p_devServerCheckString.indexOf(p_serverNm)>-1) { System.out.println(p_islocal + "환경입니다.-inner"); //저장파일 경로 - dev 서버의 경우는 oz report가linux 서버에서 작동되어 하기와 같이 경로 설정해야함(IP 불필요) - savePath = p_ozDevPath + "/" + p_adrSeq + "/ozFile/" + p_savePdfFileName; + savePath = "\\" + p_ozDevPath + "\\" + p_adrSeq + "\\ozFile\\" + p_savePdfFileName; +// savePath = p_ozDevPath + "/" + p_adrSeq + "/ozFile/" + p_savePdfFileName; //savePath = p_ozDevPath + "\\" + p_adrSeq + "\\" + p_savePdfFileName; //savePath = p_ozDevPath + "/" + p_savePdfFileName; diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 508724b5..dcc0af44 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -182,9 +182,11 @@ Globals.prod.islocal=local Globals.ozFontPath=/home/oz80/fontTestDir/ #oz \uac1c\ubc1c\uc11c\ubc84IP & \uc800\uc7a5\uacbd\ub85c -\uc2e4\uc11c\ubc84IP\ub294 \ud558\ub4dc\ucf54\ub529\ucc98\ub9ac Globals.oz.devServerIp=192.168.0.176:8091 -Globals.oz.devSchedulerIp=192.168.0.176 +#Globals.oz.devSchedulerIp=192.168.0.176 +Globals.oz.devSchedulerIp=192.168.0.200 #scheduler \uc11c\ubc84\uc5d0 \uc0dd\uc131\ub418\ub294 \uacbd\ub85c \uc785\ub2c8\ub2e4. -Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data/out +#Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data/out +Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 From fc14e5ab070a0366c0dc08e12bb59f19bf5aa7f8 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 2 Jan 2023 16:25:40 +0900 Subject: [PATCH 10/22] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=20-=20=EC=8A=A4=EC=BC=80?= =?UTF-8?q?=EC=A5=B4=EB=9F=AC=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/egovframework/egovProps/globals_dev.properties | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index a0ebcb55..32bed20e 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -175,8 +175,9 @@ Globals.prod.islocal=local Globals.ozFontPath=/home/oz80/fontTestDir/ #oz \uac1c\ubc1c\uc11c\ubc84IP & \uc800\uc7a5\uacbd\ub85c -\uc2e4\uc11c\ubc84IP\ub294 \ud558\ub4dc\ucf54\ub529\ucc98\ub9ac Globals.oz.devServerIp=192.168.0.176:8091 -Globals.oz.devSchedulerIp=192.168.0.176 -Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data +Globals.oz.devSchedulerIp=192.168.0.200 +#Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data +Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 From 7adc146ac510f777ffa0ed2f6f1f601e004e7f2f Mon Sep 17 00:00:00 2001 From: tolag3 Date: Thu, 12 Jan 2023 18:09:04 +0900 Subject: [PATCH 11/22] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20?= =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20url=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=20-=20pdf=20=EB=B3=80=ED=99=98=EC=86=94?= =?UTF-8?q?=EB=A3=A8=EC=85=98=20=ED=8C=8C=EC=9D=BC=EC=9D=B4=20=EC=97=86?= =?UTF-8?q?=EC=9D=84=EA=B2=BD=EC=9A=B0=20=EC=97=90=EB=9F=AC=EB=B0=9C?= =?UTF-8?q?=EC=83=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/kccadr/cmm/KccadrPdfConversion.java | 68 ++++++++++--------- .../let/uat/uia/web/EgovLoginController.java | 4 +- 2 files changed, 38 insertions(+), 34 deletions(-) diff --git a/src/main/java/kcc/kccadr/cmm/KccadrPdfConversion.java b/src/main/java/kcc/kccadr/cmm/KccadrPdfConversion.java index ddd5fa7d..5de09128 100644 --- a/src/main/java/kcc/kccadr/cmm/KccadrPdfConversion.java +++ b/src/main/java/kcc/kccadr/cmm/KccadrPdfConversion.java @@ -1080,38 +1080,42 @@ public class KccadrPdfConversion extends EgovAbstractServiceImpl { for(AdjstReqStatusVO tmpAdjstReqStatusVO : adrFileList) { if(!"0".equals(tmpAdjstReqStatusVO.getAdrDocCn2())) { - conversionNo++; //변환 후 파일명 순번 - - //step1.파일위치 변경 - //sht => out/adrseq - FileVO fileVO = new FileVO(); - fileVO.setAtchFileId(tmpAdjstReqStatusVO.getAtchFileId()); - fileVO.setFileSn(tmpAdjstReqStatusVO.getFileSn()); - - FileVO nfile = p_egovFileMngService.selectFileInf(fileVO); - - //step1.copy and rename - String s_src_file_name = nfile.streFileNm; - String oriFileName = nfile.orignlFileNm; - String fileExt = nfile.fileExtsn; - //pdf 변환솔루션에서 변환가능 확장자 - //pdf, ppt, pptx, xls, xlsx, doc, docx, docm, dotx, txt, hwp, hwpx, jpg, jpe, jpeg, gif, png, bmp - String possibleExt = "PDF,PPT,PPTX,XLS,XLSX,DOC,DOCX,DOCM,DOTX,TXT,HWP,HWPX,JPG,JPE,JPEG,GIF,PNG,BMP"; - - if(possibleExt.contains(fileExt.toUpperCase())) - { - File tmpSrcFile = new File(pdfMakepath + s_src_file_name); - File tmpDestFile = new File(conversionBeforeUri + conversionNo + "." + fileExt); - FileUtils.copyFile(tmpSrcFile, tmpDestFile); - - map = new HashMap(); - map.put("INURI", pdfFilepathOut + p_adrSeq + "/conversionbefore/" + conversionNo + "." + fileExt); // 변환대상 파일 - map.put("OUTURI", conversionPdfUri+"conversionAfter_"+ Integer.toString(conversionNo) + ".pdf"); // 변환후 파일 - map.put("ISWEB", "0"); // 웹문서 여부 - map.put("ISEXIST", "0"); // 기존 PDF파일 존재 여부 => 기존파일일경우 INURI, OUTURI 동일 - map.put("BOOKMARKNAME", oriFileName); // 북마크에 삽입될 실제 파일명 - mapList.add(map); - } + try { + conversionNo++; //변환 후 파일명 순번 + + //step1.파일위치 변경 + //sht => out/adrseq + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(tmpAdjstReqStatusVO.getAtchFileId()); + fileVO.setFileSn(tmpAdjstReqStatusVO.getFileSn()); + + FileVO nfile = p_egovFileMngService.selectFileInf(fileVO); + + //step1.copy and rename + String s_src_file_name = nfile.streFileNm; + String oriFileName = nfile.orignlFileNm; + String fileExt = nfile.fileExtsn; + //pdf 변환솔루션에서 변환가능 확장자 + //pdf, ppt, pptx, xls, xlsx, doc, docx, docm, dotx, txt, hwp, hwpx, jpg, jpe, jpeg, gif, png, bmp + String possibleExt = "PDF,PPT,PPTX,XLS,XLSX,DOC,DOCX,DOCM,DOTX,TXT,HWP,HWPX,JPG,JPE,JPEG,GIF,PNG,BMP"; + + if(possibleExt.contains(fileExt.toUpperCase())) + { + File tmpSrcFile = new File(pdfMakepath + s_src_file_name); + File tmpDestFile = new File(conversionBeforeUri + conversionNo + "." + fileExt); + FileUtils.copyFile(tmpSrcFile, tmpDestFile); + + map = new HashMap(); + map.put("INURI", pdfFilepathOut + p_adrSeq + "/conversionbefore/" + conversionNo + "." + fileExt); // 변환대상 파일 + map.put("OUTURI", conversionPdfUri+"conversionAfter_"+ Integer.toString(conversionNo) + ".pdf"); // 변환후 파일 + map.put("ISWEB", "0"); // 웹문서 여부 + map.put("ISEXIST", "0"); // 기존 PDF파일 존재 여부 => 기존파일일경우 INURI, OUTURI 동일 + map.put("BOOKMARKNAME", oriFileName); // 북마크에 삽입될 실제 파일명 + mapList.add(map); + } + } catch (Exception e) { + System.out.println("atchFile Exception!!!!!!!!!!!"); + } } } diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index 5b9e3a87..ff0e3cb2 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -398,8 +398,8 @@ public class EgovLoginController { LOGGER.debug("@ prod @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@Start"); //sMSOracleService.selectOracleTest(); // 연동 테스트. 콘솔 로그 확인 AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO(); - sMSOracleService.insertSmsSend(adjReqMgrVO); -// sMSOracleService.insertSmsSendTest(); +// sMSOracleService.insertSmsSend(adjReqMgrVO); + sMSOracleService.insertSmsSendTest(); LOGGER.debug("@ prod @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@End"); //} // From ceb503bf1ac3bd152a3c29182aea315fa42b2652 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 16 Jan 2023 17:28:02 +0900 Subject: [PATCH 12/22] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20Magic?= =?UTF-8?q?DB(DB=EC=95=94=ED=98=B8=ED=99=94=EC=86=94=EB=A3=A8=EC=85=98)=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EC=84=BC=EC=8A=A4=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=EB=B0=8F=20=EC=A0=95=EC=B1=85=EC=84=9C=EB=B2=84=20=EC=9D=B4?= =?UTF-8?q?=EC=A4=91=ED=99=94=20=EC=98=B5=EC=85=98=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=20-=20globals=5Fsvr.properties=20(=EC=8B=A4=EC=84=9C=EB=B2=84)?= =?UTF-8?q?=EC=98=A4=EC=A6=88=20=EC=8A=A4=EC=BC=80=EC=A5=B4=EB=9F=AC=20NAS?= =?UTF-8?q?=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95=20=20=09-=20192.168.?= =?UTF-8?q?39.125=20=3D>=20192.168.39.130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kcc/com/cmm/util/MagicDBAPIUtil.java | 4 +- .../egovProps/globals_svr.properties | 3 +- src/main/webapp/WEB-INF/lib/MagicDB.conf | 71 ++++++++++--------- src/main/webapp/WEB-INF/lib/jcaos.lic | 2 +- 4 files changed, 41 insertions(+), 39 deletions(-) diff --git a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java index d7c31738..0b11510f 100644 --- a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java +++ b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java @@ -34,8 +34,8 @@ public final class MagicDBAPIUtil { } public static String encryptOnlyOneString(String stringVal) { -// return MagicDBAPI.encrypt(POLICY_NAME, stringVal); - return stringVal; + return MagicDBAPI.encrypt(POLICY_NAME, stringVal); +// return stringVal; } public static String decryptOnlyOneString(String stringVal) { diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index 86692b05..8764a7ca 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -179,7 +179,8 @@ Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 -Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out +#Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out +Globals.oz.realPdfSavePath=\\192.168.39.130\\data\\out #\uc2e4\uc11c\ubc84 Globals.ozFontPath=/home/oz80/fontTestDir/ diff --git a/src/main/webapp/WEB-INF/lib/MagicDB.conf b/src/main/webapp/WEB-INF/lib/MagicDB.conf index 4e2c4b08..2b8ccfc2 100644 --- a/src/main/webapp/WEB-INF/lib/MagicDB.conf +++ b/src/main/webapp/WEB-INF/lib/MagicDB.conf @@ -1,35 +1,36 @@ -#------------------------------------------------ -# MagicDB Module Configuration File -#------------------------------------------------ -[GLOBAL] -ID = plugin -PWD = kRg/dHemliWHkzyLwAX1Zw== -LOG = false -LOGFILEPATH = /usr/local/MagicDB/logs -LOGFILENAME = MagicDB - -# 0 : DEBUG ,1 : INFO ,2 : ERROR ,3 : WARN -LOG_LEVEL = 2 -SERVER_NUM = 1 -IP01 = 192.168.0.176 -PORT01 = 51001 -#IP02 = 127.0.0.1 -#PORT02 = 51001 - -#LOGPROPERTIES=D:/workspace/MDBMigrationCubrid/lib/log4j.properties - -# HMAC -#32bit APP_HASH = uGDvAIA8roDOBAmiPlb0hLbn0k6q63AqREVDHb2+nfs= -#64bit APP_HASH = rspNT+R+iOUAyO4UKWk/iMAa2CJrSUh+0jBhT2mWHIE= -APP_HASH = rspNT+R+iOUAyO4UKWk/iMAa2CJrSUh+0jBhT2mWHIE= -APP_PATH = /home/oracle/MagicDB/lib/libMagicDB.so - -KCMV_MODE = false - -LICENSE = /usr/local/MagicDB/conf/CAOSLib_MagicDB.lic - -ACC_IGNORE = true - -#FILE_POLICY = false -#FILE_POLICY_NUM = 1 -#FILE_POLICY_NAME01 = D:\MagicDBAPI\bin\MAGICDB_POLICY.dat +#------------------------------------------------ +# MagicDB Module Configuration File +#------------------------------------------------ +[GLOBAL] +ID = plugin +PWD = kRg/dHemliWHkzyLwAX1Zw== +LOG = false +LOGFILEPATH = /usr/local/MagicDB/logs +LOGFILENAME = MagicDB + +# 0 : DEBUG ,1 : INFO ,2 : ERROR ,3 : WARN +LOG_LEVEL = 2 +SERVER_NUM = 2 +IP01 = 192.168.39.185 +PORT01 = 51001 +IP02 = 192.168.39.186 +PORT02 = 51001 + +#LOGPROPERTIES=D:/workspace/MDBMigrationCubrid/lib/log4j.properties + +# ��� HMAC �� +#32bit APP_HASH = uGDvAIA8roDOBAmiPlb0hLbn0k6q63AqREVDHb2+nfs= +#64bit APP_HASH = rspNT+R+iOUAyO4UKWk/iMAa2CJrSUh+0jBhT2mWHIE= +APP_HASH = rspNT+R+iOUAyO4UKWk/iMAa2CJrSUh+0jBhT2mWHIE= +APP_PATH = /home/oracle/MagicDB/lib/libMagicDB.so + +KCMV_MODE = false + +#LICENSE = /usr/local/MagicDB/conf/CAOSLib_MagicDB.lic +LICENSE = /usr/local/MagicDB/conf/jcaos.lic + +ACC_IGNORE = true + +#FILE_POLICY = false +#FILE_POLICY_NUM = 1 +#FILE_POLICY_NAME01 = D:\MagicDBAPI\bin\MAGICDB_POLICY.dat diff --git a/src/main/webapp/WEB-INF/lib/jcaos.lic b/src/main/webapp/WEB-INF/lib/jcaos.lic index e48cfa2c..20b84796 100644 --- a/src/main/webapp/WEB-INF/lib/jcaos.lic +++ b/src/main/webapp/WEB-INF/lib/jcaos.lic @@ -1 +1 @@ -MIHHBAEzBAVKQ0FPUwQQx9GxucD6wNuxx8Cnv/jIuAQWSlRLVC0wMDAwMC0yMjA5MTMtMDI0MQQABAAECjIwMjMtMDEtMTAEgYA0ODc4RDA3N0RFRUI3MkQzMkIyNzgxNjkyMEYxRTE2MDgzNTdFQTBEOEYyODA4RTVBMTQ4NjUyNjI1MEJCQzdGMjA0ODVENTlBOTZBNzA2NUU4MEM3RUVFMkMwQjg1RjU2Qjk3NTY3QzdEMjREMUIyMjBFNzdFQjFFOUI3NzE1Qw== \ No newline at end of file +MIIBDwQBMwQFSkNBT1MEEMfRsbnA+sDbscfAp7/4yLgEFkpUS1MtMDAwMDAtMjIxMTI5LTAzMjQwCAQABAAEAAQAMD4EDTIyMi4yMzEuNDMuNjYEDTIyMi4yMzEuNDMuNjkEDjE5Mi4xNjguMzkuMTg1BA4xOTIuMTY4LjM5LjE4NgQABIGAOTYyNjk5QkQ2RUNCOEIwNjg4MEFGMTA4NUZCN0Q4OTYwNEMxRTE4MDhBODIyQ0UzMDIxQjQxRjhEQ0ExMDVDRENCMDAwMDJBMUY5NjE2QUU5OUQ5MTgyRTQwOEI1RUQzQzFCMzQ4NUIxQTVCNzc2QzdGRERDNDdDRTU2QjIxOTCiCjAIBAAEAAQABAA= \ No newline at end of file From 72c209e92d4056e58986de702e9fdba52c0fdb4d Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 17 Jan 2023 11:08:37 +0900 Subject: [PATCH 13/22] =?UTF-8?q?refactor:=EC=A3=BC=EC=84=9D=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 3b5942e9..7580a5b8 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -137,7 +137,7 @@ public class AdjReqMgrPastController { int reqPerTotCnt = 0; if(StringUtils.isNotBlank(adjReqMgrPastVO.getAdrSeq())) { - + System.out.println("========================="); //오프라인 조정 신청 정보 불러오기. AdjReqMgrPastVO resultAdjReqMgrPast = adjReqMgrPastService.selectAdjReqMgrOffLineInfo(adjReqMgrPastVO); AdjReqMgrPastVO statCdInfo = adjReqMgrPastService.findByAdrHstryWhereStatCd(adjReqMgrPastVO); From 6b17f471fdeafe782f32a463310aa00fe499ff08 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Thu, 19 Jan 2023 17:04:28 +0900 Subject: [PATCH 14/22] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=ED=8B=B0=EC=95=A4=20=EC=88=98=EC=A0=95=20=EB=B0=9C?= =?UTF-8?q?=EA=B2=AC=20=EC=82=AC=ED=95=AD=201.=20pdf=EB=B7=B0=EC=96=B4=20u?= =?UTF-8?q?rl=20=EB=B3=80=EA=B2=BD=20=09=3D>=20=EC=99=84=EB=A3=8C=202.=20i?= =?UTF-8?q?nnorix.js=20=EB=9D=BC=EC=9D=B4=EC=84=BC=EC=8A=A4=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=09=3D>=20=EC=99=84=EB=A3=8C=203.=20=EA=B2=B0?= =?UTF-8?q?=EC=A0=9C=20=EC=9A=B4=EC=98=81=20url=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=09=3D>=20=EC=99=84=EB=A3=8C=204.=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EA=B2=8C=EC=8B=9C=EA=B8=80=20=ED=83=9C?= =?UTF-8?q?=EA=B7=B8=20=EA=B7=B8=EB=8C=80=EB=A1=9C=20=EB=82=98=EC=98=B4=20?= =?UTF-8?q?=09=3D>=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2023-01-18 전자조정시스템 수정 요청사항 2. 조정진행목록을 클릭했을때 보이는 화면에서 나타나는 진행목록을, 현재 1개월 신청일자로 지정되어 조회되도록 설정되어 있는데 -> 3개월 신청일자 로 검색해서 나오는 목록을 초기값으로 하여 첫 화면에서 볼 수 있도록 수정 부탁드립니다. 저희가 보통 3개월 로 계속 검색을 해서 진행중 사건을 파악하고 있어, 일일이 3개월을 누르고 검색을 계속 해야 하는 번거로움이 있습니다. 처음 조회 화면부터 3개월이 초기값으로 나올 수 있도록 수정 부탁드립니다. => 완료 3. 조정기일통지서 오즈리포트 출력 시 1페이지 "저작권 관련 분쟁(%조정번호% %저작물종류% 이용에 따른 분쟁)" 에서 "%저작물종류%"와 "이용에따른분쟁"의 문구가 겹쳐서 보임 => 완료 --- .../kcc/com/cmm/web/StreamDocsController.java | 2 +- .../apm/web/AdjstPayMentController.java | 10 +- .../ars/web/AdjstReqStatusController.java | 8 +- .../adjPgrMgr/apm/web/ApmController.java | 13 ++- .../jsp/kccadr/adjPgrMgr/apm/apmDetail.jsp | 6 +- .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 3 + .../jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp | 4 +- .../adjPgrMgr/dnt/report/adrAppSlctReport.jsp | 7 -- .../kccadr/adjReqMgr/adjReqMgrRegDetail.jsp | 11 +-- .../jsp/web/cop/bbs/EgovNoticeInqire.jsp | 5 +- src/main/webapp/innorix/innorix.js | 98 ++++++++++--------- 11 files changed, 97 insertions(+), 70 deletions(-) diff --git a/src/main/java/kcc/com/cmm/web/StreamDocsController.java b/src/main/java/kcc/com/cmm/web/StreamDocsController.java index 516d43c4..81c56f50 100644 --- a/src/main/java/kcc/com/cmm/web/StreamDocsController.java +++ b/src/main/java/kcc/com/cmm/web/StreamDocsController.java @@ -184,7 +184,7 @@ public class StreamDocsController { info.setAdrSeq(pdfConversionVO.getAdrSeq()); info = cmmService.selectPgrCmm(info); - if (!"400000".equals(info.getStatCd())) { //종료인 경우 + if ("400000".equals(info.getStatCd())) { //종료인 경우 System.out.println("종료된 경우OOOOOOOOOOOOOO"); //RestResponse rr = new RestResponse(null, "", null); diff --git a/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java b/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java index 63007ba9..5eba6e03 100644 --- a/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java +++ b/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java @@ -226,8 +226,16 @@ public class AdjstPayMentController { String requestUrl = scheme + "://" + serverName + serverPort; + + //고객사 임의데이터 ("요청URL" + "§" + "pk") - String merchantData = requestUrl + "/web/kccadr/accdnt/apm/adjstPayMentProcess.do" + "§"; + String merchantData = requestUrl + "/web/kccadr/accdnt/apm/adjstPayMentProcess.do" + "§"; + + if("local".equals(prodIsLocal)) { + merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + }else { + merchantData = "https://adr.copyright.or.kr" + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + } model.addAttribute("mid", mid); model.addAttribute("signKey", signKey); diff --git a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java index e3574f78..ee8e5d94 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -657,8 +657,14 @@ public class AdjstReqStatusController { String requestUrl = scheme + "://" + serverName + serverPort; + String merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + //고객사 임의데이터 ("요청URL" + "§" + "pk") - String merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + if("local".equals(prodIsLocal)) { + merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + }else { + merchantData = "https://adr.copyright.or.kr" + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + } model.addAttribute("mid", mid); model.addAttribute("signKey", signKey); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index b9d66151..9fe04fca 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -256,7 +256,7 @@ public class ApmController { * @throws Exception */ @RequestMapping(value = "apmList.do") - public String apmList(@ModelAttribute("cmmVO") PgrCmmVO cmmVO, ModelMap model) throws Exception { + public String apmList(@ModelAttribute("cmmVO") PgrCmmVO cmmVO, HttpServletRequest request, ModelMap model) throws Exception { /* * if(apmVO.getPageUnit() != 10) { apmVO.setPageUnit(apmVO.getPageUnit()); } @@ -266,6 +266,12 @@ public class ApmController { cmmVO.setSearchSortOrd("DESC"); } + String beforeUrl = request.getHeader("Referer"); + + if(!beforeUrl.contains("apm")) { + cmmVO.setSearchMonth("3"); + } + if (StringUtil.isEmpty(cmmVO.getSearchStartDt())) { // 조회일시가 null인경우 Date today = new Date(); cmmVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, -1), "yyyyMMdd")); @@ -324,7 +330,7 @@ public class ApmController { // reqOlCdPst 값이 있으면 과거사건 조회하지 않음 model.addAttribute("list", cmmService.selectPgrCmmList(cmmVO)); - + model.addAttribute("cmmVO", cmmVO); if (!StringUtil.isEmpty(cmmVO.getSearchCondition()) && "20".equals(cmmVO.getSearchCondition())) { // 검색조건 신청인 @@ -392,6 +398,9 @@ public class ApmController { // 조정사건일반 PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + + info.setSearchMonth(cmmVO.getSearchMonth()); + model.addAttribute("info", info); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmDetail.jsp index 474b122b..e400e38d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmDetail.jsp @@ -31,13 +31,14 @@ } function tabPageLoad(idx) { - + var url = getPageUrl(idx); $('#tabContent').load(url, { "adrSeq" : $("#adrSeq").val(), "adrSn" : $("#adrSn").val(), - "reqOlCd" : $("#reqOlCd").val() + "reqOlCd" : $("#reqOlCd").val(), + "searchMonth" : $("#searchMonth").val() }, function(res, status, xhr) { console.log(status); }); @@ -74,6 +75,7 @@ " /> " /> " /> + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index f184dd63..1387b71b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -766,6 +766,9 @@ $(document).ready(function(){ + + +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp index 48e90e0c..52cfa876 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp @@ -653,7 +653,9 @@ * pdf Stream road */ function fn_read_streamDocs(url){ - window.open(url); + var url2 = url; + url2 = url2.replace("http://192.168.39.144:8080", ""); + window.open(url2); } function fnc_download_endFile(){ diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport.jsp index 2cf5a53c..30793eba 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport.jsp @@ -55,16 +55,9 @@ oz.sendToActionScript("viewer.pagedisplay" , "singlepagecontinuous"); //스크롤 추가_220921_이준호 //오즈리포트 pdf 다운로드 시 폰트포함 옵션 추가_220727_이준호 - //oz.sendToActionScript("font.fontnames", "font1"); // 폰트에 대한 이름 임의로 설정 -// oz.sendToActionScript("font.font1.nae", "%uB9D1%uC740%20%uACE0%uB515"); // 맑은 고딕 유니코드 문자 - //oz.sendToActionScript("font.font1.name", "나눔스퀘어"); // 맑은 고딕 유니코드 문자 - //oz.sendToActionScript("font.font1.url", "${ozFontPath}${ozFont}"); // 폰트 경로 기입, url이나 시스템 절대경로 지정 가능 oz.sendToActionScript("pdf.fontembedding", "true"); oz.sendToActionScript("pdf.fontembedding_subset", "true"); -// oz.sendToActionScript("print.externalmodule","oz.viewer.export.OZAppletPrintBarcode_MarkAny"); -// oz.sendToActionScript("connection.extraparam","PropertiesFilePath=%OZCONF%/ozmarkany.properties,UserPassword=a,PdfCreator=MarkAny"); - return true; } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp index dbad45c5..2329395b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp @@ -59,8 +59,7 @@ if(edtTy == undefined){ edtTy = ""; }else{ - - if(edtTy == 'E' && "" != KccadrConstants.ADR_UPDT_REQ){ + if(edtTy == 'E' && "" != "${KccadrConstants.ADR_UPDT_REQ}"){ alert('수정요청상태가 아니기때문에 승인할 수 없습니다.'); return false; } @@ -78,12 +77,12 @@ */ if(mode == 'C' && !( - mastStatCd == KccadrConstants.ADR_REQ_COMP || // 제출완료 - mastStatCd == KccadrConstants.ADR_UPDT_RETN || // 수정요청반려 - mastStatCd == KccadrConstants.ADR_SUPP_COMP // 보완요청완료 + mastStatCd == "${KccadrConstants.ADR_REQ_COMP}" || // 제출완료 + mastStatCd == "${KccadrConstants.ADR_UPDT_RETN}" || // 수정요청반려 + mastStatCd == "${KccadrConstants.ADR_SUPP_COMP}" // 보완요청완료 ) ){ - var msg = KccadrConstants.ADR_CHK_MSG_034; + var msg = "${KccadrConstants.ADR_CHK_MSG_034}"; alert(msg); return false; } diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeInqire.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeInqire.jsp index 922e337a..1b22db0b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeInqire.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeInqire.jsp @@ -22,6 +22,8 @@ <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%pageContext.setAttribute("crlf", "\r\n"); %> +<%pageContext.setAttribute("crlt", "<"); %> +<%pageContext.setAttribute("crgt", ">"); %> <% response.setHeader("Cache-Control","no-store"); response.setHeader("Pragma","no-cache"); @@ -316,7 +318,8 @@ function fn_egov_select_commentList(pageNo) { ${fn:replace(result.nttCn, crlf , '
')} - + <%-- --%> +

diff --git a/src/main/webapp/innorix/innorix.js b/src/main/webapp/innorix/innorix.js index e37b2f56..032fa2da 100644 --- a/src/main/webapp/innorix/innorix.js +++ b/src/main/webapp/innorix/innorix.js @@ -1,49 +1,51 @@ -/* - * innorix-wp9 1.0.0 - * INNORIX Transfer solution - * Wed, 18 May 2022 09:39:57 GMT - * - * Copyright (C) INNORIX / innorix-dev-team, http://innorix.com - */ - -// 라이선스 유형 : INNORIX WP 91일 체험 (만료 2022-09-30) -/*var INNORIX_LICENSE = "WEiCgfGkBpqQN/Zw0Ae0YQDFQoK5vit/hNZK/8gGNUm+mtjwAJr4dLSFCiLgiY9BOWSg925hgOfaW1olUgUTccrrl6Y=";*/ -// 라이선스 유형 : INNORIX WP 91일 체험 (만료 2022-12-31) -var INNORIX_LICENSE = "SQeXVJiPNj/2u6W8BXoc1pX1l1D0Dc1azbDxUT+BQPLxsV86kF62+FUvIaofOXnArJTjp9kn/ZtUA+Ps0JFla2QGiu0="; - -var INNORIX_VERSION = '1.1.3.458'; -var INNORIX_WIN_VERSION = '1.1.3.458'; -var INNORIX_MAC_VERSION = '1.1.3.458'; -var INNORIX_LINUX_VERSION = '1.1.3.458'; - -var innorix_install_retry_count = 3; - -!function(t,e){"object"==typeof module&&"object"==typeof module.exports?module.exports=t.document?e(t,!0):function(t){if(!t.document)throw new Error("jQuery requires a window with a document");return e(t)}:e(t)}("undefined"!=typeof window?window:this,function(t,e){function i(t){var e=!!t&&"length"in t&&t.length,i=pt.type(t);return"function"!==i&&!pt.isWindow(t)&&("array"===i||0===e||"number"==typeof e&&e>0&&e-1 in t)}function n(t,e,i){if(pt.isFunction(e))return pt.grep(t,function(t,n){return!!e.call(t,n,t)!==i});if(e.nodeType)return pt.grep(t,function(t){return t===e!==i});if("string"==typeof e){if(St.test(e))return pt.filter(e,t,i);e=pt.filter(e,t)}return pt.grep(t,function(t){return pt.inArray(t,e)>-1!==i})}function o(t,e){do{t=t[e]}while(t&&1!==t.nodeType);return t}function r(t){var e={};return pt.each(t.match(Et)||[],function(t,i){e[i]=!0}),e}function s(){nt.addEventListener?(nt.removeEventListener("DOMContentLoaded",a),t.removeEventListener("load",a)):(nt.detachEvent("onreadystatechange",a),t.detachEvent("onload",a))}function a(){(nt.addEventListener||"load"===t.event.type||"complete"===nt.readyState)&&(s(),pt.ready())}function l(t,e,i){if(void 0===i&&1===t.nodeType){var n="data-"+e.replace(Nt,"-$1").toLowerCase();if("string"==typeof(i=t.getAttribute(n))){try{i="true"===i||"false"!==i&&("null"===i?null:+i+""===i?+i:Ot.test(i)?pt.parseJSON(i):i)}catch(ot){}pt.data(t,e,i)}else i=void 0}return i}function h(t){var e;for(e in t)if(("data"!==e||!pt.isEmptyObject(t[e]))&&"toJSON"!==e)return!1;return!0}function c(t,e,i,n){if(Rt(t)){var o,r,s=pt.expando,a=t.nodeType,l=a?pt.cache:t,h=a?t[s]:t[s]&&s;if(h&&l[h]&&(n||l[h].data)||void 0!==i||"string"!=typeof e)return h||(h=a?t[s]=it.pop()||pt.guid++:s),l[h]||(l[h]=a?{}:{toJSON:pt.noop}),"object"!=typeof e&&"function"!=typeof e||(n?l[h]=pt.extend(l[h],e):l[h].data=pt.extend(l[h].data,e)),r=l[h],n||(r.data||(r.data={}),r=r.data),void 0!==i&&(r[pt.camelCase(e)]=i),"string"==typeof e?null==(o=r[e])&&(o=r[pt.camelCase(e)]):o=r,o}}function u(t,e,i){if(Rt(t)){var n,o,r=t.nodeType,s=r?pt.cache:t,a=r?t[pt.expando]:pt.expando;if(s[a]){if(e&&(n=i?s[a]:s[a].data)){pt.isArray(e)?e=e.concat(pt.map(e,pt.camelCase)):e in n?e=[e]:(e=pt.camelCase(e),e=e in n?[e]:e.split(" ")),o=e.length;for(;o--;)delete n[e[o]];if(i?!h(n):!pt.isEmptyObject(n))return}(i||(delete s[a].data,h(s[a])))&&(r?pt.cleanData([t],!0):ut.deleteExpando||s!=s.window?delete s[a]:s[a]=void 0)}}}function d(t,e,i,n){var o,r=1,s=20,a=n?function(){return n.cur()}:function(){return pt.css(t,e,"")},l=a(),h=i&&i[3]||(pt.cssNumber[e]?"":"px"),c=(pt.cssNumber[e]||"px"!==h&&+l)&&Ft.exec(pt.css(t,e));if(c&&c[3]!==h){h=h||c[3],i=i||[],c=+l||1;do{r=r||".5",c/=r,pt.style(t,e,c+h)}while(r!==(r=a()/l)&&1!==r&&--s)}return i&&(c=+c||+l||0,o=i[1]?c+(i[1]+1)*i[2]:+i[2],n&&(n.unit=h,n.start=c,n.end=o)),o}function p(t){var e=Vt.split("|"),i=t.createDocumentFragment();if(i.createElement)for(;e.length;)i.createElement(e.pop());return i}function f(t,e){var i,n,o=0,r="undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e||"*"):"undefined"!=typeof t.querySelectorAll?t.querySelectorAll(e||"*"):void 0;if(!r)for(r=[],i=t.childNodes||t;null!=(n=i[o]);o++)!e||pt.nodeName(n,e)?r.push(n):pt.merge(r,f(n,e));return void 0===e||e&&pt.nodeName(t,e)?pt.merge([t],r):r}function g(t,e){for(var i,n=0;null!=(i=t[n]);n++)pt._data(i,"globalEval",!e||pt._data(e[n],"globalEval"))}function m(t){Ht.test(t.type)&&(t.defaultChecked=t.checked)}function v(t,e,i,n,o){for(var r,s,a,l,h,c,u,d=t.length,v=p(e),_=[],x=0;d>x;x++)if((s=t[x])||0===s)if("object"===pt.type(s))pt.merge(_,s.nodeType?[s]:s);else if(jt.test(s)){for(l=l||v.appendChild(e.createElement("div")),h=(Wt.exec(s)||["",""])[1].toLowerCase(),u=$t[h]||$t._default,l.innerHTML=u[1]+pt.htmlPrefilter(s)+u[2],r=u[0];r--;)l=l.lastChild;if(!ut.leadingWhitespace&&Ut.test(s)&&_.push(e.createTextNode(Ut.exec(s)[0])),!ut.tbody)for(s="table"!==h||qt.test(s)?""!==u[1]||qt.test(s)?0:l:l.firstChild,r=s&&s.childNodes.length;r--;)pt.nodeName(c=s.childNodes[r],"tbody")&&!c.childNodes.length&&s.removeChild(c);for(pt.merge(_,l.childNodes),l.textContent="";l.firstChild;)l.removeChild(l.firstChild);l=v.lastChild}else _.push(e.createTextNode(s));for(l&&v.removeChild(l),ut.appendChecked||pt.grep(f(_,"input"),m),x=0;s=_[x++];)if(n&&pt.inArray(s,n)>-1)o&&o.push(s);else if(a=pt.contains(s.ownerDocument,s),l=f(v.appendChild(s),"script"),a&&g(l),i)for(r=0;s=l[r++];)zt.test(s.type||"")&&i.push(s);return l=null,v}function _(){return!0}function x(){return!1}function y(){try{return nt.activeElement}catch(t){}}function b(t,e,i,n,o,r){var s,a;if("object"==typeof e){"string"!=typeof i&&(n=n||i,i=void 0);for(a in e)b(t,a,i,n,e[a],r);return t}if(null==n&&null==o?(o=i,n=i=void 0):null==o&&("string"==typeof i?(o=n,n=void 0):(o=n,n=i,i=void 0)),!1===o)o=x;else if(!o)return t;return 1===r&&(s=o,o=function(t){return pt().off(t),s.apply(this,arguments)},o.guid=s.guid||(s.guid=pt.guid++)),t.each(function(){pt.event.add(this,e,o,n,i)})}function w(t,e){return pt.nodeName(t,"table")&&pt.nodeName(11!==e.nodeType?e:e.firstChild,"tr")?t.getElementsByTagName("tbody")[0]||t.appendChild(t.ownerDocument.createElement("tbody")):t}function S(t){return t.type=(null!==pt.find.attr(t,"type"))+"/"+t.type,t}function C(t){var e=ne.exec(t.type);return e?t.type=e[1]:t.removeAttribute("type"),t}function T(t,e){if(1===e.nodeType&&pt.hasData(t)){var i,n,o,r=pt._data(t),s=pt._data(e,r),a=r.events;if(a){delete s.handle,s.events={};for(i in a)for(n=0,o=a[i].length;o>n;n++)pt.event.add(e,i,a[i][n])}s.data&&(s.data=pt.extend({},s.data))}}function k(t,e){var i,n,o;if(1===e.nodeType){if(i=e.nodeName.toLowerCase(),!ut.noCloneEvent&&e[pt.expando]){o=pt._data(e);for(n in o.events)pt.removeEvent(e,n,o.handle);e.removeAttribute(pt.expando)}"script"===i&&e.text!==t.text?(S(e).text=t.text,C(e)):"object"===i?(e.parentNode&&(e.outerHTML=t.outerHTML),ut.html5Clone&&t.innerHTML&&!pt.trim(e.innerHTML)&&(e.innerHTML=t.innerHTML)):"input"===i&&Ht.test(t.type)?(e.defaultChecked=e.checked=t.checked,e.value!==t.value&&(e.value=t.value)):"option"===i?e.defaultSelected=e.selected=t.defaultSelected:"input"!==i&&"textarea"!==i||(e.defaultValue=t.defaultValue)}}function D(t,e,i,n){e=rt.apply([],e);var o,r,s,a,l,h,c=0,u=t.length,d=u-1,p=e[0],g=pt.isFunction(p);if(g||u>1&&"string"==typeof p&&!ut.checkClone&&ie.test(p))return t.each(function(o){var r=t.eq(o);g&&(e[0]=p.call(this,o,r.html())),D(r,e,i,n)});if(u&&(h=v(e,t[0].ownerDocument,!1,t,n),o=h.firstChild,1===h.childNodes.length&&(h=o),o||n)){for(a=pt.map(f(h,"script"),S),s=a.length;u>c;c++)r=h,c!==d&&(r=pt.clone(r,!0,!0),s&&pt.merge(a,f(r,"script"))),i.call(t[c],r,c);if(s)for(l=a[a.length-1].ownerDocument,pt.map(a,C),c=0;s>c;c++)r=a[c],zt.test(r.type||"")&&!pt._data(r,"globalEval")&&pt.contains(l,r)&&(r.src?pt._evalUrl&&pt._evalUrl(r.src):pt.globalEval((r.text||r.textContent||r.innerHTML||"").replace(oe,"")));h=o=null}return t}function E(t,e,i){for(var n,o=e?pt.filter(e,t):t,r=0;null!=(n=o[r]);r++)i||1!==n.nodeType||pt.cleanData(f(n)),n.parentNode&&(i&&pt.contains(n.ownerDocument,n)&&g(f(n,"script")),n.parentNode.removeChild(n));return t}function I(t,e){var i=pt(e.createElement(t)).appendTo(e.body),n=pt.css(i[0],"display");return i.detach(),n}function A(t){var e=nt,i=le[t];return i||(i=I(t,e),"none"!==i&&i||(ae=(ae||pt("