From 4f480a2254ff13a3f88b569206a7199653d85116 Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 3 Nov 2025 14:22:02 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20BasicController.java=EC=97=90=20?= =?UTF-8?q?=EB=B9=84=EA=B3=A0=20=EC=A3=BC=EC=84=9D=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EA=B1=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regi/basicInfo/BasicController.java | 12 +- src/main/webapp/WEB-INF/conf/license | Bin 118 -> 0 bytes src/main/webapp/WEB-INF/conf/license.sha1 | 1 - src/main/webapp/WEB-INF/conf/license.sig | 1 - src/main/webapp/WEB-INF/conf/o2crs.properties | 14 -- .../webapp/WEB-INF/conf/o2jdbcsql.properties | 50 ----- src/main/webapp/WEB-INF/conf/o2wps_conf.xml | 33 --- src/main/webapp/WEB-INF/conf/server_conf.xml | 76 ------- src/main/webapp/WEB-INF/conf/wps_conf.ini | 6 - .../views/map/popup/downloadPurpose.jsp | 202 ++++++++++++++++++ 10 files changed, 208 insertions(+), 187 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/conf/license delete mode 100644 src/main/webapp/WEB-INF/conf/license.sha1 delete mode 100644 src/main/webapp/WEB-INF/conf/license.sig delete mode 100644 src/main/webapp/WEB-INF/conf/o2crs.properties delete mode 100644 src/main/webapp/WEB-INF/conf/o2jdbcsql.properties delete mode 100644 src/main/webapp/WEB-INF/conf/o2wps_conf.xml delete mode 100644 src/main/webapp/WEB-INF/conf/server_conf.xml delete mode 100644 src/main/webapp/WEB-INF/conf/wps_conf.ini create mode 100644 src/main/webapp/WEB-INF/views/map/popup/downloadPurpose.jsp diff --git a/src/main/java/geoinfo/regi/basicInfo/BasicController.java b/src/main/java/geoinfo/regi/basicInfo/BasicController.java index 4311f90e..f8f1e2d1 100644 --- a/src/main/java/geoinfo/regi/basicInfo/BasicController.java +++ b/src/main/java/geoinfo/regi/basicInfo/BasicController.java @@ -870,17 +870,17 @@ public class BasicController { params.put("depthTo", wUtil.isNullNode(nDEPTH_TO)); params.put("rockType", wUtil.isNullNode(nROCK_TYPE)); params.put("rqd", wUtil.isNullNode(nRQD)); - params.put("rqdDesc", wUtil.isNullNode(nRQD_DESC)); + params.put("rqdDesc", wUtil.isNullNode(nRQD_DESC)); //비고 1 params.put("jn", wUtil.isNullNode(nJN)); - params.put("jnDesc", wUtil.isNullNode(nJN_DESC)); + params.put("jnDesc", wUtil.isNullNode(nJN_DESC)); //비고 2 params.put("jr", wUtil.isNullNode(nJR)); - params.put("jrDesc", wUtil.isNullNode(nJR_DESC)); + params.put("jrDesc", wUtil.isNullNode(nJR_DESC)); //비고 3 params.put("ja", wUtil.isNullNode(nJA)); - params.put("jaDesc", wUtil.isNullNode(nJA_DESC)); + params.put("jaDesc", wUtil.isNullNode(nJA_DESC)); //비고 4 params.put("jw", wUtil.isNullNode(nJW)); - params.put("jwDesc", wUtil.isNullNode(nJW_DESC)); + params.put("jwDesc", wUtil.isNullNode(nJW_DESC)); //비고 5 params.put("srf", wUtil.isNullNode(nSRF)); - params.put("srfDesc", wUtil.isNullNode(nSRF_DESC)); + params.put("srfDesc", wUtil.isNullNode(nSRF_DESC)); //비고 6 params.put("userId", request.getSession().getAttribute("USERID")); basicService.insertTempQ(params); diff --git a/src/main/webapp/WEB-INF/conf/license b/src/main/webapp/WEB-INF/conf/license deleted file mode 100644 index bb09c3b8ac48ece497840e018b2a413876285431..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmZQzV6ZbxGB!!GG_XiDF)&LuOEWXHFtSWeGfz&nOfxbtvNTRKv@|tOHcvJ-H!!wL zwlFbD1j<`lrW%-98m5>qAOIr+1LN!p;qAMDLd=GG20)58z|$q(-zeTUJl@z4Bmf2g D1o0O` diff --git a/src/main/webapp/WEB-INF/conf/license.sha1 b/src/main/webapp/WEB-INF/conf/license.sha1 deleted file mode 100644 index e8bcf32d..00000000 --- a/src/main/webapp/WEB-INF/conf/license.sha1 +++ /dev/null @@ -1 +0,0 @@ -眲0O: \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/conf/license.sig b/src/main/webapp/WEB-INF/conf/license.sig deleted file mode 100644 index 801b5b95..00000000 --- a/src/main/webapp/WEB-INF/conf/license.sig +++ /dev/null @@ -1 +0,0 @@ -J*v*(34~Njʖ "|K3ۤTܒ&%àY%bYcM$!,_}mz`ډ֫MI?MG_HgY^l,qC:J/r*yF \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/conf/o2crs.properties b/src/main/webapp/WEB-INF/conf/o2crs.properties deleted file mode 100644 index 0a2c95d8..00000000 --- a/src/main/webapp/WEB-INF/conf/o2crs.properties +++ /dev/null @@ -1,14 +0,0 @@ -# Additional CRS Definitions. -# -# $AUTHORITY$ : CRS AUTHORITY -# $CODE$ : CRS CODE -# $WKT$ : CRS WKT -# -# USE -> $AUTHORITY$:$CODE$=$WKT$ - -#EPSG:5185=PROJCS["ITRF_2000_TM_Korea_Central_Belt",GEOGCS["GCS_ITRF_2000",DATUM["D_ITRF_2000",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",200000.0],PARAMETER["False_Northing",600000.0],PARAMETER["Central_Meridian",125.0],PARAMETER["Scale_Factor",1.0],PARAMETER["Latitude_Of_Origin",38.0],UNIT["Meter",1.0]] -#EPSG:5186=PROJCS["ITRF_2000_TM_Korea_Central_Belt",GEOGCS["GCS_ITRF_2000",DATUM["D_ITRF_2000",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",200000.0],PARAMETER["False_Northing",600000.0],PARAMETER["Central_Meridian",127.0],PARAMETER["Scale_Factor",1.0],PARAMETER["Latitude_Of_Origin",38.0],UNIT["Meter",1.0]] -#EPSG:5187=PROJCS["ITRF_2000_TM_Korea_Central_Belt",GEOGCS["GCS_ITRF_2000",DATUM["D_ITRF_2000",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",200000.0],PARAMETER["False_Northing",600000.0],PARAMETER["Central_Meridian",129.0],PARAMETER["Scale_Factor",1.0],PARAMETER["Latitude_Of_Origin",38.0],UNIT["Meter",1.0]] -#EPSG:5188=PROJCS["ITRF_2000_TM_Korea_Central_Belt",GEOGCS["GCS_ITRF_2000",DATUM["D_ITRF_2000",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",200000.0],PARAMETER["False_Northing",600000.0],PARAMETER["Central_Meridian",131.0],PARAMETER["Scale_Factor",1.0],PARAMETER["Latitude_Of_Origin",38.0],UNIT["Meter",1.0]] - -#EPSG:3857=PROJCS["WGS 84 / Pseudo-Mercator", GEOGCS["WGS 84", DATUM["World Geodetic System 1984", SPHEROID["WGS 84", 6378137.0, 298.257223563, AUTHORITY["EPSG","7030"]], AUTHORITY["EPSG","6326"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AXIS["Geodetic longitude", EAST], AXIS["Geodetic latitude", NORTH], AUTHORITY["EPSG","4326"]], PROJECTION["Popular Visualisation Pseudo Mercator", AUTHORITY["EPSG","1024"]], PARAMETER["semi_minor", 6378137.0], PARAMETER["latitude_of_origin", 0.0], PARAMETER["central_meridian", 0.0], PARAMETER["scale_factor", 1.0], PARAMETER["false_easting", 0.0], PARAMETER["false_northing", 0.0], UNIT["m", 1.0], AXIS["Easting", EAST], AXIS["Northing", NORTH], AUTHORITY["EPSG","3857"]] \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/conf/o2jdbcsql.properties b/src/main/webapp/WEB-INF/conf/o2jdbcsql.properties deleted file mode 100644 index fd36b74c..00000000 --- a/src/main/webapp/WEB-INF/conf/o2jdbcsql.properties +++ /dev/null @@ -1,50 +0,0 @@ -# ===================================== -# O2Map JDBC Spatial SQL Configuration -# ===================================== -# Must Use LowerCase For Every Property Name, Not Value -# Use This Key For SQL -# -# [ KEY ] -# ?GEOMETRY? -> geometry object -# ?WKB? -> well know binary of geometry -# ?SRID? -> SRID value - -# ------------------------ -# Kairos -# ------------------------ -kairos.spatial.envelope=ST_ENVELOPE(?GEOMETRY?) -kairos.spatial.bbox=ST_INTERSECTS(?GEOMETRY?,?GEOMETRY?)=1 -kairos.geometry.to.wkb=ST_ASBINARY(?GEOMETRY?) -kairos.geometry.from.wkb=ST_GEOMFROMWKB(?WKB?,?SRID?) - -# ------------------------ -# PostGIS -# ------------------------ -postgis.spatial.envelope=ST_ENVELOPE(?GEOMETRY?) -postgis.spatial.bbox=ST_INTERSECTS(?GEOMETRY?,?GEOMETRY?) -postgis.geometry.to.wkb=ST_AsEWKB(?GEOMETRY?) -postgis.geometry.from.wkb=ST_GEOMFROMWKB(?WKB?) - -# ------------------------ -# Tibero -# ------------------------ -tibero.spatial.envelope=ST_ENVELOPE(?GEOMETRY?) -tibero.spatial.bbox=ST_INTERSECTS(?GEOMETRY?,?GEOMETRY?)=1 -tibero.geometry.to.wkb=ST_ASBINARY(?GEOMETRY?) -tibero.geometry.from.wkb=ST_GEOMFROMWKB(?WKB?) - -# ------------------------ -# Altibase HDB -# ------------------------ -altibase.spatial.envelope=ENVELOPE(?GEOMETRY?) -altibase.spatial.bbox=INTERSECTS(?GEOMETRY?,?GEOMETRY?) -altibase.geometry.to.wkb=ASBINARY(?GEOMETRY?) -altibase.geometry.from.wkb=GEOMFROMWKB(?WKB?) - -# ------------------------ -# MySQL HDB -# ------------------------ -mysql.spatial.envelope=ENVELOPE(?GEOMETRY?) -mysql.spatial.bbox=INTERSECTS(?GEOMETRY?,?GEOMETRY?)=1 -mysql.geometry.to.wkb=ASWKB(?GEOMETRY?) -mysql.geometry.from.wkb=GEOMFROMWKB(?WKB?,?SRID?) \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/conf/o2wps_conf.xml b/src/main/webapp/WEB-INF/conf/o2wps_conf.xml deleted file mode 100644 index 0bd54acd..00000000 --- a/src/main/webapp/WEB-INF/conf/o2wps_conf.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - D:/geoinfo/GIS/APP/repository/upload - - - - - - - SIZE - 10000 - - - - - - - - transientStore - 50000 - - - userStore - 50000 - - - sharedStore - 50000 - - - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/conf/server_conf.xml b/src/main/webapp/WEB-INF/conf/server_conf.xml deleted file mode 100644 index 43506b73..00000000 --- a/src/main/webapp/WEB-INF/conf/server_conf.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - oracle - - - 10.dbnt.co.kr - - - 1521 - - - ORAGEODEV - - - geoinfo - - - geoinfo - - - o2map - - - - - - D:/geoinfo/GIS/APP/repository/log - DEBUG - TRUE - - - - - - - DAY - 10 - - - - - - - - O2MapWebAdminSecureKey - - - - O2MapWebAdminStyleKey - - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/conf/wps_conf.ini b/src/main/webapp/WEB-INF/conf/wps_conf.ini deleted file mode 100644 index 4ba90e0a..00000000 --- a/src/main/webapp/WEB-INF/conf/wps_conf.ini +++ /dev/null @@ -1,6 +0,0 @@ -# ===================================== -# WPS Repository Configuration -# ===================================== -# Must Use LowerCase For Every Property Name - -repository.dir=D:/geoinfo/GIS/APP/repository/wps \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/map/popup/downloadPurpose.jsp b/src/main/webapp/WEB-INF/views/map/popup/downloadPurpose.jsp new file mode 100644 index 00000000..ce3dc0b9 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/map/popup/downloadPurpose.jsp @@ -0,0 +1,202 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> + + + + + +지반정보 다운로드 + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
* 활용 사례 조사를 위하여 다운로드 자료에 대한 활용목적, 활용프로젝트명등 조사 내용이 강화되었습니다.
* 다운로드 목적 입력후 관리자의 승인후 [마이페이지]에서 지반정보를 다운받으실 수 있습니다.
+ + + + + <%for(int i=1;i<=7;i+=2){ %> + + + + + <%} %> + <%for(int i=10;i<20;i+=2){ %> + + + + + <%} %> + + + + + + + + + +
     활용목적을 선택하시오
+ 		+
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
사업명
[${project[i].projectName}] 외 ${params.sichuCount - 1}개${i + 1}. ${project[i].projectName}
활용목적을 메뉴에서 선택후 텍스트박스를 클릭 하세요
활용목적
기타
활용 프로젝트명(논문명, 과제명)을 입력하세요
활용기간
시작 - 종료 +
+ + + + +
+
+
+
* 자동승인 기간 및 건수를 초과한 경우 이전 다운로드 받으신 시추정보의 활용사례를 작성하시고,
   간단한 확인절차 후 다운로드 서비스를 이용 하실 수 있습니다.
+
+ + + + +
+
+ +
+ + \ No newline at end of file