DBNT
/
geoinfo_eGov_work
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 현재 : [SPS검층] 입력 시 단위와 미리보기 출력 시 단위가 불일치 개선

main
thkim 2025-07-07 17:08:42 +09:00
parent 34964aca84
commit a4af6edf60
1 changed files with 62 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/main/java/geoinfo/regi/common/CommonController.java
View File

@ -256,6 +256,33 @@ public class CommonController {
file4.addField("project_code", projectCode);
file4.addField("hole_code", boreholeWaveHolecode[i]);
file4.addField("image1", imagePath);
params.put("TEST_INFO_CODE", "BOREHOLE_WAVE");
params.put("HOLE_CODE", boreholeWaveHolecode[i]);
// 전단탄성계수 단위를 구한다.
params.put("INI_UNIT", "N/㎡");
params.put("ITEM_INFO_CODE", "BH_SHEAR_MODULUS");
String bhShearModulus = masterService.getInfoUnit(params);
// 영률 단위를 구한다.
params.put("INI_UNIT", "N/㎡");
params.put("ITEM_INFO_CODE", "BH_YOUNGS_MODULUS");
String bhYoungsModulus = masterService.getInfoUnit(params);
// 밀도 단위를 구한다.
params.replace("INI_UNIT", "g/㎥");
params.replace("ITEM_INFO_CODE", "BH_DENSITY");
String bhDensity = masterService.getInfoUnit(params);
// 구한 단위를 JSON에 넣는다.
JSONObject jsonObject = new JSONObject();
jsonObject.put(boreholeWaveHolecode[i] + "_BH_SHEAR_MODULUS", bhShearModulus );
jsonObject.put(boreholeWaveHolecode[i] + "_BH_YOUNGS_MODULUS", bhYoungsModulus );
jsonObject.put(boreholeWaveHolecode[i] + "_BH_DENSITY", bhDensity );
String referenceMap = jsonObject.toString();
file4.addField("reference_map", referenceMap);
}
}
if(tableName.equals("TEMP_DENSITY")) {
@ -308,7 +335,7 @@ public class CommonController {
file6.addField("hole_code", downholeHolecode[i]);
file6.addField("image1", imagePath);
params.put("TEST_INFO_CODE", "DOWNHOLE");
params.put("HOLE_CODE", downholeHolecode[i]);
@ -1358,12 +1385,41 @@ public class CommonController {
imagePath = Path + "/files/web/CH/" + projectCode + "/" + boreholeWaveHolecode[i] + "/BOREHOLE_WAVE/" + boreholeWaveImage[i];
}
OOFFile file35 = oof.addFile("reb.root", realPath+"web\\service\\BOREHOLE_WAVE.reb");
file35.addConnectionData("*", "oracle1");
OOFFile file35 = oof.addFile("reb.root", realPath+"web\\service\\BOREHOLE_WAVE.reb");
file35.addConnectionData("*", "oracle1");
file35.addField("project_code", projectCode);
file35.addField("hole_code", boreholeWaveHolecode[i]);
file35.addField("image1", imagePath);
file35.addField("project_code", projectCode);
file35.addField("hole_code", boreholeWaveHolecode[i]);
file35.addField("image1", imagePath);
params.put("TEST_INFO_CODE", "BOREHOLE_WAVE");
params.put("HOLE_CODE", boreholeWaveHolecode[i]);
// 전단탄성계수 단위를 구한다.
params.put("INI_UNIT", "N/㎡");
params.put("ITEM_INFO_CODE", "BH_SHEAR_MODULUS");
String bhShearModulus = masterService.getInfoUnit(params);
// 영률 단위를 구한다.
params.put("INI_UNIT", "N/㎡");
params.put("ITEM_INFO_CODE", "BH_YOUNGS_MODULUS");
String bhYoungsModulus = masterService.getInfoUnit(params);
// 밀도 단위를 구한다.
params.replace("INI_UNIT", "g/㎥");
params.replace("ITEM_INFO_CODE", "BH_DENSITY");
String bhDensity = masterService.getInfoUnit(params);
// 구한 단위를 JSON에 넣는다.
JSONObject jsonObject = new JSONObject();
jsonObject.put(boreholeWaveHolecode[i] + "_BH_SHEAR_MODULUS", bhShearModulus );
jsonObject.put(boreholeWaveHolecode[i] + "_BH_YOUNGS_MODULUS", bhYoungsModulus );
jsonObject.put(boreholeWaveHolecode[i] + "_BH_DENSITY", bhDensity );
String referenceMap = jsonObject.toString();
file35.addField("reference_map", referenceMap);
}