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 9fe04fca..8d79fd07 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java
@@ -2556,7 +2556,7 @@ public class ApmController {
else {
String ozrFilePath = "/admin/adrCorReqReport.ozr";
*String savePath = corReqVO.getAdrSeq() + "/ozFile/adrCorReqReport.pdf";*
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + corReqVO.getAdrSeq() + "\\ozFile\\adrCorReqReport.pdf";;
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + corReqVO.getAdrSeq() + "\\ozFile\\adrCorReqReport.pdf";;
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
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 2448d3d4..fa65333f 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java
@@ -411,7 +411,11 @@ public class ArmController {
if("local".equals(islocal)) {
String ozrFilePath = "/admin/adrKkaAgrReport.ozr";
String savePath = closeVO.getAdrSeq() + "/adrKkaAgrReport.pdf";
- savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/adrKkaAgrReport.pdf";
+ if(req.getServerName().contains("localhost")) {
+ savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/ozFile/adrKkaAgrReport.pdf";
+ }else {
+ savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf";
+ }
String jsonData = jsObjData.toJSONString();
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -420,7 +424,7 @@ public class ArmController {
//실서버
else{
String ozrFilePath = "/admin/adrKkaAgrReport.ozr";
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf";
String jsonData = jsObjData.toJSONString();
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -534,7 +538,7 @@ public class ArmController {
else{
String ozrFilePath = "/admin/adrKkaAgrReport.ozr";
*String savePath = closeVO.getAdrSeq() + "/ozFile/adrKkaAgrReport.pdf";*
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf";
String jsonData = jsObjData.toJSONString();
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
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 460c39ab..4c958fcc 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java
@@ -312,7 +312,11 @@ 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";
+ if(req.getServerName().contains("localhost")) {
+ savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf";
+ }else {
+ savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf";
+ }
ozSchd.ozschdFileExport(ozrFilePath, repStr, savePath, req);
}
@@ -320,7 +324,7 @@ public class CfrmController {
else{
String ozrFilePath = "/admin/adrHjwReport.ozr";
/*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf";*/
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf";
ozSchd.ozschdFileExport(ozrFilePath, repStr, savePath, req);
}
@@ -420,7 +424,7 @@ public class CfrmController {
else{
String ozrFilePath = "/admin/adrHjwReport.ozr";
*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf";*
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf";
ozSchd.ozschdFileExport(ozrFilePath, repStr, savePath, req);
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 c1ec4cce..ffdd3dfb 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java
@@ -100,9 +100,13 @@ 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;
+// //개발, local oz 저장 경로
+// @Value("#{globalSettings['Globals.oz.devPath']}")
+// private String ozDevPath;
+
+ //개발, local oz to pdf 저장 경로
+ @Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+ private String ozDevPdfSavePath;
/**
* 기일변경통지 상세 TODO daenge 기일변경통지 상세
@@ -430,7 +434,12 @@ public class ChdController {
if("local".equals(islocal)) {
String ozrFilePath = "/admin/adrAppSlctReport.ozr";
String savePath = cmmVO.getAdrSeq() + "/adrAppSlctReport.pdf";
- savePath = ozDevPath + cmmVO.getAdrSeq() + "/adrAppSlctReport.pdf";
+
+ if(req.getServerName().contains("localhost")) {
+ savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/ozFile/adrAppSlctReport.pdf";
+ }else {
+ savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf";
+ }
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -440,7 +449,7 @@ public class ChdController {
else{
String ozrFilePath = "/admin/adrAppSlctReport.ozr";
/*String savePath = cmmVO.getAdrSeq() + "/adrAppSlctReport.pdf";*/
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\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 1dd7407c..b8f9cb65 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java
@@ -348,7 +348,11 @@ public class CrtController {
if("local".equals(islocal)) {
String ozrFilePath = "/admin/adrBsrtbsApprReport.ozr";
String savePath = closeVO.getAdrSeq() + "/adrBsrtbsApprReport.pdf";
- savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/adrBsrtbsApprReport.pdf";
+ if(req.getServerName().contains("localhost")) {
+ savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/ozFile/adrBsrtbsApprReport.pdf";
+ }else {
+ savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf";
+ }
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -358,7 +362,7 @@ public class CrtController {
else{
String ozrFilePath = "/admin/adrBsrtbsApprReport.ozr";
/*String savePath = closeVO.getAdrSeq() + "/adrBsrtbsApprReport.pdf";*/
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -457,7 +461,7 @@ public class CrtController {
else{
String ozrFilePath = "/admin/adrBsrtbsApprReport.ozr";
*String savePath = closeVO.getAdrSeq() + "/ozFile/adrBsrtbsApprReport.pdf";*
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
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 1c70aba6..a12b3647 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java
@@ -119,9 +119,10 @@ public class DntController {
@Value("#{globalSettings['Globals.ozFontPath']}")
private String ozFontPath;
- //개발, local oz 저장 경로
- @Value("#{globalSettings['Globals.oz.devPath']}")
- private String ozDevPath;
+// //개발, local oz 저장 경로
+// @Value("#{globalSettings['Globals.oz.devPath']}")
+// private String ozDevPath;
+
//개발, local oz 서버 IP + port
@@ -720,7 +721,7 @@ public class DntController {
else{
String ozrFilePath = "/admin/adrAppSlctReport.ozr";
//*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrAppSlctReport.pdf";*
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
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 948cdd5a..e0a4dc6a 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java
@@ -589,8 +589,11 @@ public class DrtController {
if("local".equals(islocal)) {
String ozrFilePath = "/admin/adrKjosuReport.ozr";
String savePath = cmmVO.getAdrSeq() + "/adrKjosuReport.pdf";
- savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/adrKjosuReport.pdf";
-
+ if(req.getServerName().contains("localhost")) {
+ savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";
+ }else {
+ savePath = "\\\\192.168.0.176\\shared_folder_176\\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);
@@ -599,7 +602,7 @@ public class DrtController {
else{
String ozrFilePath = "/admin/adrKjosuReport.ozr";
/*String savePath = cmmVO.getAdrSeq() + "/adrKjosuReport.pdf";*/
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -763,7 +766,7 @@ public class DrtController {
else{
String ozrFilePath = "/admin/adrKjosuReport.ozr";
//*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";*
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -927,7 +930,7 @@ public class DrtController {
else{
String ozrFilePath = "/admin/adrKjosuReport.ozr";
//*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";*
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
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 1fa74092..db0492fc 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java
@@ -573,7 +573,11 @@ public class DrtCtrController {
if("local".equals(islocal)) {
String ozrFilePath = "/admin/adrJjosuReport.ozr";
String savePath = cmmVO.getAdrSeq() + "/adrJjosuReport.pdf";
- savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/adrJjosuReport.pdf";
+ if(req.getServerName().contains("localhost")) {
+ savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";
+ }else {
+ savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf";
+ }
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -583,7 +587,7 @@ public class DrtCtrController {
else{
String ozrFilePath = "/admin/adrJjosuReport.ozr";
/*String savePath = cmmVO.getAdrSeq() + "/adrJjosuReport.pdf";*/
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -806,7 +810,7 @@ public class DrtCtrController {
else{
String ozrFilePath = "/admin/adrJjosuReport.ozr";
//*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";*
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -1042,7 +1046,7 @@ public class DrtCtrController {
else{
String ozrFilePath = "/admin/adrJjosuReport.ozr";
//*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";*
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
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 d20ed40d..2e64f44e 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java
@@ -352,7 +352,11 @@ public class EntController {
if("local".equals(islocal)) {
String ozrFilePath = "/admin/adrCncltbsReport.ozr";
String savePath = closeVO.getAdrSeq() + "/adrCncltbsReport.pdf";
- savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/adrCncltbsReport.pdf";
+ if(req.getServerName().contains("localhost")) {
+ savePath = ozDevPdfSavePath + closeVO.getAdrSeq() + "/ozFile/adrCncltbsReport.pdf";
+ }else {
+ savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf";
+ }
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -362,7 +366,7 @@ public class EntController {
else{
String ozrFilePath = "/admin/adrCncltbsReport.ozr";
/*String savePath = closeVO.getAdrSeq() + "/adrCncltbsReport.pdf";*/
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -482,7 +486,7 @@ public class EntController {
else{
String ozrFilePath = "/admin/adrCncltbsReport.ozr";
*String savePath = closeVO.getAdrSeq() + "/ozFile/adrCncltbsReport.pdf";*
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
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 ff9d700b..33d23c1f 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java
@@ -897,7 +897,11 @@ 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";
+ if(req.getServerName().contains("localhost")) {
+ savePath = ozDevPdfSavePath + cmmVO.getAdrSeq() + "/ozFile/adrFrontReport.png";
+ }else {
+ savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrFrontReport.png";
+ }
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -907,7 +911,7 @@ public class InternalApprovManageController {
else{
String ozrFilePath = "/admin/adrFrontReport.ozr";
/*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrFrontReport.png";*/
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrFrontReport.png";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrFrontReport.png";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -1089,7 +1093,11 @@ 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";
+ if(req.getServerName().contains("localhost")) {
+ savePath = ozDevPdfSavePath + adjReqVO.getAdrSeq() + "/ozFile/adjReqReport.png";
+ }else {
+ savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + adjReqVO.getAdrSeq() + "\\ozFile\\adjReqReport.png";
+ }
String jsonData = jsObjData.toJSONString();
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -1099,7 +1107,7 @@ public class InternalApprovManageController {
else{
String ozrFilePath = "/adjReqReport.ozr";
/*String savePath = adjReqVO.getAdrSeq() + "/ozFile/adjReqReport.png";*/
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + adjReqVO.getAdrSeq() + "\\ozFile\\adjReqReport.png";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + 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 45dd6796..77217b3b 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java
@@ -549,7 +549,7 @@ public class OadController {
else{
String ozrFilePath = "/admin/adrJkkjsReport.ozr";
*String savePath = closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf";*
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrJkkjsReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrJkkjsReport.pdf";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -724,7 +724,7 @@ public class OadController {
else{
String ozrFilePath = "/admin/adrJkkjsReport.ozr";
*String savePath = closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf";*
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrJkkjsReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrJkkjsReport.pdf";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
diff --git a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java
index cb6b5c9e..a758254b 100644
--- a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java
+++ b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java
@@ -986,7 +986,7 @@ public class AdjReqMgrController {
String ozrFilePath2 = "/adjReqReport.ozr";
//이준호 오즈리포트 export_0406_nas에 파일 저장 성공
- String savePath2 = "\\\\192.168.39.125\\data3\\out\\" + adjstReqVO.getAdrSeq() + "\\ozFile\\adjReqReport.pdf";
+ String savePath2 = "\\\\192.168.39.130\\data\\out\\" + adjstReqVO.getAdrSeq() + "\\ozFile\\adjReqReport.pdf";
String jsonData2 = jsObjData.toJSONString();
@@ -1002,7 +1002,7 @@ public class AdjReqMgrController {
String ozrFilePath2 = "/adjReqReport.ozr";
//이준호 오즈리포트 export 경로 앞에 "/"추가 테스트_220310
- String savePath2 = "\\\\192.168.39.125\\data3\\out\\adjReqReport2.pdf";
+ String savePath2 = "\\\\192.168.39.130\\data\\out\\adjReqReport2.pdf";
System.out.println("@@@@@@@@@@@@@@@@@@adjstReqVO.getAdrSeq() :: @@@@@ =" + adjstReqVO.getAdrSeq());
System.out.println("@@@@@@@@@@@@@@@@@@ savePath2 :: @@@@@ = " + savePath2);
diff --git a/src/main/java/kcc/kccadr/ojct/web/OjctWebController.java b/src/main/java/kcc/kccadr/ojct/web/OjctWebController.java
index 0de74e2f..a16bd19c 100644
--- a/src/main/java/kcc/kccadr/ojct/web/OjctWebController.java
+++ b/src/main/java/kcc/kccadr/ojct/web/OjctWebController.java
@@ -85,9 +85,13 @@ public class OjctWebController {
@Value("#{globalSettings['Globals.prod.islocal']}")
public void setIslocal(String path) { islocal = path; }
- //개발, local oz 저장 경로
- @Value("#{globalSettings['Globals.oz.devPath']}")
- private String ozDevPath;
+// //개발, local oz 저장 경로
+// @Value("#{globalSettings['Globals.oz.devPath']}")
+// private String ozDevPath;
+
+ //개발, local oz to pdf 저장 경로
+ @Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+ private String ozDevPdfSavePath;
/**
* 이의신청 목록 화면(사용자)
@@ -376,7 +380,11 @@ public class OjctWebController {
if("local".equals(islocal)) {
String ozrFilePath = "/admin/adrOjctReport.ozr";
String savePath = ojctVO.getAdrSeq() + "/adrOjctReport.pdf";
- savePath = ozDevPath + ojctVO.getAdrSeq() + "/adrOjctReport.pdf";
+ if(req.getServerName().contains("localhost")) {
+ savePath = ozDevPdfSavePath + ojctVO.getAdrSeq() + "/ozFile/adrOjctReport.pdf";
+ }else {
+ savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\" + ojctVO.getAdrSeq() + "\\ozFile\\adrOjctReport.pdf";
+ }
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
@@ -386,7 +394,7 @@ public class OjctWebController {
else{
String ozrFilePath = "/admin/adrOjctReport.ozr";
/*String savePath = ojctVO.getAdrSeq() + "/adrOjctReport.pdf";*/
- String savePath = "\\\\192.168.39.125\\data3\\out\\" + ojctVO.getAdrSeq() + "\\ozFile\\adrOjctReport.pdf";
+ String savePath = "\\\\192.168.39.130\\data\\out\\" + ojctVO.getAdrSeq() + "\\ozFile\\adrOjctReport.pdf";
String jsonData = repStr;
jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n"); //리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨
diff --git a/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java b/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java
index 7573974f..92c8abb6 100644
--- a/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java
+++ b/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java
@@ -39,12 +39,12 @@ public class OzSchdExportUtil {
String serverNm = request.getServerName();
if(serverNm.contains("localhost") || serverNm.contains("119.193.215.98") || serverNm.contains("iten.co.kr")) {
- ozApiUrl = "http://192.168.0.125:8091/oz80/server";
- ozApiIp = "192.168.0.125";
+// 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";
+ ozApiIp = "192.168.0.200";
+ ozApiUrl = "http://192.168.0.176:8086/oz80/server";
}else {
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp
index 95aa1557..5d2803b6 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp
@@ -950,6 +950,10 @@
" />
" />
" />
+ "/>
+ "/>
+ "/>
+ "/>