From 6d405fb5539a44662883b7ad0d9e5e042407b4d2 Mon Sep 17 00:00:00 2001 From: myname Date: Thu, 15 Dec 2022 15:17:42 +0900 Subject: [PATCH] =?UTF-8?q?2022-12-15=2014:47=20=EB=8B=A8=EA=B6=8C?= =?UTF-8?q?=ED=99=94=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=ED=99=95=EC=9D=B8=20=EB=B0=8F=20=EC=A0=80?= =?UTF-8?q?=EC=9E=A5=20=EA=B2=BD=EB=A1=9C=20=EA=B4=80=EB=A6=AC=20global.pr?= =?UTF-8?q?operties=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EB=8B=A8=EA=B6=8C=ED=99=94=EB=A5=BC=20=EC=9C=84=ED=95=9C=20oz?= =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=200.?= =?UTF-8?q?=EC=A1=B0=EC=A0=95=EC=8B=A0=EC=B2=AD=EC=84=9C=201.=EA=B8=B0?= =?UTF-8?q?=EC=9D=BC=ED=86=B5=EC=A7=80=EC=84=9C=202.=EA=B8=B0=EC=9D=BC?= =?UTF-8?q?=EC=A1=B0=EC=84=9C=203.=EC=A1=B0=EC=A0=95=EC=A1=B0=EC=84=9C=204?= =?UTF-8?q?.=EB=B6=88=EC=84=B1=EB=A6=BD=20=EC=A2=85=EA=B2=B0=20=ED=86=B5?= =?UTF-8?q?=EB=B3=B4=EC=84=9C=205.=EC=A7=81=EA=B6=8C=EC=A1=B0=EC=A0=95?= =?UTF-8?q?=EA=B2=B0=EC=A0=95=EC=84=9C=206.=ED=99=95=EC=A0=95=EC=A6=9D?= =?UTF-8?q?=EB=AA=85=EC=9B=90=207.=EC=B7=A8=ED=95=98=EC=A2=85=EA=B2=B0?= =?UTF-8?q?=ED=86=B5=EB=B3=B4=EC=84=9C=208.=EC=A1=B0=EC=A0=95=EA=B6=8C?= =?UTF-8?q?=EA=B3=A0=EC=95=88=209.=EA=B2=BD=EC=A0=95=EC=8B=A0=EC=B2=AD?= =?UTF-8?q?=EC=84=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjPgrMgr/apm/web/ApmController.java | 57 ++- .../adjPgrMgr/arm/web/ArmController.java | 63 ++- .../adjPgrMgr/cfrm/web/CfrmController.java | 62 ++- .../adjPgrMgr/chd/web/ChdController.java | 6 +- .../adjPgrMgr/crt/web/CrtController.java | 59 ++- .../adjPgrMgr/dnt/web/DntController.java | 63 ++- .../adjPgrMgr/drt/web/DrtController.java | 61 ++- .../drtctr/web/DrtCtrController.java | 60 ++- .../adjPgrMgr/ent/web/EntController.java | 60 ++- .../web/InternalApprovManageController.java | 75 ++- .../adjPgrMgr/oad/web/OadController.java | 60 ++- .../adjreqmgr/web/AdjReqMgrController.java | 116 ++++- .../kcc/kccadr/message/SchedulerUtil.java | 269 +++++----- .../kccadr/ojct/web/OjctWebController.java | 5 + .../kccadr/ozSchd/web/OzSchdExportUtil.java | 464 +++++++++++++++++- .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 9 +- .../jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp | 43 +- .../jsp/kccadr/adjPgrMgr/arm/armDetail.jsp | 6 +- .../jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp | 12 +- .../jsp/kccadr/adjPgrMgr/chd/chdReg.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/crt/crtReg.jsp | 6 +- .../jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp | 7 +- .../kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp | 6 +- .../jsp/kccadr/adjPgrMgr/drtCtr/drtCtrReg.jsp | 6 +- .../jsp/kccadr/adjPgrMgr/ent/entDetail.jsp | 6 +- .../jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp | 6 +- 26 files changed, 1404 insertions(+), 185 deletions(-) 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 7c6cb7bb..ff9ff998 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -212,9 +212,40 @@ public class ApmController { @Resource(name = "SMSOracleService") private SMSOracleService sMSOracleService; + /* //개발, local oz 저장 경로 @Value("#{globalSettings['Globals.oz.devPath']}") private String ozDevPath; + */ + + + //개발, local oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.devServerIp']}") + private String ozDevServerIp; + + //개발, local oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.devSchedulerIp']}") + private String ozDevSchedulerIp; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devPdfSavePath']}") + private String ozDevPdfSavePath; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devServerCheckString']}") + private String devServerCheckString; + + //real oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.realServerIp']}") + private String ozRealServerIp; + + //real oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.realSchedulerIp']}") + private String ozRealSchedulerIp; + + //real oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.realPdfSavePath']}") + private String ozRealPdfSavePath; /** * 조정진행목록 목록 @@ -2479,6 +2510,27 @@ public class ApmController { * 오즈 리포트 File Export 처리 * * */ + + OzSchdExportUtil ozSchd = new OzSchdExportUtil(); + + ozSchd.checkOzEnvNMakePDF( + islocal + , corReqVO.getAdrSeq() + , "admin/adrJjosuReport.ozr" //oz template file + , ozDevPdfSavePath + , ozRealPdfSavePath + , jsObjData.toJSONString() + , serverName + //, "adjReqReport.pdf" //oz to pdf save file name + , "A250.pdf" + , ozDevServerIp + , ozDevSchedulerIp + , ozRealServerIp + , ozRealSchedulerIp + , devServerCheckString + ); + + /* OzSchdExportUtil ozSchd = new OzSchdExportUtil(); //로컬, 개발 서버 @@ -2494,15 +2546,14 @@ public class ApmController { //실서버 else { String ozrFilePath = "/admin/adrCorReqReport.ozr"; - /*String savePath = corReqVO.getAdrSeq() + "/ozFile/adrCorReqReport.pdf";*/ + *String savePath = corReqVO.getAdrSeq() + "/ozFile/adrCorReqReport.pdf";* String savePath = "\\\\192.168.39.125\\data3\\out\\" + corReqVO.getAdrSeq() + "\\ozFile\\adrCorReqReport.pdf";; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req); } - - + */ modelAndView.addObject("result", "success"); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java index 3050af9c..eb89d2f2 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java @@ -100,7 +100,42 @@ public class ArmController { @Value("#{globalSettings['Globals.prod.islocal']}") public void setIslocal(String path) { islocal = path; } - + + /* + //개발, local oz 저장 경로 + @Value("#{globalSettings['Globals.oz.devPath']}") + private String ozDevPath; + */ + + + //개발, local oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.devServerIp']}") + private String ozDevServerIp; + + //개발, local oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.devSchedulerIp']}") + private String ozDevSchedulerIp; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devPdfSavePath']}") + private String ozDevPdfSavePath; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devServerCheckString']}") + private String devServerCheckString; + + //real oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.realServerIp']}") + private String ozRealServerIp; + + //real oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.realSchedulerIp']}") + private String ozRealSchedulerIp; + + //real oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.realPdfSavePath']}") + private String ozRealPdfSavePath; + /** * 조정권고안 등록 Form TODO daenge 조정권고안 등록 * @@ -375,6 +410,7 @@ public class ArmController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrKkaAgrReport.ozr"; String savePath = closeVO.getAdrSeq() + "/adrKkaAgrReport.pdf"; + savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/adrKkaAgrReport.pdf"; String jsonData = jsObjData.toJSONString(); jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -460,12 +496,34 @@ public class ArmController { * 오즈 리포트 File Export 처리 * * */ + + OzSchdExportUtil ozSchd = new OzSchdExportUtil(); + + ozSchd.checkOzEnvNMakePDF( + islocal + , closeVO.getAdrSeq() + , "admin/adrKkaAgrReport.ozr" //oz template file + , ozDevPdfSavePath + , ozRealPdfSavePath + , jsObjData.toJSONString() + , serverName + //, "adjReqReport.pdf" //oz to pdf save file name + , "303050.pdf" + , ozDevServerIp + , ozDevSchedulerIp + , ozRealServerIp + , ozRealSchedulerIp + , devServerCheckString + ); + + /* OzSchdExportUtil ozSchd = new OzSchdExportUtil(); //로컬, 개발 서버 if("local".equals(islocal)) { String ozrFilePath = "/admin/adrKkaAgrReport.ozr"; String savePath = closeVO.getAdrSeq() + "/ozFile/adrKkaAgrReport.pdf"; + savePath = ozDevPath + closeVO.getAdrSeq() + "/ozFile/adrKkaAgrReport.pdf"; String jsonData = jsObjData.toJSONString(); jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -474,13 +532,14 @@ public class ArmController { //실서버 else{ String ozrFilePath = "/admin/adrKkaAgrReport.ozr"; - /*String savePath = closeVO.getAdrSeq() + "/ozFile/adrKkaAgrReport.pdf";*/ + *String savePath = closeVO.getAdrSeq() + "/ozFile/adrKkaAgrReport.pdf";* String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf"; String jsonData = jsObjData.toJSONString(); jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req); } + */ diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java index e091a59c..ceb1c8ab 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java @@ -68,6 +68,42 @@ public class CfrmController { @Value("#{globalSettings['Globals.prod.islocal']}") public void setIslocal(String path) { islocal = path; } + /* + //개발, local oz 저장 경로 + @Value("#{globalSettings['Globals.oz.devPath']}") + private String ozDevPath; + */ + + + //개발, local oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.devServerIp']}") + private String ozDevServerIp; + + //개발, local oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.devSchedulerIp']}") + private String ozDevSchedulerIp; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devPdfSavePath']}") + private String ozDevPdfSavePath; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devServerCheckString']}") + private String devServerCheckString; + + //real oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.realServerIp']}") + private String ozRealServerIp; + + //real oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.realSchedulerIp']}") + private String ozRealSchedulerIp; + + //real oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.realPdfSavePath']}") + private String ozRealPdfSavePath; + + /** * 확정증명원 등록 Form TODO daenge 확정증명원 등록 * @@ -275,6 +311,7 @@ public class CfrmController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrHjwReport.ozr"; String savePath = cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf"; + savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf"; ozSchd.ozschdFileExport(ozrFilePath, repStr, savePath, req); } @@ -347,24 +384,47 @@ public class CfrmController { * 오즈 리포트 File Export 처리 * * */ + + OzSchdExportUtil ozSchd = new OzSchdExportUtil(); + + ozSchd.checkOzEnvNMakePDF( + islocal + , closeVO.getAdrSeq() + , "admin/adrHjwReport.ozr" //oz template file + , ozDevPdfSavePath + , ozRealPdfSavePath + , jsObjData.toJSONString() + , serverName + //, "adjReqReport.pdf" //oz to pdf save file name + , "A500.pdf" + , ozDevServerIp + , ozDevSchedulerIp + , ozRealServerIp + , ozRealSchedulerIp + , devServerCheckString + ); + + /* OzSchdExportUtil ozSchd = new OzSchdExportUtil(); //로컬, 개발 서버 if("local".equals(islocal)) { String ozrFilePath = "/admin/adrHjwReport.ozr"; String savePath = cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf"; + savePath = ozDevPath + cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf"; ozSchd.ozschdFileExport(ozrFilePath, repStr, savePath, req); } //실서버 else{ String ozrFilePath = "/admin/adrHjwReport.ozr"; - /*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf";*/ + *String savePath = cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf";* String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf"; ozSchd.ozschdFileExport(ozrFilePath, repStr, savePath, req); } + */ modelAndView.addObject("result", "success"); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java b/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java index f02185b0..c1ec4cce 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java @@ -36,7 +36,6 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; -import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrCommonService; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.ozSchd.web.OzSchdExportUtil; @@ -101,6 +100,10 @@ public class ChdController { @Value("#{globalSettings['Globals.prod.islocal']}") public void setIslocal(String path) { islocal = path; } + //개발, local oz 저장 경로 + @Value("#{globalSettings['Globals.oz.devPath']}") + private String ozDevPath; + /** * 기일변경통지 상세 TODO daenge 기일변경통지 상세 * @@ -427,6 +430,7 @@ public class ChdController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrAppSlctReport.ozr"; String savePath = cmmVO.getAdrSeq() + "/adrAppSlctReport.pdf"; + savePath = ozDevPath + cmmVO.getAdrSeq() + "/adrAppSlctReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java b/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java index ac7cfa2a..a40700fc 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java @@ -84,7 +84,40 @@ public class CrtController { @Value("#{globalSettings['Globals.prod.islocal']}") public void setIslocal(String path) { islocal = path; } + /* + //개발, local oz 저장 경로 + @Value("#{globalSettings['Globals.oz.devPath']}") + private String ozDevPath; + */ + + //개발, local oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.devServerIp']}") + private String ozDevServerIp; + //개발, local oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.devSchedulerIp']}") + private String ozDevSchedulerIp; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devPdfSavePath']}") + private String ozDevPdfSavePath; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devServerCheckString']}") + private String devServerCheckString; + + //real oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.realServerIp']}") + private String ozRealServerIp; + + //real oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.realSchedulerIp']}") + private String ozRealSchedulerIp; + + //real oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.realPdfSavePath']}") + private String ozRealPdfSavePath; + /** * 불성립종결통보서 등록 Form TODO daenge 불성립종결통보서 등록 * @@ -314,6 +347,7 @@ public class CrtController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrBsrtbsApprReport.ozr"; String savePath = closeVO.getAdrSeq() + "/adrBsrtbsApprReport.pdf"; + savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/adrBsrtbsApprReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -385,12 +419,34 @@ public class CrtController { * 오즈 리포트 File Export 처리 * * */ + + OzSchdExportUtil ozSchd = new OzSchdExportUtil(); + + ozSchd.checkOzEnvNMakePDF( + islocal + , closeVO.getAdrSeq() + , "admin/adrBsrtbsApprReport.ozr" //oz template file + , ozDevPdfSavePath + , ozRealPdfSavePath + , jsObjData.toJSONString() + , serverName + //, "adjReqReport.pdf" //oz to pdf save file name + , "307050.pdf" + , ozDevServerIp + , ozDevSchedulerIp + , ozRealServerIp + , ozRealSchedulerIp + , devServerCheckString + ); + + /* OzSchdExportUtil ozSchd = new OzSchdExportUtil(); //로컬, 개발 서버 if("local".equals(islocal)) { String ozrFilePath = "/admin/adrBsrtbsApprReport.ozr"; String savePath = closeVO.getAdrSeq() + "/ozFile/adrBsrtbsApprReport.pdf"; + savePath = ozDevPath + closeVO.getAdrSeq() + "/ozFile/adrBsrtbsApprReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -399,13 +455,14 @@ public class CrtController { //실서버 else{ String ozrFilePath = "/admin/adrBsrtbsApprReport.ozr"; - /*String savePath = closeVO.getAdrSeq() + "/ozFile/adrBsrtbsApprReport.pdf";*/ + *String savePath = closeVO.getAdrSeq() + "/ozFile/adrBsrtbsApprReport.pdf";* String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req); } + */ diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java index d97db011..ba7503bc 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java @@ -117,7 +117,40 @@ public class DntController { @Value("#{globalSettings['Globals.ozFontPath']}") private String ozFontPath; - + + //개발, local oz 저장 경로 + @Value("#{globalSettings['Globals.oz.devPath']}") + private String ozDevPath; + + + //개발, local oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.devServerIp']}") + private String ozDevServerIp; + + //개발, local oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.devSchedulerIp']}") + private String ozDevSchedulerIp; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devPdfSavePath']}") + private String ozDevPdfSavePath; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devServerCheckString']}") + private String devServerCheckString; + + //real oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.realServerIp']}") + private String ozRealServerIp; + + //real oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.realSchedulerIp']}") + private String ozRealSchedulerIp; + + //real oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.realPdfSavePath']}") + private String ozRealPdfSavePath; + /** * 기일지정 상세 TODO daenge 기일지정 상세 * @@ -642,12 +675,37 @@ public class DntController { * 오즈 리포트 File Export 처리 * * */ + + String serverName = req.getServerName(); + + OzSchdExportUtil ozSchd = new OzSchdExportUtil(); + + ozSchd.checkOzEnvNMakePDF( + islocal + , cmmVO.getAdrSeq() + , "admin/adrAppSlctReport.ozr" //oz template file + , ozDevPdfSavePath + , ozRealPdfSavePath + , jsObjData.toJSONString() + , serverName + //, "adjReqReport.pdf" //oz to pdf save file name + , "205050.pdf" + , ozDevServerIp + , ozDevSchedulerIp + , ozRealServerIp + , ozRealSchedulerIp + , devServerCheckString + ); + + /* OzSchdExportUtil ozSchd = new OzSchdExportUtil(); //로컬, 개발 서버 if("local".equals(islocal)) { String ozrFilePath = "/admin/adrAppSlctReport.ozr"; String savePath = cmmVO.getAdrSeq() + "/ozFile/adrAppSlctReport.pdf"; + savePath = ozDevPath + cmmVO.getAdrSeq() + "/ozFile/adrAppSlctReport.pdf"; + String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -656,13 +714,14 @@ public class DntController { //실서버 else{ String ozrFilePath = "/admin/adrAppSlctReport.ozr"; - /*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrAppSlctReport.pdf";*/ + //*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrAppSlctReport.pdf";* String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req); } + */ diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java index 1902c66e..28e6de02 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java @@ -123,7 +123,36 @@ public class DrtController { private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") public void setIslocal(String path) { islocal = path; } - + + + //개발, local oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.devServerIp']}") + private String ozDevServerIp; + + //개발, local oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.devSchedulerIp']}") + private String ozDevSchedulerIp; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devPdfSavePath']}") + private String ozDevPdfSavePath; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devServerCheckString']}") + private String devServerCheckString; + + //real oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.realServerIp']}") + private String ozRealServerIp; + + //real oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.realSchedulerIp']}") + private String ozRealSchedulerIp; + + //real oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.realPdfSavePath']}") + private String ozRealPdfSavePath; + /** * 기일조서 등록 Form TODO daenge 기일조서 등록 * @@ -551,12 +580,15 @@ public class DrtController { * 오즈 리포트 File Export 처리 * * */ + + OzSchdExportUtil ozSchd = new OzSchdExportUtil(); //로컬, 개발 서버 if("local".equals(islocal)) { String ozrFilePath = "/admin/adrKjosuReport.ozr"; String savePath = cmmVO.getAdrSeq() + "/adrKjosuReport.pdf"; + savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/adrKjosuReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -691,12 +723,36 @@ public class DrtController { * 오즈 리포트 File Export 처리 * * */ + + //String serverName = req.getServerName(); + + OzSchdExportUtil ozSchd = new OzSchdExportUtil(); + + ozSchd.checkOzEnvNMakePDF( + islocal + , cmmVO.getAdrSeq() + , "admin/adrAppSlctReport.ozr" //oz template file + , ozDevPdfSavePath + , ozRealPdfSavePath + , jsObjData.toJSONString() + , serverName + //, "adjReqReport.pdf" //oz to pdf save file name + , "302050.pdf" + , ozDevServerIp + , ozDevSchedulerIp + , ozRealServerIp + , ozRealSchedulerIp + , devServerCheckString + ); + + /* OzSchdExportUtil ozSchd = new OzSchdExportUtil(); //로컬, 개발 서버 if("local".equals(islocal)) { String ozrFilePath = "/admin/adrKjosuReport.ozr"; String savePath = cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf"; + savePath = ozDevPath + cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -705,13 +761,14 @@ public class DrtController { //실서버 else{ String ozrFilePath = "/admin/adrKjosuReport.ozr"; - /*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";*/ + //*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";* String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req); } + */ modelAndView.addObject("result", "SUCCESS"); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java b/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java index f0213be0..aa94709d 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java @@ -107,7 +107,41 @@ public class DrtCtrController { @Value("#{globalSettings['Globals.prod.islocal']}") public void setIslocal(String path) { islocal = path; } + /* + //개발, local oz 저장 경로 + @Value("#{globalSettings['Globals.oz.devPath']}") + private String ozDevPath; + */ + + + //개발, local oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.devServerIp']}") + private String ozDevServerIp; + //개발, local oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.devSchedulerIp']}") + private String ozDevSchedulerIp; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devPdfSavePath']}") + private String ozDevPdfSavePath; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devServerCheckString']}") + private String devServerCheckString; + + //real oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.realServerIp']}") + private String ozRealServerIp; + + //real oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.realSchedulerIp']}") + private String ozRealSchedulerIp; + + //real oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.realPdfSavePath']}") + private String ozRealPdfSavePath; + /** * 조정조서 등록 Form TODO daenge 조정조서 등록 * @@ -538,6 +572,7 @@ public class DrtCtrController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrJjosuReport.ozr"; String savePath = cmmVO.getAdrSeq() + "/adrJjosuReport.pdf"; + savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/adrJjosuReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -733,12 +768,34 @@ public class DrtCtrController { * 오즈 리포트 File Export 처리 * * */ + + OzSchdExportUtil ozSchd = new OzSchdExportUtil(); + + ozSchd.checkOzEnvNMakePDF( + islocal + , cmmVO.getAdrSeq() + , "admin/adrJjosuReport.ozr" //oz template file + , ozDevPdfSavePath + , ozRealPdfSavePath + , jsObjData.toJSONString() + , serverName + //, "adjReqReport.pdf" //oz to pdf save file name + , "304050.pdf" + , ozDevServerIp + , ozDevSchedulerIp + , ozRealServerIp + , ozRealSchedulerIp + , devServerCheckString + ); + + /* OzSchdExportUtil ozSchd = new OzSchdExportUtil(); //로컬, 개발 서버 if("local".equals(islocal)) { String ozrFilePath = "/admin/adrJjosuReport.ozr"; String savePath = cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf"; + savePath = ozDevPath + cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -747,13 +804,14 @@ public class DrtCtrController { //실서버 else{ String ozrFilePath = "/admin/adrJjosuReport.ozr"; - /*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";*/ + //*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";* String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req); } + */ modelAndView.addObject("result", "SUCCESS"); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java b/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java index c7eeec12..b0c7d1ba 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java @@ -86,7 +86,41 @@ public class EntController { @Value("#{globalSettings['Globals.prod.islocal']}") public void setIslocal(String path) { islocal = path; } + /* + //개발, local oz 저장 경로 + @Value("#{globalSettings['Globals.oz.devPath']}") + private String ozDevPath; + */ + + //개발, local oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.devServerIp']}") + private String ozDevServerIp; + + //개발, local oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.devSchedulerIp']}") + private String ozDevSchedulerIp; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devPdfSavePath']}") + private String ozDevPdfSavePath; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devServerCheckString']}") + private String devServerCheckString; + + //real oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.realServerIp']}") + private String ozRealServerIp; + + //real oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.realSchedulerIp']}") + private String ozRealSchedulerIp; + + //real oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.realPdfSavePath']}") + private String ozRealPdfSavePath; + /** * 취하종결통보서 등록 Form TODO daenge 취하종결통보서 등록 * @@ -317,6 +351,7 @@ public class EntController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrCncltbsReport.ozr"; String savePath = closeVO.getAdrSeq() + "/adrCncltbsReport.pdf"; + savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/adrCncltbsReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -409,12 +444,34 @@ public class EntController { * 오즈 리포트 File Export 처리 * * */ + + OzSchdExportUtil ozSchd = new OzSchdExportUtil(); + + ozSchd.checkOzEnvNMakePDF( + islocal + , closeVO.getAdrSeq() + , "admin/adrCncltbsReport.ozr" //oz template file + , ozDevPdfSavePath + , ozRealPdfSavePath + , jsObjData.toJSONString() + , serverName + //, "adjReqReport.pdf" //oz to pdf save file name + , "305050.pdf" + , ozDevServerIp + , ozDevSchedulerIp + , ozRealServerIp + , ozRealSchedulerIp + , devServerCheckString + ); + + /* OzSchdExportUtil ozSchd = new OzSchdExportUtil(); //로컬, 개발 서버 if("local".equals(islocal)) { String ozrFilePath = "/admin/adrCncltbsReport.ozr"; String savePath = closeVO.getAdrSeq() + "/ozFile/adrCncltbsReport.pdf"; + savePath = ozDevPath + closeVO.getAdrSeq() + "/ozFile/adrCncltbsReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -423,13 +480,14 @@ public class EntController { //실서버 else{ String ozrFilePath = "/admin/adrCncltbsReport.ozr"; - /*String savePath = closeVO.getAdrSeq() + "/ozFile/adrCncltbsReport.pdf";*/ + *String savePath = closeVO.getAdrSeq() + "/ozFile/adrCncltbsReport.pdf";* String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req); } + */ diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java index 3906e954..ff9d700b 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; -import ch.qos.logback.classic.Logger; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; @@ -33,6 +32,7 @@ import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.DateUtil; import kcc.com.cmm.util.IpUtil; import kcc.com.cmm.util.StringUtil; +import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.kccadr.adjPgrMgr.apm.service.ApmService; import kcc.kccadr.adjPgrMgr.apm.service.ApmVO; @@ -116,7 +116,36 @@ public class InternalApprovManageController { @Value("#{globalSettings['Globals.prod.islocal']}") public void setIslocal(String path) { islocal = path; } + + //개발, local oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.devServerIp']}") + private String ozDevServerIp; + //개발, local oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.devSchedulerIp']}") + private String ozDevSchedulerIp; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devPdfSavePath']}") + private String ozDevPdfSavePath; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devServerCheckString']}") + private String devServerCheckString; + + //real oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.realServerIp']}") + private String ozRealServerIp; + + //real oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.realSchedulerIp']}") + private String ozRealSchedulerIp; + + //real oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.realPdfSavePath']}") + private String ozRealPdfSavePath; + + @RequestMapping(value = "/kccadr/adjPgrMgr/iam/internalApprovManageList.do") public String internalApprovManageList( @ModelAttribute("internalApprovManageVO") InternalApprovManageVO internalApprovManageVO @@ -410,8 +439,50 @@ public class InternalApprovManageController { kccadrMgrUdtService.updateAdrMgrUdt(arv , s_adrHstryMgrSeq ); + }else if ( //2022-12-14 new one + arv.getStatCd().equals("201050") //접수결재완료 + ) { + //pdf 문서를 만든다. + /* + * 2022.01.06 우영두 추가 + * 오즈 리포트 File Export 처리 + * + * */ + String serverName = request.getServerName(); + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + OzSchdExportUtil ozSchd = new OzSchdExportUtil(); + + JSONObject jsObjData = ozSchd.makeReqReport( + userId + , internalApprovManageVO.getAdrSeq() + , adjstReqService + , fileService + , egovCryptoUtil + ); + + ozSchd.checkOzEnvNMakePDF( + islocal + , internalApprovManageVO.getAdrSeq() + , "adjReqReport.ozr" //oz template file + , ozDevPdfSavePath + , ozRealPdfSavePath + , jsObjData.toJSONString() + , serverName + //, "adjReqReport.pdf" //oz to pdf save file name + , "201050.pdf" + , ozDevServerIp + , ozDevSchedulerIp + , ozRealServerIp + , ozRealSchedulerIp + , devServerCheckString + ); + } + System.out.println("arv.getStatCd()"); + System.out.println(arv.getStatCd()); + }else if("Y".equals(statInfo.getRejectYn())){ AdjReqMgrVO arv = new AdjReqMgrVO(); arv.setAdrSeq(internalApprovManageVO.getAdrSeq()); // 조정일련번호 @@ -826,6 +897,7 @@ public class InternalApprovManageController { if("local".equals(islocal)) { String ozrFilePath = "/admin/adrFrontReport.ozr"; String savePath = cmmVO.getAdrSeq() + "/ozFile/adrFrontReport.png"; + savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/ozFile/adrFrontReport.png"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -1017,6 +1089,7 @@ public class InternalApprovManageController { if("local".equals(islocal)) { String ozrFilePath = "/adjReqReport.ozr"; String savePath = adjReqVO.getAdrSeq() + "/ozFile/adjReqReport.png"; + savePath = ozDevPdfSavePath + adjReqVO.getAdrSeq() + "/ozFile/adjReqReport.png"; String jsonData = jsObjData.toJSONString(); jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java b/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java index a699cf82..d9ea01a4 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java @@ -93,6 +93,41 @@ public class OadController { @Value("#{globalSettings['Globals.prod.islocal']}") public void setIslocal(String path) { islocal = path; } + /* + //개발, local oz 저장 경로 + @Value("#{globalSettings['Globals.oz.devPath']}") + private String ozDevPath; + */ + + + //개발, local oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.devServerIp']}") + private String ozDevServerIp; + + //개발, local oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.devSchedulerIp']}") + private String ozDevSchedulerIp; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devPdfSavePath']}") + private String ozDevPdfSavePath; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devServerCheckString']}") + private String devServerCheckString; + + //real oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.realServerIp']}") + private String ozRealServerIp; + + //real oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.realSchedulerIp']}") + private String ozRealSchedulerIp; + + //real oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.realPdfSavePath']}") + private String ozRealPdfSavePath; + /** * 직권조정결정서 등록 Form TODO daenge 직권조정결정서 등록 * @@ -476,12 +511,34 @@ public class OadController { * 오즈 리포트 File Export 처리 * * */ + + OzSchdExportUtil ozSchd = new OzSchdExportUtil(); + + ozSchd.checkOzEnvNMakePDF( + islocal + , closeVO.getAdrSeq() + , "admin/adrJkkjsReport.ozr" //oz template file + , ozDevPdfSavePath + , ozRealPdfSavePath + , jsObjData.toJSONString() + , serverName + //, "adjReqReport.pdf" //oz to pdf save file name + , "306050.pdf" + , ozDevServerIp + , ozDevSchedulerIp + , ozRealServerIp + , ozRealSchedulerIp + , devServerCheckString + ); + + /* OzSchdExportUtil ozSchd = new OzSchdExportUtil(); //로컬, 개발 서버 if("local".equals(islocal)) { String ozrFilePath = "/admin/adrJkkjsReport.ozr"; String savePath = closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf"; + savePath = ozDevPath + closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -490,13 +547,14 @@ public class OadController { //실서버 else{ String ozrFilePath = "/admin/adrJkkjsReport.ozr"; - /*String savePath = closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf";*/ + *String savePath = closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf";* String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrJkkjsReport.pdf"; String jsonData = repStr; jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req); } + */ diff --git a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java index 62f3ed95..cb6b5c9e 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java @@ -133,6 +133,44 @@ public class AdjReqMgrController { @Value("#{globalSettings['Globals.prod.islocal']}") public void setIslocal(String path) { islocal = path; } + + //개발, local oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.devServerIp']}") + private String ozDevServerIp; + + //개발, local oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.devSchedulerIp']}") + private String ozDevSchedulerIp; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devPdfSavePath']}") + private String ozDevPdfSavePath; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devServerCheckString']}") + private String devServerCheckString; + + //real oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.realServerIp']}") + private String ozRealServerIp; + + //real oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.realSchedulerIp']}") + private String ozRealSchedulerIp; + + //real oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.realPdfSavePath']}") + private String ozRealPdfSavePath; + + /* + Globals.oz.devServerIp=192.168.0.176:8091 + Globals.oz.devSchedulerIp=192.168.0.176 + Globals.oz.devPath=/usr/local/tomcat/webapps/data + Globals.oz.realServerIp=192.168.39.145:8080 + Globals.oz.realSchedulerIp=192.168.39.147 + Globals.oz.realPath=\\data3\\out + */ + /** * 조정신청 정보 입력 화면 */ @@ -734,6 +772,8 @@ public class AdjReqMgrController { AdjstReqVO adjstMsrMasterVO = new AdjstReqVO(); //adjstMsrMasterVO.setAdrSeq("ADR_0000000000000381"); adjstMsrMasterVO.setAdrSeq(adjstReqVO.getAdrSeq()); + + /* JSONObject jsMaster = new JSONObject(); JSONObject jsDepInfo = new JSONObject(); JSONObject jsReqInfo = new JSONObject(); @@ -830,6 +870,27 @@ public class AdjReqMgrController { jsObjData.put("jsReqInfo", jsReqInfo); jsObjData.put("jsRespInfo", jsRespInfo); jsObjData.put("jsAtchFileInfo", jsAtchFileInfo); + */ + + + OzSchdExportUtil ozSchd = new OzSchdExportUtil(); + + JSONObject jsObjData = ozSchd.makeReqReport( + userId + , adjstReqVO.getAdrSeq() + , adjstReqService + //, adjstReqVO + , fileService + , egovCryptoUtil + ); + + JSONObject jsMaster = (JSONObject) jsObjData.get("jsMaster"); + JSONObject jsDepInfo = (JSONObject) jsObjData.get("jsDepInfo"); + JSONObject jsReqInfo = (JSONObject) jsObjData.get("jsReqInfo"); + + JSONArray jsRespInfo = (JSONArray) jsObjData.get("jsRespInfo"); + JSONArray jsAtchFileInfo = (JSONArray) jsObjData.get("jsAtchFileInfo"); + //json 데이터 특수문자 치환_220215_이준호 JsonStringEncoder encoder = JsonStringEncoder.getInstance(); @@ -857,16 +918,61 @@ public class AdjReqMgrController { * 오즈 리포트 File Export 처리 * * */ - OzSchdExportUtil ozSchd = new OzSchdExportUtil(); + ozSchd.checkOzEnvNMakePDF( + islocal + , adjstReqVO.getAdrSeq() + , "adjReqReport.ozr" //oz template file + , ozDevPdfSavePath + , ozRealPdfSavePath + , jsObjData.toJSONString() + , serverName + , "adjReqReport.pdf" //oz to pdf save file name + , ozDevServerIp + , ozDevSchedulerIp + , ozRealServerIp + , ozRealSchedulerIp + , devServerCheckString + ); + + + /* + private String ozDevServerIp; + + //개발, local oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.devSchedulerIp']}") + private String ozDevSchedulerIp; + + //개발, local oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.devPath']}") + private String ozDevPath; + + //real oz 서버 IP + port + @Value("#{globalSettings['Globals.oz.realServerIp']}") + private String ozRealServerIp; + + //real oz 스케쥴러 서버 IP + port + @Value("#{globalSettings['Globals.oz.realSchedulerIp']}") + private String ozRealSchedulerIp; + + //real oz to pdf 저장 경로 + @Value("#{globalSettings['Globals.oz.realPath']}") + private String ozRealPath; + * */ + //checkOzEnvNMakePDF + + /* //로컬, 개발 서버 if("local".equals(islocal)) { System.out.println(islocal + "환경입니다."); String ozrFilePath = "/adjReqReport.ozr"; //이준호 오즈리포트 export 경로 앞에 "/"추가 테스트_220310 - /*String savePath = adjstReqVO.getAdrSeq() + "/adjReqReport.pdf";*/ + *String savePath = adjstReqVO.getAdrSeq() + "/adjReqReport.pdf";* String savePath = "/" + adjstReqVO.getAdrSeq() + "/adjReqReport.pdf"; + savePath = "/usr/local/tomcat/webapps/data"+savePath; + savePath = ozDevPath + adjstReqVO.getAdrSeq() + "/adjReqReport.pdf"; + String jsonData = jsObjData.toJSONString(); jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 @@ -886,6 +992,7 @@ public class AdjReqMgrController { jsonData2 = jsonData2.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 ozSchd.ozschdFileExport(ozrFilePath2, jsonData2, savePath2, req); + */ @@ -931,7 +1038,10 @@ public class AdjReqMgrController { jsonData4 = jsonData4.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 ozSchd.ozschdFileExport(ozrFilePath4, jsonData4, savePath4, req); //=============================================테스트 소스 끝===================================================================== -*/ } + */ + /* + } + */ //adr_hstry_mgr에 값 넣기 - 시작 diff --git a/src/main/java/kcc/kccadr/message/SchedulerUtil.java b/src/main/java/kcc/kccadr/message/SchedulerUtil.java index 1e0a5bd3..516c6f87 100644 --- a/src/main/java/kcc/kccadr/message/SchedulerUtil.java +++ b/src/main/java/kcc/kccadr/message/SchedulerUtil.java @@ -1,135 +1,134 @@ -package kcc.kccadr.message; - -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.util.Enumeration; -import java.util.List; - -import javax.annotation.Resource; -import javax.sql.DataSource; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Service; - -import kcc.com.cmm.aspect.LoggerAspect; -import kcc.kccadr.message.service.KakaoAtSendService; -import kcc.kccadr.message.service.KakaoAtSendVO; -import kcc.kccadr.message.web.KakaoAtSendAPI; -import net.javacrumbs.shedlock.core.LockProvider; -import net.javacrumbs.shedlock.core.SchedulerLock; -import net.javacrumbs.shedlock.provider.jdbctemplate.JdbcTemplateLockProvider; -import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock; - - -@Service("SchedulerUtil") -@EnableScheduling -@EnableSchedulerLock(defaultLockAtMostFor = "PT30S") // Scheduler Lock 사용 가능 설정 (기본 30초동안 Lock) -//@EnableSchedulerLock(defaultLockAtMostFor = "PT1M") // Scheduler Lock 사용 가능 설정 -public class SchedulerUtil { - - private static final Logger log = LoggerFactory.getLogger(LoggerAspect.class); - - @Value("#{globalSettings['Globals.BizPpurio.siteUrl']}") - private String apiUrl; - - @Value("#{globalSettings['Globals.prod.islocal']}") - private String isLocal; - - @Resource (name = "KakaoAtSendService") - private KakaoAtSendService kakaoAtSendService; - - private static final String ONE_MIN = "PT1M"; // 1분동안 LOCK - - //로컬 테스트용 아이피 허용 - private String myLocalIp = "192.168.0.40"; - - //개발서버 테스트용 아이피 허용(외부) - private String devOutIp = "119.193.215.98"; - //개발서버 테스트용 아이피 허용(내부) - private String devInIp = "119.193.215.98"; - - //운영 외부망 WAS1 - private String dmzIp1 = "222.231.43.66"; - //운영 외부망 WAS2 - private String dmzIp2 = "222.231.43.69"; - - private String containerIp = "172.25.0.2"; - - //10분마다 실행 -// @Scheduled(cron = "0 0/1 * * * *") - //1분마다 실행 - @Scheduled(cron = "0 0/1 * * * *") -// @SchedulerLock(name = "kakaoAtSendPrcs", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN) - public void kakaoAtSendPrcs() throws Exception { - System.out.println("===========at scheduler run============"); - log.error("===========at scheduler run============"); - - - String hostAddr = null; - - //모든 OS에서 서버 고정 IP를 가져오기 - try { - Enumeration nienum = NetworkInterface.getNetworkInterfaces(); - while (nienum.hasMoreElements()) { - NetworkInterface ni = nienum.nextElement(); - Enumeration kk= ni.getInetAddresses(); - while (kk.hasMoreElements()) { - InetAddress inetAddress = kk.nextElement(); - if (!inetAddress.isLoopbackAddress() && - !inetAddress.isLinkLocalAddress() && - inetAddress.isSiteLocalAddress()) { - hostAddr = inetAddress.getHostAddress().toString(); - } - } - } - } catch (SocketException e) { - e.printStackTrace(); - } - - try { - System.out.println("server ip ============" + hostAddr); - log.error("server ip ============" + hostAddr); - - -// if(hostAddr.equals(myLocalIp) || hostAddr.equals(devOutIp) || hostAddr.equals(devInIp) || hostAddr.equals(dmzIp1) || hostAddr.equals(dmzIp2) || hostAddr.equals(containerIp) ) { - if(hostAddr.equals(containerIp) ) { - //접속 서버 별 분기처리 필요 - - List list = kakaoAtSendService.selectKakaoAtList(); - - int listSize = list.size(); - - for(int i=0; i nienum = NetworkInterface.getNetworkInterfaces(); + while (nienum.hasMoreElements()) { + NetworkInterface ni = nienum.nextElement(); + Enumeration kk= ni.getInetAddresses(); + while (kk.hasMoreElements()) { + InetAddress inetAddress = kk.nextElement(); + if (!inetAddress.isLoopbackAddress() && + !inetAddress.isLinkLocalAddress() && + inetAddress.isSiteLocalAddress()) { + hostAddr = inetAddress.getHostAddress().toString(); + } + } + } + } catch (SocketException e) { + e.printStackTrace(); + } + + try { + System.out.println("server ip ============" + hostAddr); + log.error("server ip ============" + hostAddr); + + +// if(hostAddr.equals(myLocalIp) || hostAddr.equals(devOutIp) || hostAddr.equals(devInIp) || hostAddr.equals(dmzIp1) || hostAddr.equals(dmzIp2) || hostAddr.equals(containerIp) ) { + if(hostAddr.equals(containerIp) ) { + //접속 서버 별 분기처리 필요 + + List list = kakaoAtSendService.selectKakaoAtList(); + + int listSize = list.size(); + + for(int i=0; i"); String ozApiUrl = ""; @@ -26,6 +41,11 @@ public class OzSchdExportUtil { ozApiUrl = "http://192.168.0.125:8091/oz80/server"; ozApiIp = "192.168.0.125"; + + //개발서버 + ozApiIp = "192.168.0.176"; + ozApiUrl = "http://"+ozApiIp+":8091/oz80/server"; + }else { @@ -84,23 +104,457 @@ public class OzSchdExportUtil { // 각각의 Export할 파일명을 명시합니다. // Export된 파일들은 스케줄러에 정의된 Repository Root에 생성됩니다. - export.setProperty("pdf.filename", savePath); // C:\Program Files (x86)\Forcs\OZ Enterprise Server 8.0\OZ Scheduler 8.0\Repository\subdir\test.pdf + System.out.println("savePath"); + System.out.println(savePath); - //파일 생성 - DirectExportResult result = scheduler.directExport(server, prop, export); + export.setProperty("pdf.filename", savePath); // C:\Program Files (x86)\Forcs\OZ Enterprise Server 8.0\OZ Scheduler 8.0\Repository\subdir\test.pdf //System.out.println("@-@-@-@ OZ Report PDF Create End " + (System.currentTimeMillis() - startTime) + "(ms) , 결과 : " + result); //export 요청 완료 여부 확인_이준호_220406 try { + //파일 생성 + DirectExportResult result = scheduler.directExport(server, prop, export); System.out.println("@@@@@@@@@@@@ export 요청 성공여부는 :: " + result.isSuccessful + " 입니다."); System.out.println("@@@@@@@@@@@@ 완료 시각은 :: " + result.completedTime + " 입니다."); } catch (Exception e) { + System.out.println("DirectExportResult Error!!!-start"); + e.printStackTrace(); + System.out.println("DirectExportResult Error!!!-end"); System.out.println(e.getMessage()); } } catch(Exception e) { + e.printStackTrace(); System.out.println("Oz Export Error!!!"); } } + + //실행 환경을 파악해서 맞는 oz 환경으로 pdf 파일을 생성한다. + /** + * @param p_islocal - 개발 서버 여부 체크 + * @param p_adrSeq - 경로 생성을 위한 adrSeq + * @param p_ozFileName - pdf 생성을 위한 기본 oz 파일명 + * @param p_ozDevPath - oz to pdf 개발저장경로 + * @param p_ozRealPath - oz to pdf 실제저장경로 + * @param p_jsonData - 저장 데이터 + * @param p_req - request + * @param p_savePdfFileName - 저장 pdf 파일명 + * @param p_devOzServerIp - 개발 oz 서버 IP + * @param p_devOzSchedulerServerIp - 개발 oz scheduler 서버 IP + * @param p_realOzServerIp - 실제 oz 서버 IP + * @param p_realOzSchedulerServerIp - 실제 oz scheduler 서버 IP + * @param p_devServerCheckString - 개발서버 체크용 문자(?) + * @throws Exception + */ + public void checkOzEnvNMakePDF( + String p_islocal + , String p_adrSeq + , String p_ozFileName + , String p_ozDevPath + , String p_ozRealPath + , String p_jsonData + , String p_serverNm + , String p_savePdfFileName + + , String p_devOzServerIp + , String p_devOzSchedulerServerIp + , String p_realOzServerIp + , String p_realOzSchedulerServerIp + , String p_devServerCheckString + + )throws Exception{ + + String savePath = ""; + + //로컬, 개발 서버 + /* + if(p_devServerCheckString.indexOf(serverNm)>-1) { + if("local".equals(p_islocal)) { + System.out.println(p_islocal + "환경입니다.-inner"); + //저장파일 경로 - dev 서버의 경우는 oz report가linux 서버에서 작동되어 하기와 같이 경로 설정해야함(IP 불필요) + savePath = p_ozDevPath + p_adrSeq + "/" + p_savePdfFileName; + + } + //실서버 + else { + System.out.println("#################################" + p_islocal + "환경입니다.-inner"); + //이준호 오즈리포트 export 추가 ozFile폴더에도 생성 + //String ozrFilePath2 = "/adjReqReport.ozr"; + //이준호 오즈리포트 export_0406_nas에 파일 저장 성공 + //저장 경로 파일 - real 서버의 경우는 oz report가 window 서버에서 작동되어 하기와 같이 경로 설정해야함(IP 필요) + savePath = "\\\\"+p_ozRealPath+"\\" + p_adrSeq + "\\ozFile\\" + p_savePdfFileName; + } + */ + + String p_ozServerIp = ""; + String p_ozSchedulerServerIp = ""; + + //개발서버 및 운영서버 구분에 따른 서버 정보 셋팅 + //String serverNm = p_serverNm; + if(p_devServerCheckString.indexOf(p_serverNm)>-1) { + System.out.println(p_islocal + "환경입니다.-inner"); + //저장파일 경로 - dev 서버의 경우는 oz report가linux 서버에서 작동되어 하기와 같이 경로 설정해야함(IP 불필요) + savePath = p_ozDevPath + "/" + p_adrSeq + "/" + p_savePdfFileName; + + //oz scheduler 개발서버 + p_ozSchedulerServerIp = p_devOzSchedulerServerIp; + + //oz 개발 서버 + p_ozServerIp = "http://"+p_devOzServerIp+"/oz80/server"; + + }else { + System.out.println("#################################" + p_islocal + "환경입니다.-inner"); + //이준호 오즈리포트 export 추가 ozFile폴더에도 생성 + //String ozrFilePath2 = "/adjReqReport.ozr"; + //이준호 오즈리포트 export_0406_nas에 파일 저장 성공 + //저장 경로 파일 - real 서버의 경우는 oz report가 window 서버에서 작동되어 하기와 같이 경로 설정해야함(IP 필요) + savePath = "\\"+p_ozRealPath+"\\" + p_adrSeq + "\\ozFile\\" + p_savePdfFileName; + + /*ozApiUrl = "https://adr.copyright.or.kr/oz80/server";*/ + //오즈 스케쥴러 -> 오즈리포트 서버로 servlet(HTTP-Server) connection 주소 + //기존 도메인 호출 -> 오즈리포트 서버로 다이렉트 연결 + + //ozApiUrl = "http://192.168.39.145:8080/oz80/server"; + //ozApiIp = "192.168.39.147"; + + //oz scheduler 실제서버 + p_ozSchedulerServerIp = p_realOzSchedulerServerIp; + + //oz 실제 서버 + p_ozServerIp = "http://"+p_realOzServerIp+"/oz80/server"; + + } + + //데이터 내용 변경 + p_jsonData = p_jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 + + //oz to pdf 파일 생성 + this.innerOzSchdFileExport( + p_ozFileName + , p_jsonData + , savePath + + , p_ozServerIp + , p_ozSchedulerServerIp + ); + } + + private void innerOzSchdFileExport( + String ozrFilePath + , String jsonData + , String savePath + //, HttpServletRequest request + , String p_ozServerIp + , String p_ozSchedulerServerIp + ) throws Exception { + + ozrFilePath = "/"+ozrFilePath; + + + Scheduler scheduler = null; + + // make SERVER info. + ServerInfo server = new ServerInfo(); + server.setID("admin"); + server.setPWD("itntest123"); + + // Server Type : Servlet(HTTP-Server) + server.setIsDaemon(false); + //server.setURL(ozApiUrl); // 오즈 서버 URL 입니다. + server.setURL(p_ozServerIp); // 오즈 서버 URL 입니다. + + try { + //scheduler = new Scheduler(ozApiIp, ozApiPort); + scheduler = new Scheduler(p_ozSchedulerServerIp, ozApiPort); + + + // 폼 파일에서 리스트별 스케줄 테스크 생성 - createTask + SortProperties prop = new SortProperties(); + + prop.setProperty("task_type", "viewerTag"); + prop.setProperty("cfg.type", "new"); + + //주기적 : periodically , 즉시:Immediately + prop.setProperty("launch_type", "Immediately"); + + // Export Info. + SortProperties export = new SortProperties(); + + // 아래부터는 리포트를 호출할때와 마찬가지로 동일하게 파라미터를 입력해주십시오 + export.setProperty("connection.servlet", server.getURL()); + export.setProperty("connection.reportName", ozrFilePath); //오즈 ozr 디자인 파일 경로 + export.setProperty("connection.pcount","1"); + export.setProperty("connection.args1","jsonData=" + jsonData); //오즈 파라미터 데이터 + + export.setProperty("viewer.mode", "export"); + export.setProperty("viewer.useprogressbar", "false"); + export.setProperty("viewer.allowmultiframe", "true"); + export.setProperty("viewer.mode", "silent"); + export.setProperty("export.confirmsave", "true"); + export.setProperty("information.debug", "debug"); + export.setProperty("viewer.showerrormessage", "false"); + + // Export 할 파일 포맷을 / 를 구분자로 열거합니다. + export.setProperty("export.format", "pdf"); //저장 파일 확장자 설정 + export.setProperty("pdf.fontembedding", "true"); + export.setProperty("pdf.fontembedding_subset", "true"); + + // 각각의 Export할 파일명을 명시합니다. + // Export된 파일들은 스케줄러에 정의된 Repository Root에 생성됩니다. + System.out.println("savePath"); + System.out.println(savePath); + + export.setProperty("pdf.filename", savePath); // C:\Program Files (x86)\Forcs\OZ Enterprise Server 8.0\OZ Scheduler 8.0\Repository\subdir\test.pdf + //System.out.println("@-@-@-@ OZ Report PDF Create End " + (System.currentTimeMillis() - startTime) + "(ms) , 결과 : " + result); + + //export 요청 완료 여부 확인_이준호_220406 + try { + //파일 생성 + DirectExportResult result = scheduler.directExport(server, prop, export); + System.out.println("@@@@@@@@@@@@ export 요청 성공여부는 :: " + result.isSuccessful + " 입니다."); + System.out.println("@@@@@@@@@@@@ 완료 시각은 :: " + result.completedTime + " 입니다."); + } catch (Exception e) { + System.out.println("DirectExportResult Error!!!-start"); + e.printStackTrace(); + System.out.println("DirectExportResult Error!!!-end"); + System.out.println(e.getMessage()); + } + + } + catch(Exception e) { + e.printStackTrace(); + System.out.println("Oz Export Error!!!"); + } + } + + + //데이터 가져오기 + public JSONObject makeReqReport( + String p_userId + , String p_adrSeq + , AdjstReqService p_adjstReqService + //, AdjstReqVO p_adjstReqVO + , EgovFileMngService p_fileService + , EgovCryptoUtil p_egovCryptoUtil + //, InternalApprovManageVO p_info + //, PgrCmmVO p_cmmVO + //, PgrCmmService p_cmmService + //, String p_prodIsLocal + ) throws Exception{ + + AdjstReqVO adjstMsrMasterVO = new AdjstReqVO(); + //adjstMsrMasterVO.setAdrSeq("ADR_0000000000000381"); + adjstMsrMasterVO.setAdrSeq(p_adrSeq); + + + JSONObject jsMaster = new JSONObject(); + JSONObject jsDepInfo = new JSONObject(); + JSONObject jsReqInfo = new JSONObject(); + JSONArray jsRespInfo = new JSONArray(); + JSONArray jsAtchFileInfo = new JSONArray(); + + + if(!p_userId.equals("")) { + //임시 저장중인 데이터가 있는지 확인 + //조정사건 번호 조회하기 + AdjstReqVO adjMsrMaster = p_adjstReqService.selectAdjsMgrMasterByAdrSeq(adjstMsrMasterVO); + + jsMaster = this.parseJsonData( + adjMsrMaster + ); + + //첨부파일이 있는경우 파일 이름 처리해주기 + if(adjMsrMaster.getAtchFileId() != null || adjMsrMaster.getAtchFileId().equals("")) { + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(adjMsrMaster.getAtchFileId()); + List fileList = p_fileService.selectFileInfs(fileVO); + JSONObject jsFile = new JSONObject(); + + for(int i=0; i< fileList.size(); i++) { + JSONObject oj = new JSONObject(); + String fileNm = fileList.get(i).getOrignlFileNm(); + + oj.put("atchFile", fileNm); + jsAtchFileInfo.add(oj); + } + } + + + if(adjMsrMaster != null) { + // 조정사건번호 입력해주기 + //p_adjstReqVO.setAdrSeq(adjMsrMaster.getAdrSeq()); + + //임시저장중인 대리인, 신청인, 피신청인 정보 리스트로 불러오기 + List adjstReqUserList = p_adjstReqService.selectAdjsReqUserListByadjSeq(adjMsrMaster); + + if(adjstReqUserList.size() > 0) { //신청인 정보가 있는 경우 실행 + + //신청 대리인이 포함되어 있는지 확인 - 리스트 정렬을 rpplTy desc 정렬을 해서 첫번째 리스트가 대리인이 있는지 확인 + String rpplTy = adjstReqUserList.get(0).getRpplTy(); + int listCnt = adjstReqUserList.size(); + + AdjstReqVO adjReqDepInfo = new AdjstReqVO(); //대리인 정보 + AdjstReqVO adjReqInfo = new AdjstReqVO(); //신청인 정보 + AdjstReqVO adjReqRespInfo = new AdjstReqVO(); //피신청인 정보 + + for(int i=0; i < listCnt; i++) { + + AdjstReqVO temp = new AdjstReqVO(); + String rpplTy1 = adjstReqUserList.get(i).getRpplTy(); + + if(rpplTy1.equals("30")) { //대리인 정보 담기 + + //신청 대리인 정보 추가해주기 + temp = adjstReqUserList.get(i); + adjReqDepInfo.getAdjstReqVoList().add(decryptAdjReqMgrReturn(temp + , p_egovCryptoUtil + )); + + jsDepInfo = parseJsonData(temp); + + }else if(rpplTy1.equals("10")) { //신청인 정보 담기 + + //신청인 정보 추가해주기 + temp = adjstReqUserList.get(i); + adjReqInfo.getAdjstReqVoList().add(decryptAdjReqMgrReturn(temp + , p_egovCryptoUtil + )); + jsReqInfo = parseJsonData(temp); + + }else if(rpplTy1.equals("20")) { + + //피신청인 정보 추가해주기 + temp = adjstReqUserList.get(i); + adjReqRespInfo.getAdjstReqVoList().add(decryptAdjReqMgrReturn(temp + , p_egovCryptoUtil + )); + + JSONObject jsTemp = new JSONObject(); + + jsTemp = parseJsonData(temp); + jsRespInfo.add(jsTemp); + + } + } + } + } + + } + + + JSONObject jsObjData = new JSONObject(); + + jsObjData.put("jsMaster", jsMaster); + jsObjData.put("jsDepInfo", jsDepInfo); + jsObjData.put("jsReqInfo", jsReqInfo); + jsObjData.put("jsRespInfo", jsRespInfo); + jsObjData.put("jsAtchFileInfo", jsAtchFileInfo); + + return jsObjData; + } + + + private JSONObject parseJsonData( + AdjstReqVO adjReqVO + ) throws Exception{ + + StringUtil stUtil = new StringUtil(); + + JSONObject oj = new JSONObject(); + + + String rpplNm = adjReqVO.getRpplNm(); //이름 + String rpplPost = adjReqVO.getRpplPost(); //우편번호 + String rpplPhone = stUtil.addDash(adjReqVO.getRpplPhone()); //핸드폰 번호 '-' 문자 추가해 주기 + String rpplAddr = adjReqVO.getRpplAddr() + " " + adjReqVO.getRpplAddrDtl(); //주소 + 상세주소 합치기 + String rpplEmail = adjReqVO.getRpplEmail(); //이메일 주소 + + String adrNo = adjReqVO.getAdrNo(); //조정사건번호 + //엔터문자 변경해주기 - \n\r -> \\n\\r로 json 데이터 전달해야한다고 함(오즈리포트) + String reqCn1 = adjReqVO.getReqCn1().replaceAll("\r\n", "\\\\r\\\\n"); //신청취지 + String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n"); //신청원인 + + + if(!rpplNm.equals("")) { + + oj.put("rpplNm", rpplNm); + + } + + if(!rpplPost.equals("")) { + + oj.put("rpplPost", rpplPost); + + } + + if(!rpplPhone.equals("")) { + + oj.put("rpplPhone", rpplPhone); + + } + + if(!rpplAddr.equals("") && !rpplAddr.equals(" ")) { + + oj.put("rpplAddr", rpplAddr); + + } + + if(!rpplEmail.equals("")) { + + oj.put("rpplEmail", rpplEmail); + + } + + if(!reqCn1.equals("")) { + + oj.put("reqCn1", reqCn1); + + } + + if(!reqCn2.equals("")) { + + oj.put("reqCn2", reqCn2); + + } + + + if (adrNo!=null) + if(!adrNo.equals("")) { + + oj.put("adrNo", adrNo); + + } + + return oj; + } + + // 대국민 조정신청 이름, 이메일, 연락처, 주소정보 복호화 후 리턴해주기 + private AdjstReqVO decryptAdjReqMgrReturn( + AdjstReqVO adjstReqVO + , EgovCryptoUtil egovCryptoUtil + ) throws Exception{ + if(adjstReqVO != null){ + String rpplNm = egovCryptoUtil.decrypt(adjstReqVO.getRpplNm()); //신청인이름 + String rpplEmail = egovCryptoUtil.decrypt(adjstReqVO.getRpplEmail()); //이메일주소 + String rpplPhone = egovCryptoUtil.decrypt(adjstReqVO.getRpplPhone()); //연락처 + String rpplPost = egovCryptoUtil.decrypt(adjstReqVO.getRpplPost()); //우편번호 + String rpplAddr = egovCryptoUtil.decrypt(adjstReqVO.getRpplAddr()); //주소 + String rpplAddrDtl = egovCryptoUtil.decrypt(adjstReqVO.getRpplAddrDtl()); //상세주소 + String rpplRealPost = egovCryptoUtil.decrypt(adjstReqVO.getRpplRealPost()); //우편물 수령지 우편번호 + String rpplRealAddr = egovCryptoUtil.decrypt(adjstReqVO.getRpplRealAddr()); //우편물 수령지 주소 + String rpplRealAddrDtl = egovCryptoUtil.decrypt(adjstReqVO.getRpplRealAddrDtl()); //우편물 수령지 상세주소 + + adjstReqVO.setRpplNm(rpplNm); + adjstReqVO.setRpplEmail(rpplEmail); + adjstReqVO.setRpplPhone(rpplPhone); + adjstReqVO.setRpplPost(rpplPost); + adjstReqVO.setRpplAddr(rpplAddr); + adjstReqVO.setRpplAddrDtl(rpplAddrDtl); + adjstReqVO.setRpplRealPost(rpplRealPost); + adjstReqVO.setRpplRealAddr(rpplRealAddr); + adjstReqVO.setRpplRealAddrDtl(rpplRealAddrDtl); + } + return adjstReqVO; + } } 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 0601aeaa..4944bf48 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 @@ -783,10 +783,9 @@ $(document).ready(function(){
- + + /${passMenuId }/(new button-코드 삭제 예정임/${info.statCd}/) +
@@ -1046,7 +1045,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp index 699370fc..addcb499 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp @@ -205,7 +205,7 @@ function fncCancelDo(p_a, p_b){ and list.menuId*1 ne 306050 and list.menuId*1 ne 307050 and list.menuId*1 ne 309050 - and list.menuId*1 ne 400000 + and list.menuId*1 ne 400000 }"> + +<%-- --%> +<%-- --%> +<%-- --%> - + - + @@ -276,6 +282,37 @@ function fncCancelDo(p_a, p_b){ + + + + +<%-- --%> + + +<%--

--%> + + + + + + + + + + + +<%-- --%> +<%-- 되돌리기 --%> + + +<%-- --%> + + + + +<%-- --%> + + 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 3faf7e40..0c1eeec2 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 @@ -599,7 +599,9 @@
-
+
+ +
@@ -627,7 +629,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 cda9dfaf..ac531efc 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 @@ -459,7 +459,9 @@ $(document).ready(function() {
-
+
+ +
@@ -471,12 +473,16 @@ $(document).ready(function() { - + - +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp index 3ac6c1fe..69490678 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp @@ -502,7 +502,7 @@ }"> - + <%-- 기일변경 통지서 등록화면이라서 송달정보 입력은 주석처리했음 20220126 --%> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtReg.jsp index 0deebceb..ad484ad9 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtReg.jsp @@ -255,10 +255,12 @@
-
+
+ +
- +
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 0204198c..a7bb2ded 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 @@ -862,8 +862,11 @@
-
+
+ +
+ @@ -891,7 +894,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 01a17bd4..b144146d 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 @@ -683,7 +683,9 @@
-
+
+ +
@@ -713,7 +715,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrReg.jsp index 311a355e..da4b0e91 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrReg.jsp @@ -426,7 +426,9 @@
-
+
+ +
@@ -450,7 +452,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 e011110e..3f82dc66 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 @@ -523,7 +523,9 @@
-
+
+ +
<%-- 취소 +
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 28fef840..ac3cc05d 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 @@ -594,7 +594,9 @@
-
+
+ +
@@ -622,7 +624,7 @@ - +