From 2e71fc8cd757edabdcb7b11fb896bae049301aa1 Mon Sep 17 00:00:00 2001 From: thkim Date: Fri, 13 Dec 2024 19:31:51 +0900 Subject: [PATCH] =?UTF-8?q?fixed:=20=EA=B8=B0=EB=B3=B8=EB=AC=BC=EC=84=B1?= =?UTF-8?q?=EC=8B=9C=ED=97=98=EC=9D=B4=20=EC=97=86=EB=8A=94=20=EC=82=AC?= =?UTF-8?q?=EC=97=85=20-999=EB=A1=9C=20=ED=91=9C=EA=B8=B0=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- list.txt | 13 +------ src/main/java/geoinfo/com/WebConfirm.java | 35 ++++++++++-------- .../main/community/CommunityController.java | 6 +-- .../geoinfo/regi/header/HeaderController.java | 5 +++ .../geoinfo/regi/info/InfoController.java | 7 +++- .../geoinfo/regi/info/service/InfoMapper.java | 5 ++- .../regi/info/service/InfoService.java | 2 + .../info/service/impl/InfoServiceImpl.java | 7 ++++ .../sqlmap/mapper/regi/info_SQL.xml | 11 ++++++ src/main/webapp/WEB-INF/views/web/index.jsp | 11 ------ .../webapp/WEB-INF/views/web/input/header.jsp | 32 +++++++++++++--- src/main/webapp/web/preview/HOLE.reb | Bin 578170 -> 579938 bytes src/main/webapp/web/service/HOLE.reb | Bin 578045 -> 575010 bytes src/main/webapp/web/service/SAMPLE.reb | Bin 51375 -> 51168 bytes 14 files changed, 85 insertions(+), 49 deletions(-) diff --git a/list.txt b/list.txt index aa1ed78c..96885196 100644 --- a/list.txt +++ b/list.txt @@ -1,13 +1,2 @@ #src\main\resources\egovframework\egovProps\globals.properties -src\main\webapp\WEB-INF\views\visitEducationApplication\inquiry\visitEducationApplicationInquiry.jsp -src\main\webapp\com\css\common.v2.0.css -src\main\webapp\com\img\visitEducationApplication\chevron.svg -src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Light.woff -src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Light.woff2 -#'입력중인프로젝트 현황'에서 '검수등록대기 목록'으로 이동 기능 추가 -src\main\webapp\WEB-INF\views\web\manage\list_reg.jsp -src\main\java\geoinfo\regi\listReg\ListRegController.java -src\main\java\geoinfo\regi\listReg\service\ListRegService.java -src\main\java\geoinfo\regi\listReg\service\impl\ListRegServiceImpl.java -src\main\java\geoinfo\regi\listReg\service\ListRegMapper.java -src\main\resources\egovframework\sqlmap\mapper\regi\listReg.xml \ No newline at end of file +src\main\webapp\web\service\SAMPLE.reb \ No newline at end of file diff --git a/src/main/java/geoinfo/com/WebConfirm.java b/src/main/java/geoinfo/com/WebConfirm.java index 145c0e40..9dbbb49d 100644 --- a/src/main/java/geoinfo/com/WebConfirm.java +++ b/src/main/java/geoinfo/com/WebConfirm.java @@ -27,18 +27,17 @@ public class WebConfirm WebUtil wUtil = new WebUtil(); - String user = "geoinfo"; - String pw = "geoinfo"; - //String pw = "dbnt060928!rlaxogh"; + //String user = "geoinfo"; + //String pw = "geoinfo"; //String url = "jdbc:oracle:thin:@192.168.0.71:1521:orcl"; /*String url = "jdbc:oracle:thin:@192.168.0.29:1521:xe";이전*/ //String url = "jdbc:oracle:thin:@218.232.234.200:1521:orageodev"; // 실서버 - String url = "jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV"; // DBNT 개발 서버 + //String url = "jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV"; // DBNT 개발 서버 //String url = "jdbc:oracle:thin:@grok-10:1521:ORAGEODEV"; // thkim local 개발 서버 - public String thkimTestOracleUrl = EgovProperties.getProperty("Oracle.Url"); - public String thkimTestOracleId = EgovProperties.getProperty("Oracle.ID"); - public String thkimTestOraclePassword = EgovProperties.getProperty("Oracle.Password"); + String url = EgovProperties.getProperty("Oracle.Url").trim(); + String user = EgovProperties.getProperty("Oracle.ID").trim(); + String pw = EgovProperties.getProperty("Oracle.Password").trim(); /* * public WebConfirm() { this.connection = null; this.connectionPool = null; @@ -47,16 +46,20 @@ public class WebConfirm */ public boolean ConfirmProject(HttpServletRequest request, final String PROJECT_CODE) { - System.out.println( - "\n--------------------------------------------------------------\n" + - request.getRequestURI() + " " + " ConfirmProject" + - "\n--------------------------------------------------------------\n" + - "thkimTestOracleUrl:[" + thkimTestOracleUrl + "]\n" + - "thkimTestOracleId:[" + thkimTestOracleId + "]\n" + - "thkimTestOraclePassword:[" + thkimTestOraclePassword + "]\n" + - "\n--------------------------------------------------------------\n" - ); + if( url == null || url.isEmpty() || user == null || user.isEmpty() || pw == null || pw.isEmpty() ) { + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " " + " ConfirmProject" + + "\n--------------------------------------------------------------\n" + + "url:[" + (url == null || url.isEmpty()) + "]\n" + + "user:[" + (user == null || user.isEmpty()) + "]\n" + + "pw:[" + (pw == null || pw.isEmpty()) + "]\n" + + "\n--------------------------------------------------------------\n" + ); + + } + try { Class.forName("oracle.jdbc.driver.OracleDriver"); connection = DriverManager.getConnection(url,user,pw); diff --git a/src/main/java/geoinfo/main/community/CommunityController.java b/src/main/java/geoinfo/main/community/CommunityController.java index cd257c8d..b6801fe5 100644 --- a/src/main/java/geoinfo/main/community/CommunityController.java +++ b/src/main/java/geoinfo/main/community/CommunityController.java @@ -295,11 +295,11 @@ public class CommunityController { @RequestMapping(value = "/cmuboard_read.do") public ModelAndView cmuboard_read(@RequestParam Map params, HttpServletRequest request, HttpServletResponse response, @RequestParam("id") int id) throws Exception { ModelAndView mv = new ModelAndView("body/cmuboard/cmuboard_read"); - + Map result = communityService.selectContent(id); - + if (result != null) { - if ((result.get("email") != null && result.get("name") != null)) { + if ( false && (result.get("email") != null && result.get("name") != null)) { mv.addObject("EM", "" + result.get("name") + ""); } else { mv.addObject("EM", result.get("name")); diff --git a/src/main/java/geoinfo/regi/header/HeaderController.java b/src/main/java/geoinfo/regi/header/HeaderController.java index 924b1c0d..41fb6a14 100644 --- a/src/main/java/geoinfo/regi/header/HeaderController.java +++ b/src/main/java/geoinfo/regi/header/HeaderController.java @@ -779,6 +779,11 @@ public class HeaderController { //INSERT TEMP_HEADER } + + //케이싱심도의 -(hyphen 값 입력을 허용한다. 케이싱심도값이 없는 경우, -999로 변환하여 저장한다. 왜냐하면 케이싱심도가 저장되는 column이 숫자만 들어가기 때문이다. + if( oHOLE_CASING_DEPTH.equals("-") ) { + oHOLE_CASING_DEPTH = "-999"; + } //PARAM SET params.put("PROJECT_CODE",oPROJECT_CODE ); diff --git a/src/main/java/geoinfo/regi/info/InfoController.java b/src/main/java/geoinfo/regi/info/InfoController.java index c3a5ed64..45142be0 100644 --- a/src/main/java/geoinfo/regi/info/InfoController.java +++ b/src/main/java/geoinfo/regi/info/InfoController.java @@ -422,7 +422,12 @@ public class InfoController { } } - + + if (oPROJECT_CODE != null && "".equals(oPROJECT_CODE) == false && oPROJECT_HOLE_NUMBER != null && "".equals(oPROJECT_HOLE_NUMBER) == false ) { + params.put("PROJECT_CODE", oPROJECT_CODE); + params.put("HOLE_NUMBER", oPROJECT_HOLE_NUMBER); + int nReturn = infoService.updateMetaHoleNumber(params); + } model.put("msg", "저장 성공"); } catch (ParseException e) { model.put("msg", "저장 실패"); diff --git a/src/main/java/geoinfo/regi/info/service/InfoMapper.java b/src/main/java/geoinfo/regi/info/service/InfoMapper.java index 04f52cc0..88e314d2 100644 --- a/src/main/java/geoinfo/regi/info/service/InfoMapper.java +++ b/src/main/java/geoinfo/regi/info/service/InfoMapper.java @@ -42,7 +42,10 @@ public interface InfoMapper { void updateTempExpertOpinion(HashMap params) throws Exception; - List getGDisCode(Map params); + List getGDisCode(Map params); + + int updateMetaHoleNumber(HashMap params) throws Exception; + } diff --git a/src/main/java/geoinfo/regi/info/service/InfoService.java b/src/main/java/geoinfo/regi/info/service/InfoService.java index 6a40469d..4dabc7b7 100644 --- a/src/main/java/geoinfo/regi/info/service/InfoService.java +++ b/src/main/java/geoinfo/regi/info/service/InfoService.java @@ -42,5 +42,7 @@ public interface InfoService { void updateTempExpertOpinion(HashMap params) throws Exception; List getGDisCode(Map params); + + public int updateMetaHoleNumber(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/regi/info/service/impl/InfoServiceImpl.java b/src/main/java/geoinfo/regi/info/service/impl/InfoServiceImpl.java index d90a426a..21f7b48b 100644 --- a/src/main/java/geoinfo/regi/info/service/impl/InfoServiceImpl.java +++ b/src/main/java/geoinfo/regi/info/service/impl/InfoServiceImpl.java @@ -103,4 +103,11 @@ public class InfoServiceImpl implements InfoService { public List getGDisCode(Map params) { return infoMapper.getGDisCode(params); } + + + @Override + public int updateMetaHoleNumber(HashMap params) throws Exception { + return infoMapper.updateMetaHoleNumber(params); + } + } diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/info_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/info_SQL.xml index 2f70a337..662f0cdc 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/info_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/info_SQL.xml @@ -276,4 +276,15 @@ AND DISTRICT = #{gdis} + + UPDATE + TEMP_META_INFO + SET + HOLE_NUMBER = #{HOLE_NUMBER} + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/web/index.jsp b/src/main/webapp/WEB-INF/views/web/index.jsp index 3424c17a..a301da35 100644 --- a/src/main/webapp/WEB-INF/views/web/index.jsp +++ b/src/main/webapp/WEB-INF/views/web/index.jsp @@ -247,14 +247,6 @@ function fn_help_tour(){ title:'Step 2', content: '프로젝트 목록이 조회 되며, 프로젝트명을 클릭하시면 해당 프로젝트를 조회 또는 입력하실 수 있습니다. ', target:'grid' - },{ - title:'Step 3', - content: '엑셀 업로드버튼을 클릭하시면 엑셀자료입력 페이지로 이동하여 표준 엑셀서식에 한꺼번에 작성하여 업로드하실 수 있습니다.', - target:'excel-btn' - },{ - title:'Step 4', - content: 'Font Download 버튼을 클릭하여 폰트를 컴퓨터에 설치하시면 입력서식의 폰트를 자연스럽게 보실 수 있습니다.', - target:'font-download' }], }); return false; @@ -352,9 +344,6 @@ function fn_help_tour(){
Total : ${fn:length(result)} 건
-
- Font Download -
diff --git a/src/main/webapp/WEB-INF/views/web/input/header.jsp b/src/main/webapp/WEB-INF/views/web/input/header.jsp index 4b58eb9d..dff7731e 100644 --- a/src/main/webapp/WEB-INF/views/web/input/header.jsp +++ b/src/main/webapp/WEB-INF/views/web/input/header.jsp @@ -114,9 +114,11 @@ function fn_save(rUrl){ if ($('#HOLE_TOTAL_DEPTH').val() && $('#HOLE_CASING_DEPTH').val()) { var _totalDepth = $('#HOLE_TOTAL_DEPTH').val(); var _casingDepth = $('#HOLE_CASING_DEPTH').val(); - + if( _casingDepth === '-' ) { + _casingDepth = -999; + } _totalDepth = parseFloat(_totalDepth); - _casingDepth = parseFloat(_casingDepth); + _casingDepth = Number(parseFloat(_casingDepth)); if (_totalDepth < _casingDepth) { alert('케이싱심도가 굴진심도보다 큽니다.'); @@ -138,11 +140,16 @@ function fn_save(rUrl){ {"id":"HOLE_LONG_M", "start_num":2, "end_num":0}, {"id":"HOLE_LONG_S", "start_num":2, "end_num":2}, {"id":"HOLE_TOTAL_DEPTH", "start_num":8, "end_num":2}, - {"id":"HOLE_CASING_DEPTH", "start_num":8, "end_num":2}, {"id":"HOLE_LAYER_NUM", "start_num":10, "end_num":0}, {"id":"HOLE_WL", "start_num":8, "end_num":2} ]; + if( _casingDepth !== -999) { + colInfo.push( + {"id":"HOLE_CASING_DEPTH", "start_num":8, "end_num":2} + ); + + } if(fn_saveNumberCheckHTML(colInfo) == false)return false; //표고, 지하수위 (음수 입력 가능) @@ -356,6 +363,20 @@ function is_checked(){ } +function casingDepthKeyupValidator() { + //케이싱심도 유효성 체크 + var holeCasingDepth = document.getElementById("HOLE_CASING_DEPTH"); + + holeCasingDepth.addEventListener("keyup", function(event) { + if (!(event.keyCode >= 37 && event.keyCode <= 40)) { + var inputVal = this.value.trim(); + if (inputVal !== '-') { + this.value = inputVal.replace(/[^0-9.]/gi, ''); + } + } + }); +} + window.onload = function() { if("${param.MAP_CFRM_YN}" == "Y"){ @@ -375,12 +396,13 @@ window.onload = function() { fn_onkeyNumber("HOLE_EL", "float02"); fn_onkeyNumber("HOLE_WL", "float"); fn_onkeyNumber("HOLE_TOTAL_DEPTH", "float"); - fn_onkeyNumber("HOLE_CASING_DEPTH", "float"); fn_onkeyNumber("HOLE_LAYER_NUM", "int"); fn_onkeyNumber("PROJECT_START_DATE", "int"); fn_onkeyNumber("PROJECT_START_DATE", "int"); fn_onkeyNumber("PROJECT_START_DATE", "int"); + casingDepthKeyupValidator(); + /* //지자체'L_DIS','M_DIS' if('${sd}' != null && '${sd}' != ''){ @@ -1479,7 +1501,7 @@ function fn_HoleLoad(){ 케이싱심도(m) (-) : - m (케이싱심도 ≤ 굴진심도) + m (케이싱심도 ≤ 굴진심도) diff --git a/src/main/webapp/web/preview/HOLE.reb b/src/main/webapp/web/preview/HOLE.reb index 06c20fb129be2e03add7667ea1e56c72fc629247..aad259626933907e4be0a4a0f3a38c3bb582333e 100644 GIT binary patch delta 2798 zcmchYXH-+^7KTYei6BL4KtPZxNRa@B0X4{gNsy6V7M6h0TS7qkgd)-vJRw1)20;-d z3@rjm7c5jkN{}iwqGJI@lrj!88O6EIy}$0Sv-a8FyPxlU*Iws*ydgJLE?1U^0F_lx z5q&!VH9Z($hJ+Fi);jBQhL1Iq${g&Qt6}B}_KKsc_EscG;~})piz(&m3)0Di#y$0s zJOlovMyhwB2?y8FcC9|E1!QN{7GJPM%j@C(huVd9Mcgw3UHD?w(}*Toyg^fl;m@xQ z%wcD1&j1xr2Amy3&Bx8{JZfo`8Y%(`2bW!l)bD}aez?nh=pC+#k8oi6ipHuVVfZ6l zbP_G>MAR-KNKL9s#-DrNG3Y`)uR|>9gX;;7XquaBBB+a!O8%x~C;#llkvqY)&J`hI zN^}rkl>by}O-`9~xJzacz;LZi-*?(cJ#5y~jo2EC`1omOq9ZD^d&XI4I;N+a<&0XH zu72rS^bk(j*T7cX!dy2)s1Ial#<3*T5k3)WXvK0Wa$*cq!%eQ34_q5sl^@H2DKRE6 zWyU0tM{Ua3h`$%Z_mR6~5iZcATKJ6TB*&wy2lXxhap2-bZY`H4K`r<> zRy0y@MVT9zLlLYS*YSqOhuRhQE(Uw46SDQd<29zKZ{2tvc=$Hu2L&z&zEsV*8SCb5 zrVnH^F(EvK$S_V`*fr5}EMQsNqngX|oC-B7ud0PH!rhV*n+df&)Ar67Y7byxB`i}{ zle|o$VP`?urQK22Y3Jm8FO8|Wt8yjk7IA6J_mP271dMp`qrY-hnirC>dbNdAM9rRQ zN}+hIi1&K+O=Dhl@!GWZ80{9rV|V;my>0 z6I01mh6veAvFtQm6J4+(`z;N8#70lzecG?MQwoySc+9sPE3FS<4`VzJ2wxDi;tV1l z_4qFbg{2>Y^n)^KasaOZ42wBDBNiftz9yD(zcTCBdw4m71o|Z!WvaF$0$~olv3-|e zXXig>%fGg;k}7>Uvgl1o^^UaTB5Wm-k{^CPo!kGhUN^I&MR1MfZt?xe{=CAv`e(UM zMr*M;JV4elO`sF0NmOZgVKV6Tqk-oKcnGTHK^UuksefA04$tPps%s5<)epTu5;xaf zsO>W;sL59OljdU!G(Uk)>PF7o-pG{(Xre>WOICen?l-iUOBLRv-KjXE#gZwY;#yIE zorVgPBvn8MvYO5G8l=>vFtQ}7h@0H zK|!IQ)_caY8T%@L`zUwloQ7I&fd0A#poYdmZ^by@TEcIh+0s4X%Y=q_fMuf&P&uz#}J3Kvas9l zw~h1s`1_~`qzPj?=ao4O7&S!!RVdsSJG|yt={xn<4}@i$gqZqJ7l{Z zUUM1Zgb$;_MO32aiF=}VtOahL^z;a3IB=A)ksl;+dk^0NYY(V+rSRLNo_cKnXXIy8 z51*pZuf|1ZJeFIVRj_R$SZN&$>J#7kHNJT zOtkw&2W_ky!B#T5nw>-SHzHwu4y@dE+#%Z8kyP1eTaY#mXYvP#aV4Ooz4pJ0-Ca}& z{x+)R92!~D^I|-Znk%Dx3ECcZ*qXaHaL;}H#X;yNY6QOr zOHT!BN4&Di4`xJJ>voA>KPZSaddv_>Sv(o7l&tw6@bpgUJTkQ}$OF9dufG}9G0Le_ zOxvUc@Uey=U0s;MLKq|&5ba<>h^5T-_}KNOn~cZJocsFE21%%>GKApGX1?lsnSAG= zpvHvPg;76eAPnYIBPE;dS~~6mYBry@`v)29&6mpr>yoi3rF?}l1;jAfXO^=eb!6Og zIapKmm5S^76+ON&3u{UCVX>6@ff!RSg6u9Qw?VkZ&{JpE=;F=>(>kB3l#iO{pUFxt}P(8uUe@TBncux(X@f! z=@CufQ)H0S7e4kM{O>fodbv!vzN6eCex)t3&&6Tha?mkvIh9)fpXfi5|1*c<&wmH1>NYz7 delta 2513 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 X!sW3G+AP!grB2vo-v96A@j2yxboIQN delta 14070 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 VV59sqUU@i!I{@8a*Dn38{{n!{YFz*T diff --git a/src/main/webapp/web/service/SAMPLE.reb b/src/main/webapp/web/service/SAMPLE.reb index 15f61401489d338cd8596948f1942d314a5cac8a..7319f900d21c8ea405d212a02adce040bb96bf00 100644 GIT binary patch delta 688 zcmZ2Kk@-PC^M*1D#*EG77MocEPO85%o^z=1!OfV5pK4ADv+mfv??y#L=?bOAd@rP% zc=PYxeEjC^GqII%b2i>n)w(|a;e~agdG*(B&$_rQd69H~+YTqoJ(4-8-(Nm$Xb>pM z`#pJ*g@(hlKf%I|eH|W5f=3)WdbtDlepC%ej5u^5P4t8Q%`MFerkf%cZdsEyDLHlH zCN|H%ua8!W?VHIcIAcxGEvAbrTx~YbveRN?6rX(5rD?KoyW!-?u74QyCr@zOHF>g+ z<>re%_n0SVduIWK0?HC5oB2dQg*{lns$wRW1?C|O6@=|W=1y>nnJgBQfG!l5n1e2~ zDJ=zE=wEgbx==(RipGGl9mpy`PW)00bD|r|U$s^pO<+#S$_) delta 934 zcmaFR&%Ayj^M*1DMupAg7Moe?9h3HMe)@IqiMv|b9cv07${89sm-wCDH1~Z$tg1{% zq1W!N5{g~|)W9DYyU|?WaQ*?{z;tJQz zAMK>s7^Nrkx;BX$h%o{s48=HsBm;wy7#G8TAh4ReuFZ7v0oOl_hLh{VVkS$v$1(r4 z;+VYN$C~xK9R~yB<_+#1EKtc%pBOYrhjh4Pe_$Ri$$i)*_DAo*E&*~#WMU3($;D|Y zxFw%v7vYvPEyQDNeHkAA?X1R>bYq!3rQsi=`sT@ve2mcWTG%v=85raiZB@8}eDk_C zLq=ebK4@Qu=Fko9=}epTx}Sq&#d>kb-ejEo!J7l9!fg^E6=l;2saQ6Lkcw*y38`RP jPDq8>8bT`4HWE@XZ5tsK$9CgW!3K<~Kbzkl{KyIbOjKn1