diff --git a/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java b/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java index 549aa1b0..2cdba33a 100644 --- a/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java +++ b/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java @@ -188,24 +188,32 @@ public class HoleCoordinateController { // 좌표 수정 : MODIFY -- TEMP_HEADER, TBL_HEADER 수정. //웹 취약점 때문에 수정 if (rowCnt > 0) { + HashMap spParams = new HashMap<>(); for (int i = 1; i < rowCnt + 1; i++) { String HOLE_CODE = sUtil.checkNull(String.valueOf(params.get("HOLE_CODE_" + i))); + String COORD_SYS = sUtil.checkNull(String.valueOf(params.get("COORD_SYS_" + i))); String HOLE_OR_X = sUtil.checkNull(String.valueOf(params.get("HOLE_OR_X_" + i))); String HOLE_OR_Y = sUtil.checkNull(String.valueOf(params.get("HOLE_OR_Y_" + i))); - String HOLE_LOCATION_X = sUtil.checkNull(String.valueOf(params.get("HOLE_LOCATION_X_" + i))); - String HOLE_LOCATION_Y = sUtil.checkNull(String.valueOf(params.get("HOLE_LOCATION_Y_" + i))); +// String HOLE_LOCATION_X = sUtil.checkNull(String.valueOf(params.get("HOLE_LOCATION_X_" + i))); +// String HOLE_LOCATION_Y = sUtil.checkNull(String.valueOf(params.get("HOLE_LOCATION_Y_" + i))); // 경위도 -> GRS80 중부원점 20-60 좌표로 변환 - Map map = wUtil.setCoordinateChgXY(Double.parseDouble(HOLE_LOCATION_X), Double.parseDouble(HOLE_LOCATION_Y), "4326", "5186"); +// Map map = wUtil.setCoordinateChgXY(Double.parseDouble(HOLE_LOCATION_X), Double.parseDouble(HOLE_LOCATION_Y), "4326", "5186"); - params.put("HOLE_CODE", HOLE_CODE); - params.put("HOLE_OR_X", HOLE_OR_X); - params.put("HOLE_OR_Y", HOLE_OR_Y); - params.put("HOLE_LOCATION_X", HOLE_LOCATION_X); - params.put("HOLE_LOCATION_Y", HOLE_LOCATION_Y); - params.put("tmX", map.get("X").toString()); - params.put("tmY", map.get("Y").toString()); - masterService.upCoord1(params); - masterService.upCoord2(params); + spParams.put("holeCode", HOLE_CODE); + spParams.put("isOrgInclude", 0); + spParams.put("coordSys", Integer.parseInt(COORD_SYS)); + spParams.put("orgX", Double.parseDouble(HOLE_OR_X)); + spParams.put("orgY", Double.parseDouble(HOLE_OR_Y)); +// params.put("HOLE_CODE", HOLE_CODE); +// params.put("HOLE_OR_X", HOLE_OR_X); +// params.put("HOLE_OR_Y", HOLE_OR_Y); +// params.put("HOLE_LOCATION_X", HOLE_LOCATION_X); +// params.put("HOLE_LOCATION_Y", HOLE_LOCATION_Y); +// params.put("tmX", map.get("X").toString()); +// params.put("tmY", map.get("Y").toString()); +// masterService.upCoord1(params); +// masterService.upCoord2(params); + masterService.changeCoordHole(request, response, spParams); } } diff --git a/src/main/java/geoinfo/regi/holeCoordinate/service/HoleCoordinateMapper.java b/src/main/java/geoinfo/regi/holeCoordinate/service/HoleCoordinateMapper.java index 5bfda7ee..2a9da16a 100644 --- a/src/main/java/geoinfo/regi/holeCoordinate/service/HoleCoordinateMapper.java +++ b/src/main/java/geoinfo/regi/holeCoordinate/service/HoleCoordinateMapper.java @@ -1,5 +1,6 @@ package geoinfo.regi.holeCoordinate.service; +import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -19,5 +20,6 @@ public interface HoleCoordinateMapper { public void upCoord2(HashMap params) throws Exception; public void upData1(HashMap params) throws Exception; public void upData2(HashMap params) throws Exception; + public void callSpChangeCoordHole(HashMap params) throws SQLException; } diff --git a/src/main/java/geoinfo/regi/holeCoordinate/service/HoleCoordinateService.java b/src/main/java/geoinfo/regi/holeCoordinate/service/HoleCoordinateService.java index 3e605501..7549a0ba 100644 --- a/src/main/java/geoinfo/regi/holeCoordinate/service/HoleCoordinateService.java +++ b/src/main/java/geoinfo/regi/holeCoordinate/service/HoleCoordinateService.java @@ -4,6 +4,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import egovframework.rte.psl.dataaccess.util.EgovMap; @@ -18,4 +21,5 @@ public interface HoleCoordinateService { public void upCoord2(HashMap params) throws Exception; public void upData1(HashMap params) throws Exception; public void upData2(HashMap params) throws Exception; + public HashMap changeCoordHole(HttpServletRequest request, HttpServletResponse response, HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/regi/holeCoordinate/service/impl/HoleCoordinateServiceImpl.java b/src/main/java/geoinfo/regi/holeCoordinate/service/impl/HoleCoordinateServiceImpl.java index 76728961..23fa475e 100644 --- a/src/main/java/geoinfo/regi/holeCoordinate/service/impl/HoleCoordinateServiceImpl.java +++ b/src/main/java/geoinfo/regi/holeCoordinate/service/impl/HoleCoordinateServiceImpl.java @@ -1,10 +1,13 @@ package geoinfo.regi.holeCoordinate.service.impl; +import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.springframework.stereotype.Service; @@ -56,4 +59,20 @@ public class HoleCoordinateServiceImpl implements HoleCoordinateService { public void upData2(HashMap params) throws Exception { holeCoordinateMapper.upData2(params); } + + @Override + public HashMap changeCoordHole(HttpServletRequest request, HttpServletResponse response, HashMap params) throws Exception { + + if(request.getSession().getAttribute("USERNAME") == null){ + throw new Exception( "로그인이 필요한 서비스 입니다." ); + } + + try { + holeCoordinateMapper.callSpChangeCoordHole(params); + return params; + } catch (SQLException e) { + throw new Exception( e.getMessage() ); + } + + } } diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml index 1f56a7ce..a25a2867 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml @@ -244,6 +244,28 @@ + + diff --git a/src/main/webapp/WEB-INF/views/web/manage/hole_coord_modify.jsp b/src/main/webapp/WEB-INF/views/web/manage/hole_coord_modify.jsp index 46daf7ac..37f22b53 100644 --- a/src/main/webapp/WEB-INF/views/web/manage/hole_coord_modify.jsp +++ b/src/main/webapp/WEB-INF/views/web/manage/hole_coord_modify.jsp @@ -142,7 +142,7 @@ function fn_help_tour(){ ${result.holeName} -