main
parent
a1c0555040
commit
79a787d884
27
list.txt
27
list.txt
|
|
@ -1,28 +1,7 @@
|
|||
#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
|
||||
# 일축압축 첨부 파일 하나 씩 올리면 에러나는 버그 수정중.. 2025-01-06 18:01
|
||||
src\main\webapp\WEB-INF\views\web\input\uniaxial\rockUniaxial.jsp
|
||||
#건설현장 입력
|
||||
src\main\webapp\WEB-INF\views\drilling\input\drilling_input.jsp
|
||||
src\main\java\geoinfo\drilling\input\DrillingInputController.java
|
||||
src\main\java\geoinfo\drilling\input\service\DrillingInputMapper.java
|
||||
src\main\resources\egovframework\sqlmap\mapper\drilling\input\DrillingInputMapper.xml
|
||||
src\main\java\geoinfo\main\login\service\impl\LoginServiceImpl.java
|
||||
src\main\java\geoinfo\main\login\service\LoginMapper.java
|
||||
src\main\resources\egovframework\sqlmap\mapper\main\Login_SQL.xml
|
||||
src\main\webapp\WEB-INF\views\web\input\header.jsp
|
||||
src\main\webapp\web\js\common.js
|
||||
src\main\java\geoinfo\regi\projectList\ProjectListController.java
|
||||
src\main\java\geoinfo\regi\projectList\service\ProjectListService.java
|
||||
src\main\java\geoinfo\regi\projectList\service\impl\ProjectListServiceImpl.java
|
||||
src\main\java\geoinfo\regi\projectList\service\ProjectListMapper.java
|
||||
src\main\resources\egovframework\sqlmap\mapper\regi\projectList.xml
|
||||
src\main\webapp\WEB-INF\views\drilling\inquiry\drilling_inquiry.jsp
|
||||
src\main\webapp\WEB-INF\views\drilling\inquiry\drilling_inquiry_project.jsp
|
||||
src\main\java\geoinfo\drilling\inquiry\service\impl\DrillingInquiryServiceImpl.java
|
||||
src\main\resources\egovframework\sqlmap\mapper\drilling\inquiry\DrillingInquiryMapper.xml
|
||||
src\main\webapp\js\map\main\left\left.js
|
||||
src\main\webapp\proxyo2map.jsp
|
||||
src\main\webapp\js\map\main\map.js
|
||||
src\main\webapp\WEB-INF\views\map\index.jsp
|
||||
src\main\java\geoinfo\drilling\inquiry\DrillingInquiryController.java
|
||||
src\main\webapp\js\map\main\left\left.js
|
||||
|
|
@ -23,19 +23,21 @@ public class MapJibanModelController {
|
|||
@Resource(name = "jibanModelService")
|
||||
private JibanModelService jibanModelService;
|
||||
|
||||
|
||||
@RequestMapping(value = "/map/ajaxGetJibanInfoList.do", method = RequestMethod.GET)
|
||||
public ModelAndView ajaxGetJibanInfoList(ModelAndView mv) throws Exception {
|
||||
|
||||
|
||||
mv.setViewName("jsonView");
|
||||
|
||||
|
||||
List<EgovMap> result = jibanModelService.selectJibanInfoList();
|
||||
|
||||
|
||||
mv.addObject("result", result);
|
||||
|
||||
|
||||
LOGGER.info("지반모델 ajax호출");
|
||||
|
||||
|
||||
return mv;
|
||||
}
|
||||
|
||||
|
||||
@RequestMapping(value = "/map/searchHoleByHjdCode.do", method = RequestMethod.GET)
|
||||
public ModelAndView searchHoleByHjdCode(String hjdCde, ModelAndView mv) throws Exception {
|
||||
|
|
|
|||
|
|
@ -91,13 +91,13 @@ public class MapSubsidenceController {
|
|||
|
||||
@RequestMapping(value = "/map/ajaxGetSubsidenceInfoList.do", method = RequestMethod.GET)
|
||||
public ModelAndView ajaxGetSubsidenceInfoList(ModelAndView mav) throws Exception {
|
||||
|
||||
|
||||
LOGGER.info("지반침하사고 정보 리스트 조회(Ajax)");
|
||||
|
||||
|
||||
mav.setViewName("jsonView");
|
||||
|
||||
|
||||
mav.addObject("subsidenceInfoList", subsidenceService.selectSubsidenceInfoList());
|
||||
|
||||
|
||||
return mav;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,5 +16,5 @@ GlobalsWeb.GlbWidth = 600
|
|||
GlobalsWeb.GlbHeight = 600
|
||||
GlobalsWeb.Levels = {6:2445.98,7:1222.99,8:611.50,9:305.75,10:152.87,11:76.44,12:38.22,13:19.11,14:9.55,15:4.78,16:2.39,17:1.19,18:0.60}
|
||||
GlobalsWeb.CurrentLevel = 16
|
||||
#GlobalsWeb.GISwms = http://218.232.234.166/o2map/services/wms
|
||||
GlobalsWeb.GISwms = http://172.12.192.44:8080/o2map/services/wms
|
||||
GlobalsWeb.GISwms = http://218.232.234.166/o2map/services/wms
|
||||
#GlobalsWeb.GISwms = http://172.12.192.44:8080/o2map/services/wms
|
||||
|
|
@ -507,7 +507,7 @@
|
|||
]]>
|
||||
</select>
|
||||
|
||||
<select id="selectSearchCompanyNameAuto2" parameterType="map" resultType="egovMap">
|
||||
<select id="selectSearchCompanyNameAuto2" parameterType="map" resultType="egovMap">
|
||||
<![CDATA[
|
||||
SELECT
|
||||
project_name
|
||||
|
|
|
|||
|
|
@ -1210,7 +1210,7 @@ function table3display(){
|
|||
<tr id="">
|
||||
<td class="td-head" rowspan="4">좌표입력</td>
|
||||
<td>
|
||||
<input type="text" name="xtext" value="X" style="border: 0px; padding: 0px;" readonly="readonly">
|
||||
<input type="text" name="xtext" value="X(E)" style="border: 0px; padding: 0px;" readonly="readonly">
|
||||
</td>
|
||||
<td>
|
||||
<input type="text" name="tmx" size="20" class="gg-input" onkeypress="onlyNumber(this);">
|
||||
|
|
@ -1218,7 +1218,7 @@ function table3display(){
|
|||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<input type="text" name="ytext" value="Y" style="border: 0px; padding: 0px;" readonly="readonly">
|
||||
<input type="text" name="ytext" value="Y(N)" style="border: 0px; padding: 0px;" readonly="readonly">
|
||||
</td>
|
||||
<td>
|
||||
<input type="text" name="tmy" size="20" class="gg-input" onkeypress="onlyNumber(this);">
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
*/
|
||||
|
||||
//public function to get a paremeter by name from URL
|
||||
function getURLParameter(paramName) {
|
||||
function getQueryString(paramName) {
|
||||
var searchString = decodeURI(window.location.search).substring(1),
|
||||
i, val, params = searchString.split("&");
|
||||
|
||||
|
|
@ -48,7 +48,9 @@ function getGuList2(callback = null, callbackParams = null) {
|
|||
} else {
|
||||
// 성공적으로 로드되었을 때 실행할 코드
|
||||
console.log("로드 완료:", response);
|
||||
callback(callbackParams);
|
||||
if( callback !== null ) {
|
||||
callback(callbackParams);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -66,7 +68,9 @@ function getDongList2(callback = null, callbackParams = null) {
|
|||
} else {
|
||||
// 성공적으로 로드되었을 때 실행할 코드
|
||||
console.log("로드 완료:", response);
|
||||
callback(callbackParams);
|
||||
if( callback !== null ) {
|
||||
callback(callbackParams);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,21 @@
|
|||
// initApp();
|
||||
//});
|
||||
|
||||
//public function to get a paremeter by name from URL
|
||||
function getQueryString(paramName) {
|
||||
var searchString = decodeURI(window.location.search).substring(1),
|
||||
i, val, params = searchString.split("&");
|
||||
|
||||
for (i = 0; i < params.length; i++) {
|
||||
val = params[i].split("=");
|
||||
if (val[0] == paramName) {
|
||||
return decodeURIComponent(unescape(val[1]));
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
addLoadEvent(initApp);
|
||||
function addLoadEvent(func) {
|
||||
var readyStateCheckInterval = setInterval(function() {
|
||||
|
|
@ -532,6 +547,7 @@ function initApp(param){
|
|||
HOLE_SELECT.styleMap = new OpenLayers.StyleMap(getStyleSELECT());
|
||||
BASE_MAP.addLayer(HOLE_SELECT);
|
||||
|
||||
|
||||
CTL_SELECT = new OpenLayers.Control.WMSGetFeatureInfo({
|
||||
url: O2MAP_URL,
|
||||
crs: "EPSG:3857",
|
||||
|
|
@ -681,6 +697,7 @@ function initApp(param){
|
|||
BASE_MAP.addControl(CTL_AREA_CIRCLE5);
|
||||
BASE_MAP.addControl(CTL_AREA_POLYGON);
|
||||
BASE_MAP.addControl(CTL_AREA_POLYGON2);
|
||||
|
||||
// 사업 선택
|
||||
CTL_SELECT_PROJECT = new OpenLayers.Control.WMSGetFeatureInfo({
|
||||
url: O2MAP_URL,
|
||||
|
|
@ -828,15 +845,15 @@ function initApp(param){
|
|||
}
|
||||
});
|
||||
|
||||
const userArea = getURLParameter("userArea");
|
||||
const gl = getURLParameter("gl");
|
||||
const gm = getURLParameter("gm");
|
||||
const gs = getURLParameter("gs");
|
||||
const gf = getURLParameter("gf");
|
||||
const lastTeamName = getURLParameter("lastTeamName");
|
||||
const userArea = getQueryString("userArea");
|
||||
const gl = getQueryString("gl");
|
||||
const gm = getQueryString("gm");
|
||||
const gs = getQueryString("gs");
|
||||
const gf = getQueryString("gf");
|
||||
const lastTeamName = getQueryString("lastTeamName");
|
||||
|
||||
const positionX = Number(getURLParameter("positionX"));
|
||||
const positionY = Number(getURLParameter("positionY"));
|
||||
const positionX = Number(getQueryString("positionX"));
|
||||
const positionY = Number(getQueryString("positionY"));
|
||||
if( userArea ) {
|
||||
|
||||
function getMiddleXY(value) {
|
||||
|
|
@ -896,7 +913,23 @@ function initApp(param){
|
|||
BASE_MAP.zoomToExtent(new OpenLayers.Bounds(selectedXY.minX, selectedXY.minY, selectedXY.maxX, selectedXY.maxY).transform('EPSG:5186', 'EPSG:3857'), true);
|
||||
}
|
||||
getGuList2(getGuList2Callback);
|
||||
|
||||
} else if( gl === "재난관리책임기관" ) {
|
||||
if( gm === "교육청" ) {
|
||||
selectOptionByText(gs, document.getElementById("cmb_sido_all"));
|
||||
const getGuList2Callback = function () {
|
||||
if( gf === null || gf.trim() === "" ) {
|
||||
onSichAllCheck();
|
||||
const selectedXY = getMiddleXY(document.getElementById("cmb_sido_all").value);
|
||||
BASE_MAP.zoomToExtent(new OpenLayers.Bounds(selectedXY.minX, selectedXY.minY, selectedXY.maxX, selectedXY.maxY).transform('EPSG:5186', 'EPSG:3857'), true);
|
||||
} else {
|
||||
selectOptionByText(gf, document.getElementById("cmb_gungu_all"));
|
||||
onSichAllCheck();
|
||||
const selectedXY = getMiddleXY(document.getElementById("cmb_gungu_all").value);
|
||||
BASE_MAP.zoomToExtent(new OpenLayers.Bounds(selectedXY.minX, selectedXY.minY, selectedXY.maxX, selectedXY.maxY).transform('EPSG:5186', 'EPSG:3857'), true);
|
||||
}
|
||||
}
|
||||
getGuList2(getGuList2Callback);
|
||||
}
|
||||
} else {
|
||||
//지방자치단체
|
||||
selectOptionByText(gm, document.getElementById("cmb_sido_all"));
|
||||
|
|
@ -928,28 +961,6 @@ function initApp(param){
|
|||
}
|
||||
|
||||
|
||||
if( false ) {
|
||||
|
||||
//thkim
|
||||
if( gm.indexOf("강원") > -1 ) {
|
||||
|
||||
}
|
||||
if( userArea === "부산광역시" ) {
|
||||
BASE_MAP.setCenter(new OpenLayers.LonLat(14364425.793355, 4186405.8698004), 11); // 1= x(커질수록 우측), 2=Y(커질수록 위로) thkim // 부산 하드코딩
|
||||
$("#cmb_sido_all").val('1013^361348^409880^266204^312094');
|
||||
} else if( userArea === "충청남도" ) {
|
||||
BASE_MAP.setCenter(new OpenLayers.LonLat(14124425.793355, 4380405.8698004), 10); // 1= x(커질수록 우측), 2=Y(커질수록 위로) thkim // 충청남도 하드코딩
|
||||
$("#cmb_sido_all").val('1006^69555^257833^375379^495999');
|
||||
} else {
|
||||
BASE_MAP.setCenter(new OpenLayers.LonLat(14184425.793355, 4302405.8698004), 7);
|
||||
}
|
||||
//BASE_MAP.setCenter(new OpenLayers.LonLat(positionX, positionY), 10); // 1= x(커질수록 우측), 2=Y(커질수록 위로) thkim // 충청남도 하드코딩
|
||||
|
||||
$("#cmb_gungu_all").val('all');
|
||||
$("#cmb_dong_all").val('all');
|
||||
onSichAllCheck();
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
BASE_MAP.setCenter(new OpenLayers.LonLat(14184425.793355, 4302405.8698004), 7);
|
||||
|
|
@ -2773,9 +2784,6 @@ function addSubsidenceTooltip(feature){
|
|||
|
||||
}
|
||||
|
||||
setTimeout(function() {
|
||||
ajaxGetSubsidenceList();
|
||||
}, 1000);
|
||||
|
||||
//지하안전평가->
|
||||
|
||||
|
|
@ -2994,6 +3002,7 @@ setTimeout(function() {
|
|||
|
||||
//3D 지반모델
|
||||
function jibanOnOff(flag) {
|
||||
|
||||
if (flag.checked) {
|
||||
UGG_STRT_PS = new OpenLayers.Layer.WMS(
|
||||
"UGG_STRT_PS",
|
||||
|
|
@ -3455,9 +3464,22 @@ function previewClipReport(reb,prProjectCode,prHoleCode){
|
|||
}
|
||||
|
||||
|
||||
setTimeout(function() {
|
||||
ajaxGetJibanList();
|
||||
}, 1000);
|
||||
function checkBaseMap() {
|
||||
if (typeof BASE_MAP !== 'undefined') {
|
||||
// BASE_MAP이 정의되면 루프를 멈추고 원하는 동작을 수행합니다.
|
||||
ajaxGetJibanList();
|
||||
ajaxGetSubsidenceList();
|
||||
clearInterval(intervalId); // 루프를 멈춥니다.
|
||||
} else {
|
||||
// BASE_MAP이 아직 정의되지 않았으면 콘솔에 메시지를 출력합니다.
|
||||
console.log("BASE_MAP이 아직 정의되지 않았습니다.");
|
||||
}
|
||||
}
|
||||
|
||||
// 200ms 마다 checkBaseMap 함수를 실행합니다.
|
||||
let intervalId = setInterval(checkBaseMap, 200);
|
||||
|
||||
|
||||
|
||||
function showSichuInfo2(){
|
||||
var selectSichSize = HOLE_SELECT.features.length;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
<%@page import="java.util.HashMap"%>
|
||||
<%@page import="java.util.Iterator"%>
|
||||
<%@page import="java.net.*,java.io.*"%>
|
||||
<%@page import="egovframework.com.cmm.service.EgovProperties"%>
|
||||
<%@page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
|
||||
<%
|
||||
try {
|
||||
|
|
@ -11,9 +12,15 @@
|
|||
// 한글인코딩
|
||||
request.setCharacterEncoding("UTF-8");
|
||||
|
||||
// post, get에서 쓸 url을
|
||||
final String O2MAP_WMS_URL = EgovProperties.getProperty("O2MAP.wms.url").trim();
|
||||
|
||||
// post, get에서 쓸 url
|
||||
String reqUrl = "http://218.232.234.166/o2map/services/wms";
|
||||
//String reqUrl = "http://100.10.111.21:8080/o2map/services/wms";
|
||||
if( O2MAP_WMS_URL != null ) {
|
||||
reqUrl = O2MAP_WMS_URL;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//GET방식에서 key, value를 url에 넣는 과정
|
||||
Map paramMap = request.getParameterMap();
|
||||
|
|
|
|||
Loading…
Reference in New Issue