diff --git a/src/main/java/seed/com/gtm/base/OzReportController.java b/src/main/java/seed/com/gtm/base/OzReportController.java index d6998259..5b743382 100644 --- a/src/main/java/seed/com/gtm/base/OzReportController.java +++ b/src/main/java/seed/com/gtm/base/OzReportController.java @@ -52,6 +52,10 @@ public class OzReportController { @Value("#{globalSettings['gw.url']}") private String gwUrl; + + @Value("#{globalSettings['oz.ozServerNm']}") + private String ozServerNm; + public void setSessionMessageRemove(HttpSession session){ session.removeAttribute("sSiteIdx"); @@ -1779,7 +1783,9 @@ public class OzReportController { List> fileList = fileService.fileList(paramMap); String imgFileSrc = ""; if (fileList.size() > 0) { - imgFileSrc = "/site/case/upload/uploadFiles/trublchargermng2/" + fileList.get(0).get("EXTRA_FILE_RENAME").toString(); + //imgFileSrc = "/site/case/upload/uploadFiles/trublchargermng2/" + fileList.get(0).get("EXTRA_FILE_RENAME").toString(); + //imgFileSrc = "https://fairnet.kofair.or.kr/seed/extra/down/file.do?dataIdx=38657&funcType=trublchargermng&pathKey1=case"; + imgFileSrc = ozServerNm + "/seed/extra/down/file.do?dataIdx=" + fileList.get(0).get("EXTRA_FILE_IDX") + "&funcType=" + fileList.get(0).get("EXTRA_FUNC_TYPE") + "&pathKey1=case"; } //!!!! diff --git a/src/main/java/seed/com/gtm/seedfile/SeedFileController.java b/src/main/java/seed/com/gtm/seedfile/SeedFileController.java index bf923504..1e27d148 100644 --- a/src/main/java/seed/com/gtm/seedfile/SeedFileController.java +++ b/src/main/java/seed/com/gtm/seedfile/SeedFileController.java @@ -223,7 +223,7 @@ public class SeedFileController { String pathKey2 = SeedUtils.setReplaceNull(paramMap.get("pathKey2")); String funcType = SeedUtils.setReplaceNull(paramMap.get("funcType")); - if(funcType.equals("trublchargermng")){ + if(funcType.equals("trublchargermng") || funcType.equals("trublchargermng2")){ /*rootPath = seedProperties.getConfigValue("root.path");*/ rootPath = globalRootPath; } @@ -271,7 +271,7 @@ public class SeedFileController { } - if(funcType.equals("trublchargermng")){ + if(funcType.equals("trublchargermng") || funcType.equals("trublchargermng2")){ filePath = rootPath + "/" + pathKey1 + "/upload/uploadFiles/"+funcType+"/"+pathKey2; }else{ filePath = rootPath + "/" + pathKey1 + "/"+funcType+"/"+pathKey2; @@ -280,7 +280,7 @@ public class SeedFileController { Map fileList = service.fileOne(paramMap); fileReName = SeedUtils.setReplaceNull(fileList.get("EXTRA_FILE_RENAME")); fileName = SeedUtils.setReplaceNull(fileList.get("EXTRA_FILE_NAME")); - if(funcType.equals("trublchargermng")){ + if(funcType.equals("trublchargermng") || funcType.equals("trublchargermng2")){ filePath = rootPath + "/" + pathKey1 + "/upload/uploadFiles/"+funcType+"/"+pathKey2; }else{ filePath = rootPath + "/" + pathKey1 + "/"+funcType+"/"+pathKey2;