From 34964aca84778016b79c6778194b449ff917d930 Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 7 Jul 2025 16:12:50 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20[=ED=86=A0=EC=82=AC=EC=8B=9C=ED=97=98-?= =?UTF-8?q?=EC=9D=BC=EC=B6=95]=20=EB=8B=A8=EC=9C=84=EC=A4=91=EB=9F=89,=20?= =?UTF-8?q?=EC=9D=BC=EC=B6=95=EC=95=95=EC=B6=95=EA=B0=95=EB=8F=84=EC=9D=98?= =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=20=EB=8B=A8=EC=9C=84=EC=99=80=20=EB=AF=B8?= =?UTF-8?q?=EB=A6=AC=EB=B3=B4=EA=B8=B0=20=EC=B6=9C=EB=A0=A5=20=EB=8B=A8?= =?UTF-8?q?=EC=9C=84=20=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 | 20 ++++++++++++++++++ .../webapp/web/preview/SOIL_UNCONFINED.reb | Bin 83629 -> 83096 bytes 2 files changed, 20 insertions(+) diff --git a/src/main/java/geoinfo/regi/common/CommonController.java b/src/main/java/geoinfo/regi/common/CommonController.java index 26f111ef..cce61805 100644 --- a/src/main/java/geoinfo/regi/common/CommonController.java +++ b/src/main/java/geoinfo/regi/common/CommonController.java @@ -1180,6 +1180,26 @@ public class CommonController { file25.addField("hole_code", unconfineHolecode[i]); file25.addField("sample_code", unconfineSamplecode[i]); file25.addField("image1", imagePath1); + + // 단위중량의 단위를 구한다. + params.put("INI_UNIT", "kN/㎥"); + params.put("ITEM_INFO_CODE", "UNCONF_UNDISTURB_RT"); + String unconfUndisturbRt = masterService.getInfoUnit(params); + + + // 압축강도의 단위를 구한다. + params.replace("INI_UNIT", "kPa"); + params.replace("ITEM_INFO_CODE", "UNCONF_UNDISTURB_COMPSTRENGTH"); + String unconfUndisturbCompstrength = masterService.getInfoUnit(params); + + // 구한 단위를 JSON에 넣는다. + JSONObject jsonObject = new JSONObject(); + jsonObject.put(unconfineHolecode[i] + "_UNCONF_UNDISTURB_RT", unconfUndisturbRt ); + jsonObject.put(unconfineHolecode[i] + "_UNCONF_UNDISTURB_COMPSTRENGTH", unconfUndisturbCompstrength ); + + String referenceMap = jsonObject.toString(); + + file25.addField("reference_map", referenceMap); } } if(tableName.equals("TEMP_HOLE")) { diff --git a/src/main/webapp/web/preview/SOIL_UNCONFINED.reb b/src/main/webapp/web/preview/SOIL_UNCONFINED.reb index 450588add3377ab86e3e946c80b3d60e0da327ca..e0b5b43b5ff6eb6ace0409efc1f211c89bd2540c 100644 GIT binary patch delta 1069 zcmZ46%Q~Zzb%UxuqxfVs|EB3v^%xB&fARmrs6Y8*z@Ev z@_|;C$-l$HKyr%{XERMc7oWcA{6j{tY}lj)0+XF%JwTF^6K5-J{tz1n)3-V)4q4A; zh4tl(lh-6>Fs~2;Sq9enI~}G~XY-~E8JJe>TokRS)>RjQ^+4TnZL|Hi0>;fg8$V&FeG87k^nv{< zG`aOO$iE;BKTd<=0vHU?@QayjcM&E8c9Otm(`#Z(;NXdwyy8X-viZ=k`F0mQ6ecS? zh6Mw1AZEQlR|raBOWtA=z4r;5sKgI!qCtOQqHZkHm6;eJu^BUc8WSVTFG$Xq{*0Xw zrXD6dU4WMni;Jg631KJ&I(hmOaje4UWUvZzC}9v1}LCVPpa(^66r_j8))_ zJN=F>qcl+9hc08&c3@7{g=ET@>GB3}r}{HZ=dokt+b(X*_#BaEr>C02P1a!AtXHbU WG~LPys6uVKk~Pql?V2`>EnEOAF{*C> delta 1599 zcmbQy$-1_eb%Uxuqx57o|0Zz*F-8Uk217AUAj!aBB*w+?9|)`_>s6XgzUlvm(QtCY zov_It>e(hctY(>P78t|)*NS8Egg|T7?{*vvjGF_i7cg$l4(4J(Qfbi2GWl9~7^=#} zfz?c#IaBX3PS&r_0xM3NEE4O1s%UaxwbJJ8v2ifd9-QKuT$U7tst9V52NTqk9qE{+ z=xk2SkU=)(Q4V%fP~4+Zgk}=hD$6W4rp>R*jxYj)Y(oXkAls~0X~+n2Qq>Mr_X5Mn z1MHNll*#|F@alOJsL!lfc+GRN)|+>%}gGH^*k&7N@-(`=yg5>IJBoHt#8 zk&$Kct5dim4WdHr0;UQ#md*dKs6kRND0^{DZo7^vr0%T4a3~^9Cp^R_d*B&9*$=Pr z$trxrCmZk$pKQZ#9J2Qrr>z}!7ug^>|6bU<-Djg1k98KAU0-GCdfbb%!Ou&LxGh<|CW>nuU RWC?UFq@>?2V#V0P1pvO3EEfO(