From a4af6edf60856353ec928b8454b68f61da1c6f52 Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 7 Jul 2025 17:08:42 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=ED=98=84=EC=9E=AC=20:=20[SPS=EA=B2=80?= =?UTF-8?q?=EC=B8=B5]=20=EC=9E=85=EB=A0=A5=20=EC=8B=9C=20=EB=8B=A8?= =?UTF-8?q?=EC=9C=84=EC=99=80=20=EB=AF=B8=EB=A6=AC=EB=B3=B4=EA=B8=B0=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EC=8B=9C=20=EB=8B=A8=EC=9C=84=EA=B0=80=20?= =?UTF-8?q?=EB=B6=88=EC=9D=BC=EC=B9=98=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../geoinfo/regi/common/CommonController.java | 68 +++++++++++++++++-- 1 file changed, 62 insertions(+), 6 deletions(-) diff --git a/src/main/java/geoinfo/regi/common/CommonController.java b/src/main/java/geoinfo/regi/common/CommonController.java index cce61805..f5299eba 100644 --- a/src/main/java/geoinfo/regi/common/CommonController.java +++ b/src/main/java/geoinfo/regi/common/CommonController.java @@ -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); + }