DBNT
/
geoinfo_eGov_work
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 장바구니 사용법 안내추가

main
thkim 2025-04-10 16:42:43 +09:00
parent f73b31ce57
commit 3c4ef38e71
12 changed files with 921 additions and 830 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
list.txt
View File

@ -1,7 +1,11 @@
#src\main\resources\egovframework\egovProps\globals.properties #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\java\geoinfo\regi\manageList\ManageExcelUploadProc01Controller.java #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_step00.jsp
#src\main\webapp\WEB-INF\views\web\input\excel_step31.jsp #src\main\webapp\WEB-INF\views\web\input\excel_step31.jsp
src\main\webapp\js\map\main\map.js 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
src\main\webapp\WEB-INF\views\web\manage\createZip.jsp
src\main\java\geoinfo\regi\basicInfo\BasicController.java
src\main\webapp\WEB-INF\views\web\input\basic\labInfoFieldPressuremeter.jsp
src\main\webapp\js\map\main\left\left.js

1
open_css.bat Normal file
View File

@ -0,0 +1 @@
explorer .\src\main\webapp\com\css\sass

34
src/main/java/geoinfo/drilling/common/DrillingCommonController.java
View File

@ -1,47 +1,17 @@
package geoinfo.drilling.common; package geoinfo.drilling.common;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.annotation.Resource; import java.util.HashMap;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.jfree.util.Log;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.ModelAndView;
import egovframework.rte.psl.dataaccess.util.EgovMap;
import geoinfo.com.WebConfirm;
import geoinfo.map.mapControl.service.MapControlService;
import geoinfo.regi.selectClassInfo.service.SelectClassService;
import geoinfo.regi.status.service.RegiPageService;
import geoinfo.regi.util.exportGeotechnicalPointShp2;
import ictway.comm.util.parseData;
import ictway.comm.util.strUtil;
import ictway.comm.web.WebUtil;
import ictway.whois.whoisSMS;
@Controller @Controller
public class DrillingCommonController { public class DrillingCommonController {

26
src/main/java/geoinfo/regi/basicInfo/BasicController.java
View File

@ -5,6 +5,7 @@ import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -49,6 +50,7 @@ import geoinfo.regi.basicInfo.service.BasicService;
import geoinfo.regi.common.service.CommonService; import geoinfo.regi.common.service.CommonService;
import geoinfo.regi.selectClassInfo.service.SelectClassService; import geoinfo.regi.selectClassInfo.service.SelectClassService;
import geoinfo.regi.status.RegiController; import geoinfo.regi.status.RegiController;
import geoinfo.util.MyUtil;
import ictway.comm.util.strUtil; import ictway.comm.util.strUtil;
import ictway.comm.web.WebUtil; import ictway.comm.web.WebUtil;
@ -1048,8 +1050,30 @@ public class BasicController {
params.put("reportType", oREPORT_TYPE); params.put("reportType", oREPORT_TYPE);
List<EgovMap> items = basicService.selectTempFieldPressuremeter(params); List<EgovMap> items = basicService.selectTempFieldPressuremeter(params);
Iterator<EgovMap> iteratorItems = items.iterator();
List<EgovMap> newItems = new ArrayList<>();
// Iterator를 사용하여 리스트의 요소들을 순회할 수 있습니다.
while (iteratorItems.hasNext()) {
EgovMap item = iteratorItems.next();
String key = "fieldpresInspectedBy";
Object itemValue = item.get(key);
if( itemValue != null ) {
item.put(key, MyUtil.getStringFromObject( itemValue ).replaceAll("\t", "") );
}
key = "fieldpresCheckedBy";
itemValue = item.get(key);
if( itemValue != null ) {
item.put(key, MyUtil.getStringFromObject( itemValue ).replaceAll("\t", "") );
}
newItems.add(item);
}
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("items", items); json.put("items", newItems);
model.put("params", params); model.put("params", params);
model.put("items", items); model.put("items", items);

1
src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp
View File

@ -80,6 +80,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
<p class="check-title">기관명이 없을 시, 연락 바랍니다. 연락처: <span class="contact-tel">031-995-0934</span></p> <p class="check-title">기관명이 없을 시, 연락 바랍니다. 연락처: <span class="contact-tel">031-995-0934</span></p>
</div> </div>
<button class="btn-green" type="button">엑셀자료입력</button> <button class="btn-green" type="button">엑셀자료입력</button>
<button class="btn-green btn-excel-download" type="button">엑셀 양식 다운로드</button>
</div> </div>
<div id="table-container"> <div id="table-container">
</div> </div>

108
src/main/webapp/WEB-INF/views/home/index.jsp
View File

@ -390,7 +390,7 @@
<div class="status-count-box"> <div class="status-count-box">
<span class="count-title">시추정보 보유현황</span> <span class="count-title">시추정보 보유현황</span>
<div class="value-group"> <div class="value-group">
<span class="status-count"><fmt:formatNumber value="390197" pattern="#,###" />공 <span style="font-size : 12px; vertical-align: middle; line-height: 50px;">(2023년 12월 31일 기준)</span></span> <span class="status-count"><fmt:formatNumber value="422552" pattern="#,###" />공 <span style="font-size : 12px; vertical-align: middle; line-height: 50px;">(2024년 12월 기준)</span></span>
<a href="#status-id" class="btn status-btn">자세히보기</a> <a href="#status-id" class="btn status-btn">자세히보기</a>
</div> </div>
</div> </div>
@ -646,7 +646,7 @@
<div class="contents-title"><span class="contents-title-text">시추정보 DB 구축 현황</span></div> <div class="contents-title"><span class="contents-title-text">시추정보 DB 구축 현황</span></div>
<div class="provision-box"> <div class="provision-box">
<span class="textR comma-number hole">390197</span><span>의 시추정보DB가 구축되어 있습니다.(2023년 12월 31일 기준)</span> <span class="textR comma-number hole">422552</span><span>의 시추정보DB가 구축되어 있습니다.(2024년 12월 기준)</span>
</div> </div>
<h3 class="page-title-3depth marT10 padB10"><span>발주처별 구축현황</span></h3> <h3 class="page-title-3depth marT10 padB10"><span>발주처별 구축현황</span></h3>
@ -674,24 +674,24 @@
<td class="td-head" rowspan="17">국토교통부</td> <td class="td-head" rowspan="17">국토교통부</td>
<td class="td-head" rowspan="7">소속기관</td> <td class="td-head" rowspan="7">소속기관</td>
<td class="td-head">서울지방국토관리청</td> <td class="td-head">서울지방국토관리청</td>
<td class="t-right"><span class="comma-number hole">9493</span></td> <td class="t-right"><span class="comma-number hole">9783</span></td>
<td rowspan="8">국토교통부 보유</td> <td rowspan="8">국토교통부 보유</td>
</tr> </tr>
<tr> <tr>
<td class="td-head">부산지방국토관리청</td> <td class="td-head">부산지방국토관리청</td>
<td class="t-right"><span class="comma-number hole">22772</span></td> <td class="t-right"><span class="comma-number hole">23075</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">대전지방국토관리청</td> <td class="td-head">대전지방국토관리청</td>
<td class="t-right"><span class="comma-number hole">17020</span></td> <td class="t-right"><span class="comma-number hole">17088</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">익산지방국토관리청</td> <td class="td-head">익산지방국토관리청</td>
<td class="t-right"><span class="comma-number hole">14563</span></td> <td class="t-right"><span class="comma-number hole">14705</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">원주지방국토관리청</td> <td class="td-head">원주지방국토관리청</td>
<td class="t-right"><span class="comma-number hole">6178</span></td> <td class="t-right"><span class="comma-number hole">6263</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">행정중심복합도시건설청</td> <td class="td-head">행정중심복합도시건설청</td>
@ -703,48 +703,48 @@
</tr> </tr>
<tr> <tr>
<td class="td-head td-total" colspan="2">합계</td> <td class="td-head td-total" colspan="2">합계</td>
<td class="t-right"><span class="comma-number hole">72117</span></td> <td class="t-right"><span class="comma-number hole">73005</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head" rowspan="7">산하기관</td> <td class="td-head" rowspan="7">산하기관</td>
<td class="td-head">한국토지주택공사</td> <td class="td-head">한국토지주택공사</td>
<td class="t-right"><span class="comma-number hole">94879</span></td> <td class="t-right"><span class="comma-number hole">96764</span></td>
<td rowspan="9">국토교통부 보유</td> <td rowspan="9">국토교통부 보유</td>
</tr> </tr>
<tr> <tr>
<td class="td-head">한국도로공사</td> <td class="td-head">한국도로공사</td>
<td class="t-right"><span class="comma-number hole">37399</span></td> <td class="t-right"><span class="comma-number hole">39137</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">한국수자원공사</td> <td class="td-head">한국수자원공사</td>
<td class="t-right"><span class="comma-number hole">7013</span></td> <td class="t-right"><span class="comma-number hole">8163</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">한국철도시설공단</td> <td class="td-head">한국철도시설공단</td>
<td class="t-right"><span class="comma-number hole">24208</span></td> <td class="t-right"><span class="comma-number hole">26351</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">한국수력원자력</td> <td class="td-head">한국수력원자력</td>
<td class="t-right"><span class="comma-number hole">227</span></td> <td class="t-right"><span class="comma-number hole">279</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">한국공항공사</td> <td class="td-head">한국공항공사</td>
<td class="t-right"><span class="comma-number hole">94공</span></td> <td class="t-right"><span class="comma-number hole">246</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">한국철도공사</td> <td class="td-head">한국철도공사</td>
<td class="t-right"><span class="comma-number hole">519</span></td> <td class="t-right"><span class="comma-number hole">537</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head td-total" colspan="2">합계</td> <td class="td-head td-total" colspan="2">합계</td>
<td class="t-right"><span class="comma-number hole">164491</span></td> <td class="t-right"><span class="comma-number hole">171477</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head td-total" colspan="2">국토교통부 및 산하기관 총 합계</td> <td class="td-head td-total" colspan="2">국토교통부 및 산하기관 총 합계</td>
<td class="t-right"><span class="comma-number hole">236608</span></td> <td class="t-right"><span class="comma-number hole">244482</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head" rowspan="20">해양수산부</td> <td class="td-head" rowspan="21">해양수산부</td>
<tr> <tr>
<td class="td-head">직속</td> <td class="td-head">직속</td>
<td class="td-head">어촌어항과</td> <td class="td-head">어촌어항과</td>
@ -753,8 +753,8 @@
</tr> </tr>
<td class="td-head" rowspan="11">소속기관</td> <td class="td-head" rowspan="11">소속기관</td>
<td class="td-head">부산항만청</td> <td class="td-head">부산항만청</td>
<td class="t-right"><span class="comma-number hole">2501</span></td> <td class="t-right"><span class="comma-number hole">2592</span></td>
<td rowspan="18">해양수산부 보유</td> <td rowspan="19">해양수산부 보유</td>
</tr> </tr>
<tr> <tr>
<td class="td-head">인천항만청</td> <td class="td-head">인천항만청</td>
@ -762,7 +762,7 @@
</tr> </tr>
<tr> <tr>
<td class="td-head">여수항만청</td> <td class="td-head">여수항만청</td>
<td class="t-right"><span class="comma-number hole">1131</span></td> <td class="t-right"><span class="comma-number hole">1160</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">울산항만청</td> <td class="td-head">울산항만청</td>
@ -770,7 +770,7 @@
</tr> </tr>
<tr> <tr>
<td class="td-head">포항항만청</td> <td class="td-head">포항항만청</td>
<td class="t-right"><span class="comma-number hole">406</span></td> <td class="t-right"><span class="comma-number hole">414</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">목포항만청</td> <td class="td-head">목포항만청</td>
@ -790,29 +790,33 @@
</tr> </tr>
<tr> <tr>
<td class="td-head">대산항만청</td> <td class="td-head">대산항만청</td>
<td class="t-right"><span class="comma-number hole">226</span></td> <td class="t-right"><span class="comma-number hole">235</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">평택항만청</td> <td class="td-head">평택항만청</td>
<td class="t-right"><span class="comma-number hole">793</span></td> <td class="t-right"><span class="comma-number hole">841</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head td-total" colspan="2">합계</td> <td class="td-head td-total" colspan="2">합계</td>
<td class="t-right"><span class="comma-number hole">11125</span></td> <td class="t-right"><span class="comma-number hole">11310</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head" rowspan="4">산하기관</td> <td class="td-head" rowspan="5">산하기관</td>
<td class="td-head">부산항만공사</td> <td class="td-head">부산항만공사</td>
<td class="t-right"><span class="comma-number hole">603</span></td> <td class="t-right"><span class="comma-number hole">603</span></td>
</tr> </tr>
<tr>
<td class="td-head">경기평택항만공사</td>
<td class="t-right"><span class="comma-number hole">52</span></td>
</tr>
<tr> <tr>
<td class="td-head">울산항만공사</td> <td class="td-head">울산항만공사</td>
<td class="t-right"><span class="comma-number hole">245</span></td> <td class="t-right"><span class="comma-number hole">245</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">인천항만공사</td> <td class="td-head">인천항만공사</td>
<td class="t-right"><span class="comma-number hole">407</span></td> <td class="t-right"><span class="comma-number hole">417</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">여수광양항만공사</td> <td class="td-head">여수광양항만공사</td>
@ -820,104 +824,104 @@
</tr> </tr>
<tr> <tr>
<td class="td-head td-total" colspan="2">합계</td> <td class="td-head td-total" colspan="2">합계</td>
<td class="t-right"><span class="comma-number hole">1431</span></td> <td class="t-right"><span class="comma-number hole">1441</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head td-total" colspan="2">해양수산부 및 산하기관 총 합계</td> <td class="td-head td-total" colspan="2">해양수산부 및 산하기관 총 합계</td>
<td class="t-right"><span class="comma-number hole">12556</span></td> <td class="t-right"><span class="comma-number hole">12751</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head" rowspan="18">지자체</td> <td class="td-head" rowspan="18">지자체</td>
<td class="td-head" rowspan="8">광역자치단체</td> <td class="td-head" rowspan="8">광역자치단체</td>
<td class="td-head">서울특별시</td> <td class="td-head">서울특별시</td>
<td class="t-right"><span class="comma-number hole">17410</span></td> <td class="t-right"><span class="comma-number hole">17948</span></td>
<td rowspan="17">-</td> <td rowspan="17">-</td>
</tr> </tr>
<tr> <tr>
<td class="td-head">부산광역시</td> <td class="td-head">부산광역시</td>
<td class="t-right"><span class="comma-number hole">5364</span></td> <td class="t-right"><span class="comma-number hole">5666</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">대구광역시</td> <td class="td-head">대구광역시</td>
<td class="t-right"><span class="comma-number hole">3024</span></td> <td class="t-right"><span class="comma-number hole">3218</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">인천광역시</td> <td class="td-head">인천광역시</td>
<td class="t-right"><span class="comma-number hole">2012</span></td> <td class="t-right"><span class="comma-number hole">2199</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">광주광역시</td> <td class="td-head">광주광역시</td>
<td class="t-right"><span class="comma-number hole">1118</span></td> <td class="t-right"><span class="comma-number hole">1236</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">대전광역시</td> <td class="td-head">대전광역시</td>
<td class="t-right"><span class="comma-number hole">532</span></td> <td class="t-right"><span class="comma-number hole">612</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">울산광역시</td> <td class="td-head">울산광역시</td>
<td class="t-right"><span class="comma-number hole">867</span></td> <td class="t-right"><span class="comma-number hole">1012</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">세종특별자치시</td> <td class="td-head">세종특별자치시</td>
<td class="t-right"><span class="comma-number hole">315</span></td> <td class="t-right"><span class="comma-number hole">328</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head" rowspan="9">기초자치단체</td> <td class="td-head" rowspan="9">기초자치단체</td>
<td class="td-head">경기도</td> <td class="td-head">경기도</td>
<td class="t-right"><span class="comma-number hole">9954</span></td> <td class="t-right"><span class="comma-number hole">10211</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">강원도</td> <td class="td-head">강원특별자치도</td>
<td class="t-right"><span class="comma-number hole">4161</span></td> <td class="t-right"><span class="comma-number hole">4754</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">충청남도</td> <td class="td-head">충청남도</td>
<td class="t-right"><span class="comma-number hole">3050</span></td> <td class="t-right"><span class="comma-number hole">3182</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">충청북도</td> <td class="td-head">충청북도</td>
<td class="t-right"><span class="comma-number hole">1341</span></td> <td class="t-right"><span class="comma-number hole">1530</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">경상남도</td> <td class="td-head">경상남도</td>
<td class="t-right"><span class="comma-number hole">2182</span></td> <td class="t-right"><span class="comma-number hole">2320</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">경상북도</td> <td class="td-head">경상북도</td>
<td class="t-right"><span class="comma-number hole">2632</span></td> <td class="t-right"><span class="comma-number hole">2976</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">전라남도</td> <td class="td-head">전라남도</td>
<td class="t-right"><span class="comma-number hole">4764</span></td> <td class="t-right"><span class="comma-number hole">5759</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">전라북도</td> <td class="td-head">전북특별자치도</td>
<td class="t-right"><span class="comma-number hole">733</span></td> <td class="t-right"><span class="comma-number hole">821</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">제주특별자치도</td> <td class="td-head">제주특별자치도</td>
<td class="t-right"><span class="comma-number hole">227</span></td> <td class="t-right"><span class="comma-number hole">247</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head td-total" colspan="2">지자체 총 합계</td> <td class="td-head td-total" colspan="2">지자체 총 합계</td>
<td class="t-right"><span class="comma-number hole">59634</span></td> <td class="t-right"><span class="comma-number hole">64019</span></td>
<td>-</td> <td>-</td>
</tr> </tr>
<tr> <tr>
<td class="td-head">행정안전부</td> <td class="td-head">행정안전부</td>
<td class="td-head" colspan="2">재난관리책임기관</td> <td class="td-head" colspan="2">재난관리책임기관</td>
<td class="t-right"><span class="comma-number hole">12492</span></td> <td class="t-right"><span class="comma-number hole">14250</span></td>
<td>-</td> <td>-</td>
</tr> </tr>
<tr> <tr>
<td class="td-head" colspan="3">민간기관</td> <td class="td-head" colspan="3">민간기관</td>
<td class="t-right"><span class="comma-number hole">68907</span></td> <td class="t-right"><span class="comma-number hole">87050</span></td>
<td>-</td> <td>-</td>
</tr> </tr>
<tr> <tr>
<td class="td-head td-total" colspan="3">전체 총 합계</td> <td class="td-head td-total" colspan="3">전체 총 합계</td>
<td class="t-right"><span class="comma-number hole">390197</span></td> <td class="t-right"><span class="comma-number hole">422552</span></td>
<td>-</td> <td>-</td>
</tr> </tr>
</tbody> </tbody>

2
src/main/webapp/WEB-INF/views/web/input/header.jsp
View File

@ -1696,7 +1696,7 @@ function fn_HoleLoad(){
<tr> <tr>
<th class="td-head">케이싱심도(m) </th> <th class="td-head">케이싱심도(m) </th>
<td colspan="3">(-) : <td colspan="3">(-) :
<input name="HOLE_CASING_DEPTH" id="HOLE_CASING_DEPTH" type="text" style="width:200px;" maxlength="11" value="${mapHeader.holeCasingDepth == -999 ? '-' : mapHeader.holeCasingDepth}" valid="notnull" validNm="케이싱심도"/> m (케이싱심도 ≤ 굴진심도) <span style="color:blue">[값이 없는 경우, <span style="color:red; "> - </span>(하이픈) 입력]</span> <input name="HOLE_CASING_DEPTH" id="HOLE_CASING_DEPTH" type="text" style="width:200px;" maxlength="11" value="${mapHeader.holeCasingDepth == -999 ? '-' : mapHeader.holeCasingDepth}" valid="notnull" validNm="케이싱심도"/> m (케이싱심도 ≤ 굴진심도) <span style="color:blue">[값이 없는 경우, <span style="color:red; font-size: 28px;"> - </span>(하이픈) 입력]</span>
</td> </td>
</tr> </tr>
<tr> <tr>

127
src/main/webapp/WEB-INF/views/web/manage/createZip.jsp
View File

@ -15,11 +15,12 @@
<%@page import="java.nio.file.Files"%> <%@page import="java.nio.file.Files"%>
<%@page import="java.nio.file.Path"%> <%@page import="java.nio.file.Path"%>
<%@page import="java.nio.file.Paths"%> <%@page import="java.nio.file.Paths"%>
<%@page import="java.util.Date"%>
<%@page import="geoinfo.regi.util.CompressZip"%> <%@page import="geoinfo.regi.util.CompressZip"%>
<%@page import="egovframework.com.cmm.service.EgovProperties"%> <%@page import="egovframework.com.cmm.service.EgovProperties"%>
<% <%
String propertyPath = request.getSession().getServletContext().getRealPath("/") + File.separator + "WEB-INF" + File.separator + "clipreport4" + File.separator + "clipreport4.properties"; String propertyPath = request.getSession().getServletContext().getRealPath("/") + File.separator + "WEB-INF" + File.separator + "clipreport4" + File.separator + "clipreport4.properties";
out.clear(); out.clear();
out = pageContext.pushBody(); out = pageContext.pushBody();
@ -624,12 +625,36 @@ if(("Y").equals(waterpressure)){
oof.addConnectionData("*", "oracle1"); oof.addConnectionData("*", "oracle1");
file = oof.addFile("reb.root", realPath+"web\\service\\FIELD_WATERPRESSURE.reb"); file = oof.addFile("reb.root", realPath+"web\\service\\FIELD_WATERPRESSURE.reb");
if( waterpressureCnt != waterpressureImageCnt ) {
String strTxt =
"---------- BUG REPORTING START ----------" + "\n" +
"에러 문구:[" + "waterpressureCnt:" + waterpressureCnt + " != waterpressureImageCnt:" + waterpressureImageCnt + " " + "]" + "\n" +
"new Date().toString():[" + new Date().toString() + "]\n" + "\n" +
"---------- BUG REPORTING END ----------" + "\n" +
"";
System.out.println(strTxt);
}
for(int i=0; i<waterpressureCnt; i++){ for(int i=0; i<waterpressureCnt; i++){
if( waterpressureImage.length -1 < i ) {
String strTxt =
"---------- BUG REPORTING START ----------" + "\n" +
"에러 문구:[" + "waterpressureImage[" + i + "] is null" + " " + "]" + "\n" +
"projectCode:[" + projectCode == null ? "null" : projectCode + "]\n" + "\n" +
"waterpressureHolecode[" + i + "]:[" + waterpressureHolecode[i] == null ? "null" : waterpressureHolecode[i] + "]\n" + "\n" +
"waterpressureCode[" + i + "]:[" + waterpressureCode[i] == null ? "null" : waterpressureCode[i] + "]\n" + "\n" +
"new Date().toString():[" + new Date().toString() + "]\n" + "\n" +
"---------- BUG REPORTING END ----------" + "\n" +
"";
System.out.println(strTxt);
imagePath = null;
} else {
if("noImage".equals(waterpressureImage[0]) || "noImage".equals(waterpressureImage[i])){ if("noImage".equals(waterpressureImage[0]) || "noImage".equals(waterpressureImage[i])){
imagePath = Path + "/web/images/no_image.png"; imagePath = Path + "/web/images/no_image.png";
}else{ }else{
imagePath = Path + "/files/web/CH/" + projectCode + "/" + waterpressureHolecode[i] + "/WATERPRESSURE/" + waterpressureImage[i]; imagePath = Path + "/files/web/CH/" + projectCode + "/" + waterpressureHolecode[i] + "/WATERPRESSURE/" + waterpressureImage[i];
} }
}
file.addField("project_code", projectCode); file.addField("project_code", projectCode);
file.addField("hole_code", waterpressureHolecode[i]); file.addField("hole_code", waterpressureHolecode[i]);
@ -1918,63 +1943,73 @@ if (!Folder.exists()) {
}else { }else {
} }
System.out.println("zipPath----------"+zipPath); System.out.println("zipPath----------" + zipPath);
System.out.println("fileCreatePathZip+zipFilep----------"+fileCreatePathZip+zipFile); System.out.println("fileCreatePathZip+zipFilep----------" + fileCreatePathZip + zipFile);
System.out.println("savePath----------"+savePath); System.out.println("savePath----------" + savePath);
try { try {
compressZip.compress(zipPath,savePath, zipFile);
// 대상 파일 경로 생성
File targetFile = new File(savePath + zipFile);
// 파일이 존재하는지 확인 후 삭제
if (targetFile.exists()) {
if (targetFile.delete()) {
System.out.println("기존 파일 삭제 성공: " + targetFile.getAbsolutePath());
} else {
System.err.println("기존 파일 삭제 실패: " + targetFile.getAbsolutePath());
}
}
compressZip.compress(zipPath, savePath, zipFile);
out.println("압축 성공!"); out.println("압축 성공!");
} catch (IOException e) { } catch (IOException e) {
out.println("압축 실패 (IOException): " + e.getMessage()); out.println("압축 실패 (IOException): " + e.getMessage());
e.printStackTrace(); // 콘솔 또는 로그에 에러 메시지 출력 (디버깅에 유용) e.printStackTrace(); // 콘솔 또는 로그에 에러 메시지 출력 (디버깅에 유용)
} catch (NullPointerException e) { } catch (NullPointerException e) {
out.println("압축 실패 (NullPointerException): " + e.getMessage()); out.println("압축 실패 (NullPointerException): " + e.getMessage());
e.printStackTrace(); e.printStackTrace();
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
out.println("압축 실패 (IllegalArgumentException): " + e.getMessage()); out.println("압축 실패 (IllegalArgumentException): " + e.getMessage());
e.printStackTrace(); e.printStackTrace();
} catch (Exception e) { // 그 외의 예외 } catch (Exception e) { // 그 외의 예외
out.println("압축 실패 (기타 예외): " + e.getMessage()); out.println("압축 실패 (기타 예외): " + e.getMessage());
e.printStackTrace(); e.printStackTrace();
} }
//클라이언트로 파일을 내릴 때
//String fileName = projectCode+"_Service.zip";
//response.setContentType("application/octet-stream; charset=UTF-8");
//response.setHeader("Content-Disposition", "attachment; filename=" + fileName + ";");
//OutputStream fileStream = response.getOutputStream();
/*
//클라이언트로 파일을 내릴 때 option = new PDFOption();
//String fileName = projectCode+"_Service.zip"; option.setUserPassword("사용자(읽기) 암호");
//response.setContentType("application/octet-stream; charset=UTF-8"); option.setOwnerPassword("저자(쓰기) 암호");
//response.setHeader("Content-Disposition", "attachment; filename=" + fileName + ";"); option.setTextToImage(true); // 글자를 이미지로 처리 - unicode 처리시 사용
//OutputStream fileStream = response.getOutputStream(); option.setNumCopies(1); // 프린팅 매수 미리 설정
option.setImportOriginImage(true); // 원본 이미지 삽입
/* option.setNotAllowCopy(true); //text복사 방지 (1.0.0.84 version 부터 적용)
option = new PDFOption(); option.setEditable(false); // 편집 허용 여부 (1.0.0.173 version 부터 적용)
option.setUserPassword("사용자(읽기) 암호");
option.setOwnerPassword("저자(쓰기) 암호");
option.setTextToImage(true); // 글자를 이미지로 처리 - unicode 처리시 사용
option.setNumCopies(1); // 프린팅 매수 미리 설정
option.setImportOriginImage(true); // 원본 이미지 삽입
option.setNotAllowCopy(true); //text복사 방지 (1.0.0.84 version 부터 적용)
option.setEditable(false); // 편집 허용 여부 (1.0.0.173 version 부터 적용)
*/
/* int statusType = ClipReportExport.createExportForPDF(request, fileStream, propertyPath, oof, splitPage, fileNames, option);
*/ */
/* System.out.println("값확인request----------"+request); /* int statusType = ClipReportExport.createExportForPDF(request, fileStream, propertyPath, oof, splitPage, fileNames, option);
System.out.println("값확인fileStream----------"+fileStream); */
System.out.println("값확인propertyPath----------"+propertyPath);
System.out.println("값확인oof----------"+oof);
System.out.println("값확인splitPage----------"+splitPage);
System.out.println("값확인fileNames----------"+fileNames);
System.out.println("option----------"+option);
System.out.println("값확인----------"+statusType); */
//statusType == 0 정상적인 출력
//statusType == 1 인스톨 오류
//statusType == 2 oof 문서 오류
//statusType == 3 리포트 엔진 오류
//statusType == 4 PDF 출력 오류
//statusType == 5 리포트의 페이지 0 일 경우 오류
response.sendRedirect("/manageList.do"); /* System.out.println("값확인request----------"+request);
System.out.println("값확인fileStream----------"+fileStream);
System.out.println("값확인propertyPath----------"+propertyPath);
System.out.println("값확인oof----------"+oof);
System.out.println("값확인splitPage----------"+splitPage);
System.out.println("값확인fileNames----------"+fileNames);
System.out.println("option----------"+option);
System.out.println("값확인----------"+statusType); */
//statusType == 0 정상적인 출력
//statusType == 1 인스톨 오류
//statusType == 2 oof 문서 오류
//statusType == 3 리포트 엔진 오류
//statusType == 4 PDF 출력 오류
//statusType == 5 리포트의 페이지 0 일 경우 오류
response.sendRedirect("/manageList.do");
%> %>

23
src/main/webapp/com/css/common.v2.0.css
View File

@ -6038,6 +6038,29 @@ ul.faq-q > li textarea {
float: right; float: right;
margin-bottom: 10px; margin-bottom: 10px;
} }
.drilling .btn-excel-download {
padding: 4px 14px 4px 46px;
position: relative;
font-size: 14px;
height: 34px;
font-weight: bold;
box-sizing: border-box;
background-color: #19b3e5;
border: 1px solid #19b3e5;
color: #fff;
margin-right: 10px;
}
.drilling .btn-excel-download::before {
display: inline-block;
position: absolute;
top: 3px;
left: 12px;
content: "";
background: url(/com/img/common/icon/ico_parallax_btn_06_dark.png) no-repeat 50% 50%;
background-size: contain;
width: 26px;
height: 26px;
}
.drilling .table-scrollable { .drilling .table-scrollable {
border-top: 2px solid #114672; border-top: 2px solid #114672;
border-bottom: 1px solid #114672; border-bottom: 1px solid #114672;

2
src/main/webapp/com/css/common.v2.0.css.map
View File

File diff suppressed because one or more lines are too long

24
src/main/webapp/com/css/sass/common.v2.0.scss
View File

@ -4248,6 +4248,29 @@ ul.faq-q > li textarea {
float:right; float:right;
margin-bottom: 10px; margin-bottom: 10px;
} }
.btn-excel-download {
padding: 4px 14px 4px 46px;
position: relative;
font-size: 14px;
height: 34px;
font-weight: bold;
box-sizing: border-box;
background-color: #19b3e5;
border:1px solid #19b3e5;
color: #fff;
margin-right: 10px;
&::before {
display: inline-block;
position: absolute;
top: 3px;
left: 12px;
content: "";
background: url(/com/img/common/icon/ico_parallax_btn_06_dark.png) no-repeat 50% 50%;
background-size: contain;
width: 26px;
height: 26px;
}
}
.table-scrollable { .table-scrollable {
border-top: 2px solid #114672; border-top: 2px solid #114672;
border-bottom: 1px solid #114672; border-bottom: 1px solid #114672;
@ -4391,6 +4414,7 @@ ul.faq-q > li textarea {
} }
} }
/* ====================================== */ /* ====================================== */
// 발주 기관 - 건설현장 등록 끝 // 발주 기관 - 건설현장 등록 끝

11
src/main/webapp/js/map/main/left/left.js
View File

@ -1024,13 +1024,18 @@ function showCartInfo() {
} }
//cart 시추 add //cart 시추 add
function addCartSich(){ function addCartSich(){
var size = $('input[name=totalGrid]:checked').length; var checkedTotalGridEle = $('input[name=totalGrid]:checked');
var size = checkedTotalGridEle.length;
if( size == 0 ) {
alert("선택된 프로젝트가 없습니다. '통합 검색'에서 '검색'버튼을 눌러서 원하시는 프로젝트 검색 후 '검색 결과'에서 체크하여 프로젝트를 담아주세요.");
return false;
}
var sichHole =""; var sichHole ="";
for(var i =0; i < size; i++){ for(var i =0; i < size; i++){
if(i == 0){ if(i == 0){
sichHole = $('input[name=totalGrid]:checked')[i].value; sichHole = checkedTotalGridEle[i].value;
}else{ }else{
sichHole += ","+$('input[name=totalGrid]:checked')[i].value; sichHole += ","+checkedTotalGridEle[i].value;
} }
} }