From 8bdc50fefcd8b885e30afa0ad0d0cda14523ac81 Mon Sep 17 00:00:00 2001 From: thkim Date: Tue, 13 Aug 2024 14:23:06 +0900 Subject: [PATCH] =?UTF-8?q?ffixed:=20=EC=9E=85=EB=A0=A5=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?=EB=8B=A8=EC=9C=84=20=EB=B6=88=EC=9D=BC=EC=B9=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../geoinfo/regi/common/CommonController.java | 34 ++++++++++++++++++- .../service/impl/CommonServiceImpl.java | 3 +- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/main/java/geoinfo/regi/common/CommonController.java b/src/main/java/geoinfo/regi/common/CommonController.java index 904c4128..26f111ef 100644 --- a/src/main/java/geoinfo/regi/common/CommonController.java +++ b/src/main/java/geoinfo/regi/common/CommonController.java @@ -15,6 +15,8 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.json.JSONObject; + import com.clipsoft.clipreport.oof.OOFDocument; import com.clipsoft.clipreport.oof.OOFFile; import com.clipsoft.clipreport.server.service.ReportUtil; @@ -30,7 +32,7 @@ import ictway.comm.web.WebUtil; @Controller public class CommonController { - + @Resource(name ="commonService") private CommonService masterService; @@ -305,6 +307,36 @@ public class CommonController { file6.addField("project_code", projectCode); file6.addField("hole_code", downholeHolecode[i]); file6.addField("image1", imagePath); + + + params.put("TEST_INFO_CODE", "DOWNHOLE"); + params.put("HOLE_CODE", downholeHolecode[i]); + + + // 전단탄성계수의 단위를 구한다. + params.put("INI_UNIT", "N/㎡"); + params.put("ITEM_INFO_CODE", "DH_SHEAR_MODULUS"); + String dhShearmodulus = masterService.getInfoUnit(params); + + // 영률의 단위를 구한다. + params.replace("INI_UNIT", "N/㎡"); + params.replace("ITEM_INFO_CODE", "DH_YOUNGS_MODULUS"); + String dhYoungsModulus = masterService.getInfoUnit(params); + + // 밀도의 단위를 구한다. + params.replace("INI_UNIT", "g/㎥"); + params.replace("ITEM_INFO_CODE", "DH_DENSITY"); + String dhDensity = masterService.getInfoUnit(params); + + // 구한 단위를 JSON에 넣는다. + JSONObject jsonObject = new JSONObject(); + jsonObject.put(downholeHolecode[i] + "_DH_SHEAR_MODULUS", dhShearmodulus ); + jsonObject.put(downholeHolecode[i] + "_DH_YOUNGS_MODULUS", dhYoungsModulus ); + jsonObject.put(downholeHolecode[i] + "_DH_DENSITY", dhDensity ); + + String referenceMap = jsonObject.toString(); + + file6.addField("reference_map", referenceMap); } } diff --git a/src/main/java/geoinfo/regi/common/service/impl/CommonServiceImpl.java b/src/main/java/geoinfo/regi/common/service/impl/CommonServiceImpl.java index 906d678f..23f8a44b 100644 --- a/src/main/java/geoinfo/regi/common/service/impl/CommonServiceImpl.java +++ b/src/main/java/geoinfo/regi/common/service/impl/CommonServiceImpl.java @@ -269,7 +269,8 @@ public class CommonServiceImpl implements CommonService { @Override public String getInfoUnit(Map params) throws Exception { - if(commonMapper.getInfoUnit(params) == null) { + EgovMap res = commonMapper.getInfoUnit(params); + if( res == null) { return (String)params.get("INI_UNIT"); }else { return (String)((commonMapper.getInfoUnit(params)).get("referenceDese"));