diff --git a/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java b/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java index a139cf0f..9713b509 100644 --- a/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java +++ b/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java @@ -218,35 +218,49 @@ public class HoleCoordinateController { //웹 취약점 때문에 수정 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))); - // 경위도 -> GRS80 중부원점 20-60 좌표로 변환 -// Map map = wUtil.setCoordinateChgXY(Double.parseDouble(HOLE_LOCATION_X), Double.parseDouble(HOLE_LOCATION_Y), "4326", "5186"); - - 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); + if ("MODIFY_COORDINATE".equals(PROC)) { // 좌표계 수정 + 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))); + // 경위도 -> GRS80 중부원점 20-60 좌표로 변환 + // Map map = wUtil.setCoordinateChgXY(Double.parseDouble(HOLE_LOCATION_X), Double.parseDouble(HOLE_LOCATION_Y), "4326", "5186"); + + 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); + } + model.setViewName("redirect:/holeCoord.do"); + + } else { //("MODIFY_NAME".equals(PROC)) // 프로젝트명 수정 + + for (int i = 1; i < rowCnt + 1; i++) { + String PROJECT_NAME = sUtil.checkNull(String.valueOf(params.get("projName"))); + String NEW_P_NAME = sUtil.checkNull(String.valueOf(params.get("re-name"))); + spParams.put("projectCode", PROJECT_CODE); + spParams.put("projectName", PROJECT_NAME); + spParams.put("newPName", NEW_P_NAME); + masterService.changeProjName(request, response, spParams); + } + model.setViewName("redirect:/re-name.do"); } } - model.setViewName("redirect:/holeCoord.do"); return model; }; diff --git a/src/main/java/geoinfo/regi/holeCoordinate/service/HoleCoordinateMapper.java b/src/main/java/geoinfo/regi/holeCoordinate/service/HoleCoordinateMapper.java index 2a9da16a..4465547b 100644 --- a/src/main/java/geoinfo/regi/holeCoordinate/service/HoleCoordinateMapper.java +++ b/src/main/java/geoinfo/regi/holeCoordinate/service/HoleCoordinateMapper.java @@ -20,6 +20,7 @@ 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 callSpRenProjName(HashMap params) throws SQLException; 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 7549a0ba..db97687e 100644 --- a/src/main/java/geoinfo/regi/holeCoordinate/service/HoleCoordinateService.java +++ b/src/main/java/geoinfo/regi/holeCoordinate/service/HoleCoordinateService.java @@ -21,5 +21,6 @@ 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 changeProjName(HttpServletRequest request, HttpServletResponse response, 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 23fa475e..003d9b24 100644 --- a/src/main/java/geoinfo/regi/holeCoordinate/service/impl/HoleCoordinateServiceImpl.java +++ b/src/main/java/geoinfo/regi/holeCoordinate/service/impl/HoleCoordinateServiceImpl.java @@ -60,6 +60,22 @@ public class HoleCoordinateServiceImpl implements HoleCoordinateService { holeCoordinateMapper.upData2(params); } + @Override + public HashMap changeProjName(HttpServletRequest request, HttpServletResponse response, HashMap params) throws Exception { + + if(request.getSession().getAttribute("USERNAME") == null){ + throw new Exception( "로그인이 필요한 서비스 입니다." ); + } + + try { + holeCoordinateMapper.callSpRenProjName(params); + return params; + } catch (SQLException e) { + throw new Exception( e.getMessage() ); + } + } + + @Override public HashMap changeCoordHole(HttpServletRequest request, HttpServletResponse response, HashMap params) throws Exception { diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml index 635f8db4..f2b03d4d 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml @@ -243,8 +243,23 @@ ]]> - - +