Compare commits
2 Commits
V202511110
...
feature/20
| Author | SHA1 | Date | |
|---|---|---|---|
| 2e79be6170 | |||
| ac79263ab5 |
@@ -1793,7 +1793,9 @@ public class PartMngService extends BaseService {
|
||||
String path = CommonUtils.checkNull(fileMap.get("FILE_PATH"));
|
||||
String fileName = CommonUtils.checkNull(fileMap.get("SAVED_FILE_NAME"));
|
||||
|
||||
FileInputStream fis = new FileInputStream(path+"\\"+fileName);
|
||||
// OS에 관계없이 올바른 경로 생성
|
||||
File excelFile = new File(path, fileName);
|
||||
FileInputStream fis = new FileInputStream(excelFile);
|
||||
XSSFWorkbook workBook = new XSSFWorkbook(fis);
|
||||
XSSFSheet sheet = workBook.getSheetAt(0);
|
||||
HashMap partMap = new HashMap();
|
||||
@@ -2786,7 +2788,10 @@ public class PartMngService extends BaseService {
|
||||
HashMap fileMap = (HashMap)fileList.get(0);
|
||||
String path = CommonUtils.checkNull(fileMap.get("FILE_PATH"));
|
||||
String fileName = CommonUtils.checkNull(fileMap.get("SAVED_FILE_NAME"));
|
||||
FileInputStream fis = new FileInputStream(path+"\\"+fileName);
|
||||
|
||||
// OS에 관계없이 올바른 경로 생성
|
||||
File excelFile = new File(path, fileName);
|
||||
FileInputStream fis = new FileInputStream(excelFile);
|
||||
//XSSFWorkbook workBook = new XSSFWorkbook(fis);
|
||||
//FormulaEvaluator formulaEval = workBook.getCreationHelper().createFormulaEvaluator();
|
||||
//XSSFSheet sheet = workBook.getSheetAt(0);
|
||||
@@ -3212,7 +3217,8 @@ public class PartMngService extends BaseService {
|
||||
BufferedReader br = null;
|
||||
|
||||
try {
|
||||
File csvFile = new File(path + "\\" + fileName);
|
||||
// OS에 관계없이 올바른 경로 생성
|
||||
File csvFile = new File(path, fileName);
|
||||
|
||||
// 인코딩 자동 감지: UTF-8 → CP949 → EUC-KR 순서로 시도
|
||||
String detectedEncoding = detectFileEncoding(csvFile);
|
||||
@@ -3589,8 +3595,9 @@ public class PartMngService extends BaseService {
|
||||
return resultList;
|
||||
}
|
||||
|
||||
// Excel 파일인 경우
|
||||
FileInputStream fis = new FileInputStream(path+"\\"+fileName);
|
||||
// Excel 파일인 경우 - OS에 관계없이 올바른 경로 생성
|
||||
File excelFile = new File(path, fileName);
|
||||
FileInputStream fis = new FileInputStream(excelFile);
|
||||
|
||||
Workbook workBook = null;
|
||||
if (fileName.endsWith(".xls") || fileName.endsWith(".XLS")) {
|
||||
@@ -3805,13 +3812,15 @@ public class PartMngService extends BaseService {
|
||||
System.out.println("projectNo:"+projectNo);
|
||||
if(null != fileList && 1 == fileList.size()){
|
||||
HashMap fileMap = (HashMap)fileList.get(0);
|
||||
|
||||
String path = CommonUtils.checkNull(fileMap.get("FILE_PATH"));
|
||||
String fileName = CommonUtils.checkNull(fileMap.get("SAVED_FILE_NAME"));
|
||||
|
||||
String path = CommonUtils.checkNull(fileMap.get("FILE_PATH"));
|
||||
String fileName = CommonUtils.checkNull(fileMap.get("SAVED_FILE_NAME"));
|
||||
|
||||
//boolean isLoggingBoolean = false;
|
||||
|
||||
FileInputStream fis = new FileInputStream(path+"\\"+fileName);
|
||||
// OS에 관계없이 올바른 경로 생성
|
||||
File excelFile = new File(path, fileName);
|
||||
FileInputStream fis = new FileInputStream(excelFile);
|
||||
//XSSFWorkbook workBook = new XSSFWorkbook(fis);
|
||||
//FormulaEvaluator formulaEval = workBook.getCreationHelper().createFormulaEvaluator();
|
||||
//XSSFSheet sheet = workBook.getSheetAt(0);
|
||||
@@ -4162,7 +4171,9 @@ public class PartMngService extends BaseService {
|
||||
String path = CommonUtils.checkNull(fileMap.get("FILE_PATH"));
|
||||
String fileName = CommonUtils.checkNull(fileMap.get("SAVED_FILE_NAME"));
|
||||
|
||||
FileInputStream fis = new FileInputStream(path+"\\"+fileName);
|
||||
// OS에 관계없이 올바른 경로 생성
|
||||
File excelFile = new File(path, fileName);
|
||||
FileInputStream fis = new FileInputStream(excelFile);
|
||||
|
||||
Workbook workBook = null;
|
||||
if (fileName.endsWith(".xls") || fileName.endsWith(".XLS")) {
|
||||
|
||||
Reference in New Issue
Block a user