From 0c27c57d90b69c7e165eca4ccce32b3b86684017 Mon Sep 17 00:00:00 2001 From: thkim Date: Fri, 28 Feb 2025 17:06:48 +0900 Subject: [PATCH] =?UTF-8?q?feat:=EC=A0=95=EB=B3=B4=EB=B3=B4=EA=B8=B0?= =?UTF-8?q?=EB=A5=BC=20=EC=8B=9C=EC=B6=94=EA=B3=B5=20=EC=83=81=EC=84=B8?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=EB=A1=9C=20=EA=B8=B0=EB=8A=A5=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- list.txt | 11 +- .../regi/basicInfo/BasicController.java | 20 +++- .../ManageExcelUploadProc01Controller.java | 7 +- src/main/webapp/WEB-INF/views/map/index.jsp | 10 +- .../input/basic/labInfoSlickensideInfo.jsp | 104 ++++++++++++++++-- .../WEB-INF/views/web/input/excel_step31.jsp | 4 +- .../WEB-INF/views/web/manage/createZip.jsp | 49 ++++++++- src/main/webapp/com/css/common.v2.0.css | 2 +- src/main/webapp/com/css/common.v2.0.css.map | 2 +- src/main/webapp/com/css/sass/common.v2.0.scss | 5 +- src/main/webapp/js/map/main/main.js | 65 +++++++++++ src/main/webapp/kendo-ui/js/common.js | 23 +++- src/main/webapp/web/js/common.js | 2 +- src/main/webapp/web/preview/HOLE.reb | Bin 581034 -> 581626 bytes src/main/webapp/web/rex/holeForMap.reb | Bin 581799 -> 578764 bytes .../web/service/SOIL_CLASSIFICATION.reb | Bin 126546 -> 126549 bytes 16 files changed, 269 insertions(+), 35 deletions(-) diff --git a/list.txt b/list.txt index fd1672a5..904d104f 100644 --- a/list.txt +++ b/list.txt @@ -1,4 +1,9 @@ #src\main\resources\egovframework\egovProps\globals.properties -src\main\webapp\com\css\common.v2.0.css -src\main\webapp\com\css\common.v2.0.css.map -src\main\webapp\WEB-INF\views\home\index.jsp \ No newline at end of file +#src\main\webapp\com\css\common.v2.0.css +#src\main\webapp\com\css\common.v2.0.css.map +#src\main\java\geoinfo\regi\manageList\ManageExcelUploadProc01Controller.java +#src\main\webapp\WEB-INF\views\web\input\excel_step00.jsp +#src\main\webapp\WEB-INF\views\web\input\excel_step31.jsp +src\main\webapp\WEB-INF\views\map\index.jsp +src\main\webapp\WEB-INF\views\map\projectSearch\projectSearch.jsp +src\main\webapp\js\map\main\main.js \ No newline at end of file diff --git a/src/main/java/geoinfo/regi/basicInfo/BasicController.java b/src/main/java/geoinfo/regi/basicInfo/BasicController.java index 121978b2..f94ca225 100644 --- a/src/main/java/geoinfo/regi/basicInfo/BasicController.java +++ b/src/main/java/geoinfo/regi/basicInfo/BasicController.java @@ -514,13 +514,27 @@ public class BasicController { NodeList nSLICKENSIDE_AVG = data.getElementsByTagName("slickensideAvg"); NodeList nSLICKENSIDE_ROUGH = data.getElementsByTagName("slickensideRough"); + final String defaultNA = "-999"; + String slickensideMax = wUtil.isNullNode(nSLICKENSIDE_MAX); + if( slickensideMax.equals("-") == true ) { + slickensideMax = defaultNA; + } + String slickensideMin = wUtil.isNullNode(nSLICKENSIDE_MIN); + if( slickensideMin.equals("-") == true ) { + slickensideMin = defaultNA; + } + String slickensideAvg = wUtil.isNullNode(nSLICKENSIDE_AVG); + if( slickensideAvg.equals("-") == true ) { + slickensideAvg = defaultNA; + } + params.put("slickensideDepthFrom", wUtil.isNullNode(nSLICKENSIDE_DEPTH_FROM)); params.put("slickensideDepthTo", wUtil.isNullNode(nSLICKENSIDE_DEPTH_TO)); params.put("slickensideDirection", wUtil.isNullNode(nSLICKENSIDE_DIRECTION)); params.put("slickensideAngle", wUtil.isNullNode(nSLICKENSIDE_ANGLE)); - params.put("slickensideMax", wUtil.isNullNode(nSLICKENSIDE_MAX)); - params.put("slickensideMin", wUtil.isNullNode(nSLICKENSIDE_MIN)); - params.put("slickensideAvg", wUtil.isNullNode(nSLICKENSIDE_AVG)); + params.put("slickensideMax", slickensideMax); + params.put("slickensideMin", slickensideMin); + params.put("slickensideAvg", slickensideAvg); params.put("slickensideRough", wUtil.isNullNode(nSLICKENSIDE_ROUGH)); params.put("userId", request.getSession().getAttribute("USERID")); diff --git a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc01Controller.java b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc01Controller.java index e7a3f999..f0738720 100644 --- a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc01Controller.java +++ b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc01Controller.java @@ -835,7 +835,12 @@ public class ManageExcelUploadProc01Controller { public HashMap subStep01_upload02(RsWrapper excelWp, HashMap params) throws Exception{ String resultMsg = ""; - String _projNm = excelWp.get("col1",0).trim(); + String _projNm = excelWp.get("col1",0); + if( _projNm == null ) { + throw new Exception( "프로젝트명이 존재하지 않습니다" ); + } else { + _projNm = _projNm.trim(); + } String _projCdNm1 = excelWp.get("col1",1).trim(); String _projCdNm2 = excelWp.get("col3",1).trim(); String _gongsaNm = excelWp.get("col1",2).trim(); diff --git a/src/main/webapp/WEB-INF/views/map/index.jsp b/src/main/webapp/WEB-INF/views/map/index.jsp index e13b5767..cdf9a039 100644 --- a/src/main/webapp/WEB-INF/views/map/index.jsp +++ b/src/main/webapp/WEB-INF/views/map/index.jsp @@ -31,13 +31,13 @@ src="${pageContext.request.contextPath}/js/map/main/download.min.js"> + src="${pageContext.request.contextPath}/js/map/main/main.js?v=20250224"> + src="${pageContext.request.contextPath}/js/map/main/map.js?v=20250224"> + src="${pageContext.request.contextPath}/js/map/main/left/left.js?v=20250224"> + src="${pageContext.request.contextPath}/js/map/main/design.js?v=20250224">