From a5bb7fdaa9af1c2877723401222083127de2b8db Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 22 Jan 2024 17:58:55 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20?= =?UTF-8?q?=EC=9C=84=EC=9B=90=ED=9A=8C=EA=B4=80=EB=A6=AC=20-=20=EC=9C=84?= =?UTF-8?q?=EC=9B=90=ED=9A=8C=20=EC=9D=BC=EC=A0=95=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=9D=BC=EC=A0=95=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20=EA=B1=B4=20-=20Back-?= =?UTF-8?q?end?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SchedulesApiController.java | 40 +++++++++++++++++++ .../EgovIndvdlSchdulManageService.java | 2 + .../EgovIndvdlSchdulManageServiceImpl.java | 38 ++++++++++++++++-- .../repository/TnCmtEventRepository.java | 17 ++++++++ 4 files changed, 94 insertions(+), 3 deletions(-) diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/controller/SchedulesApiController.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/controller/SchedulesApiController.java index d53336d..834b15b 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/controller/SchedulesApiController.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/controller/SchedulesApiController.java @@ -137,6 +137,46 @@ public class SchedulesApiController { } + @Operation( + summary = "'위원회 일정 등록' 페이지에서 일정 삭제하는 API", + description = "관리자 단에서 '위원회 관리' > '위원회 일정 관리'에서 특정 일정을 삭제하는 API", + tags = {"SchedulesApiController"} + ) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "등록 성공"), + @ApiResponse(responseCode = "403", description = "인가된 사용자가 아님") + }) + @DeleteMapping(value = "/schedule/{scheduleId}") + public ResultVO deleteSchedule + ( + @AuthenticationPrincipal LoginVO user, + HttpServletRequest request, + @PathVariable("scheduleId") String schdulId + ) throws Exception { + + ResultVO resultVO = new ResultVO(); + Long test = Long.valueOf(schdulId); + try { + resultVO = egovIndvdlSchdulManageService.deleteSchedule(resultVO, request, test); + } catch (Exception e) { + resultVO.setResultCode(-1); + resultVO.setResultMessage(e.getMessage()); + } + + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " OUT:" + + "\n--------------------------------------------------------------\n" + + "resultVO.toString():" + "\n" + + resultVO.toString() + "\n" + + "\n--------------------------------------------------------------\n" + ); + + return resultVO; + } + + @Operation( summary = "일정 상세조회", description = "일정 목록을 상세조회", diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/EgovIndvdlSchdulManageService.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/EgovIndvdlSchdulManageService.java index 62e6154..27fc70b 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/EgovIndvdlSchdulManageService.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/EgovIndvdlSchdulManageService.java @@ -36,6 +36,8 @@ public interface EgovIndvdlSchdulManageService { public ResultVO createSchedule(ResultVO resultVO, HttpServletRequest request, CreateScheduleVO createScheduleVO) throws Exception; public ResultVO updateSchedule(ResultVO resultVO, HttpServletRequest request, UpdateScheduleVO updateScheduleVO) throws Exception; + public ResultVO deleteSchedule(ResultVO resultVO, HttpServletRequest request, Long scheduleId) throws Exception; + public ResultVO scheduleDetail(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long scheduleId) throws Exception; diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/impl/EgovIndvdlSchdulManageServiceImpl.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/impl/EgovIndvdlSchdulManageServiceImpl.java index 6816849..33e9708 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/impl/EgovIndvdlSchdulManageServiceImpl.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/impl/EgovIndvdlSchdulManageServiceImpl.java @@ -164,10 +164,10 @@ public class EgovIndvdlSchdulManageServiceImpl extends EgovAbstractServiceImpl i Map response = tnCmtEventRepository.spUpdateTnCmtEvent( - updateScheduleVO.getEvtSeq().intValue(), + updateScheduleVO.getEvtSeq(), updateScheduleVO.getDivMeet(), // 구분 - updateScheduleVO.getUpCommittee().intValue(), // 심의위원회 상위 코드 번호 - updateScheduleVO.getCommittee().intValue(), // 심의위원회 하위 코드 번호 + updateScheduleVO.getUpCommittee(), // 심의위원회 상위 코드 번호 + updateScheduleVO.getCommittee(), // 심의위원회 하위 코드 번호 updateScheduleVO.getTitle(), // 제목 updateScheduleVO.getLocation(), // 장소 updateScheduleVO.getContents(), // 내용 @@ -190,6 +190,38 @@ public class EgovIndvdlSchdulManageServiceImpl extends EgovAbstractServiceImpl i return resultVO; } + @Override + public ResultVO deleteSchedule(ResultVO resultVO, HttpServletRequest request, Long scheduleId) throws Exception { + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " IN:" + + "\n--------------------------------------------------------------\n" + + "scheduleId:" + "\n" + + scheduleId + "\n" + + "\n--------------------------------------------------------------\n" + ); + + + Map response = tnCmtEventRepository.spDeleteTnCmtEvent( + scheduleId.intValue(), + "admin", + null, + null, + null + ); + + Map dto = new HashMap(); + dto.put("errorMessage", response.get("_error_message") ); + dto.put("schdulId", scheduleId ); + + resultVO.setResult(dto); + resultVO.setResultCode(ResponseCode.SUCCESS.getCode()); + resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage()); + + return resultVO; + } + diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/repository/TnCmtEventRepository.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/repository/TnCmtEventRepository.java index 7b00a47..17e2f6e 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/repository/TnCmtEventRepository.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/repository/TnCmtEventRepository.java @@ -94,6 +94,23 @@ public interface TnCmtEventRepository extends JpaRepository spDeleteTnCmtEvent( + @Param("_evt_seq") Integer evtSeq, + @Param("_modi_id") String modiId, + @Param("_result_count") Integer resultCount, + @Param("_result_code") String resultCode, + @Param("_error_message") String errorMessage + ); + + //@Procedure //Map sp_is_valid_tn_cmt_event_id( @Param("_evt_seq") Long evtSeq );