Merge branch 'master' of http://118.219.150.34:50501/DBNT/kcscDev into thkim

egovframe-template-simple-react-contribution/src/components/alert/AlertDialogSlide.jsx

@@ -0,0 +1,58 @@
+import React, { useEffect } from 'react';
+
+import Button from '@mui/material/Button';
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import DialogContentText from '@mui/material/DialogContentText';
+import DialogTitle from '@mui/material/DialogTitle';
+import Slide from '@mui/material/Slide';
+
+const Transition = React.forwardRef(function Transition(props, ref) {
+  return <Slide direction="up" ref={ref} {...props} />;
+});
+
+export default function AlertDialogSlide({confirm, setConfirm}) {  
+
+    useEffect(function () {        
+        if( confirm ) {
+            setConfirm({
+                ...confirm,
+                //open: !confirm.open && false,
+                //title: !confirm.title && "중요",
+                ///yes: !confirm.yes && "예",
+                //no: !confirm.no && "아니요",
+            });
+        }        
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+
+    const handleClose = () => {
+        setConfirm({...confirm, open: false});
+    };
+
+    return (
+        <React.Fragment>
+            {confirm &&
+                <Dialog
+                    open={ confirm.open }
+                    TransitionComponent={Transition}
+                    keepMounted
+                    onClose={handleClose}
+                    aria-describedby="alert-dialog-slide-description"
+                >
+                    <DialogTitle>{confirm.title ? confirm.title : "알림"}</DialogTitle>
+                    <DialogContent>
+                    <DialogContentText id="alert-dialog-slide-description">{confirm.body}</DialogContentText>
+                    </DialogContent>
+                    <DialogActions>
+                        <Button onClick={() => {handleClose(); confirm.yesCallback && confirm.yesCallback(confirm.yesCallbackParams);}}>{confirm.yes ? confirm.yes : "예"}</Button>
+                        <Button onClick={() => {handleClose(); confirm.noCallback && confirm.noCallback(confirm.noCallbackParams);}}>{confirm.no ? confirm.no : "아니요"}</Button>
+                    </DialogActions>
+                </Dialog>
+            }
+      
+    </React.Fragment>
+  );
+}

egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx

@@ -1,13 +1,15 @@
 import React, { useState, useEffect } from 'react';
-import { Link, useLocation } from 'react-router-dom';
+import { Link, useLocation, useNavigate } from 'react-router-dom';
 import Switch from '@mui/material/Switch';
 
 import * as EgovNet from 'api/egovFetch';
 import URL from 'constants/url';
+import CODE from 'constants/code';
 
 import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavAdmin';
 import EgovPagingPaginationInfo from 'components/EgovPagingPaginationInfo';
 
+
 import styled from "styled-components";
 
 const StyledDiv = styled.div`
@@ -21,6 +23,7 @@ const label = { inputProps: { 'aria-label': '사용여부' } };
 function PopUp(props) {
     
     const location = useLocation();
+    const navigate = useNavigate();
 
     const [listPopup, setListPopup] = useState([]);
     const [searchCondition, setSearchCondition] = useState(location.state?.searchCondition || { pageIndex: 1, searchCnd: '0', searchWrd: '' });
@@ -51,6 +54,32 @@ function PopUp(props) {
         
     }
 
+
+    const onChangeActivationSwitch = (e, popupId) => {
+        const checked = e.target.checked;
+        const requestURL = `/contents/api/popup-manage/activation-switch/${popupId}?checked=${checked}`;
+
+        const requestOptions = {
+            method: "PUT",
+            headers: {
+                'Content-type': 'application/json',
+            }
+        }
+
+        EgovNet.requestFetch(requestURL,
+            requestOptions,
+            (resp) => {
+                console.log("====>>> Schdule delete= ", resp);
+                if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
+                    navigate(URL.ADMIN__CONTENTS__POP_UP ,{ replace: true });
+                } else {
+                    navigate({pathname: URL.ERROR}, {state: {msg : resp.resultMessage}});
+                }
+
+            }
+        );
+    }
+
     
 	const Location = React.memo(function Location() {
         return (
@@ -106,11 +135,11 @@ function PopUp(props) {
                                         <p className="no_data" key="0">검색된 결과가 없습니다.</p>
                                     }                                    
                                     {listPopup.map((it)=>(
-                                        <div className='list_item'>
+                                        <div className='list_item' key={it.seq}>
                                             <div>{it.seq}</div>
                                             <div className="al"><Link to={URL.ADMIN__CONTENTS__POP_UP__MODIFY} state={{popupId: it.seq} } key={it.seq}>{it.popupTitle}</Link></div>
                                             <div>{it.startDate} ~ {it.endDate}</div>
-                                            <div>{it.useYn === 'Y' ? <Switch {...label} defaultChecked /> : <Switch {...label} />}</div>
+                                            <div>{it.useYn === 'Y' ? <Switch {...label} key={it.seq} onChange={(e) => onChangeActivationSwitch(e, it.seq)} defaultChecked /> : <Switch key={it.seq} onChange={(e) => onChangeActivationSwitch(e, it.seq)} {...label} />}</div>
                                         </div>
                                     ))}
                                 </div>

egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp/PopupWriter.jsx

@@ -4,6 +4,7 @@ import DatePicker from "react-datepicker";
 
 import EgovAttachFile from 'components/EgovAttachFile';
 import RichTextEditor from "../../../../components/editor/RichTextEditor";
+import AlertDialogSlide from "../../../../components/alert/AlertDialogSlide";
 import CODE from 'constants/code';
 
 
@@ -34,7 +35,8 @@ function PopupWriter(props) {
 
     const [modeInfo, setModeInfo] = useState({ mode: props.mode });
     const [text, setText] = useState("");
-    const [popupDetail, setScheduleDetail] = useState({ startDate: new Date(), endDate: new Date() });
+    const [textOriginal, setTextOriginal] = useState("");
+    const [popupDetail, setPopupDetail] = useState({ startDate: new Date(), endDate: new Date() });
 
     const [schdulBgndeHH, setSchdulBgndeHH] = useState();
     const [schdulBgndeMM, setSchdulBgndeMM] = useState();
@@ -42,6 +44,10 @@ function PopupWriter(props) {
     const [schdulEnddeMM, setSchdulEnddeMM] = useState();
     const [boardAttachFiles, setBoardAttachFiles] = useState();
 
+    const [confirm, setConfirm] = React.useState();
+
+    
+
     useEffect(function () {
         initMode();
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -108,13 +114,14 @@ function PopupWriter(props) {
             function (resp) {
                 let rawDetail = resp.result;
                 //기본값 설정
-                setScheduleDetail({
+                setPopupDetail({
                     ...popupDetail,
                     ...rawDetail,
                     startDate: convertDate(rawDetail.schdulBgnde),
                     endDate: convertDate(rawDetail.schdulEndde),
                 });
                 setText(rawDetail.contents);
+                setTextOriginal(rawDetail.contents);
             }
         );        
     }
@@ -144,25 +151,35 @@ function PopupWriter(props) {
                 body: formData
             }
 
-            if (modeInfo.mode === CODE.MODE_MODIFY) {
-                modeInfo.editURL = `${modeInfo.editURL}/${location.state?.popupId}`;
-            }
-            EgovNet.requestFetch(modeInfo.editURL,
-                requestOptions,
-                (resp) => {
-                    if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
-                        navigate({ pathname: URL.ADMIN__CONTENTS__POP_UP });
-                    } else {
-                        navigate({pathname: URL.ERROR}, {state: {msg : resp.resultMessage}});
+            const requestTask = (callbackParams) => {
+                EgovNet.requestFetch(callbackParams.requestUrl,
+                    requestOptions,
+                    (resp) => {
+                        if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
+                            if (modeInfo.mode === CODE.MODE_MODIFY) {
+                                alert("게시글이 수정 되었습니다.");
+                            }
+                            navigate({ pathname: URL.ADMIN__CONTENTS__POP_UP });
+                        } else {
+                            navigate({pathname: URL.ERROR}, {state: {msg : resp.resultMessage}});
+                        }
                     }
-                }
-            );
+                );
+            };
+
+            
+            if (modeInfo.mode === CODE.MODE_CREATE) {
+                setConfirm({...confirm, open: true, body: "추가하시겠습니까?", yesCallback: requestTask, yesCallbackParams: {requestUrl:modeInfo.editURL}});
+            } else if (modeInfo.mode === CODE.MODE_MODIFY) {
+                setConfirm({...confirm, open: true, body: "수정하시겠습니까?", yesCallback: requestTask, yesCallbackParams: {requestUrl:`${modeInfo.editURL}/${location.state?.popupId}`}});
+            }
+            
         }
 
     }
 
     const onClickDelete = (popupId) => {
-        const deleteBoardURL = `/schedule/${popupId}`;
+        const deleteBoardURL = `/contents/api/popup-manage/${popupId}`;
 
         const requestOptions = {
             method: "DELETE",
@@ -171,22 +188,37 @@ function PopupWriter(props) {
             }
         }
 
-        EgovNet.requestFetch(deleteBoardURL,
-            requestOptions,
-            (resp) => {
-                console.log("====>>> Schdule delete= ", resp);
-                if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
-                    alert("게시글이 삭제되었습니다.")
-                    navigate(URL.ADMIN__COMMITTEE__SCHEDULES ,{ replace: true });
-                } else {
-                    // alert("ERR : " + resp.message);
-                    navigate({pathname: URL.ERROR}, {state: {msg : resp.resultMessage}});
+        const requestTask = () => {
+            EgovNet.requestFetch(deleteBoardURL,
+                requestOptions,
+                (resp) => {
+                    if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
+                        alert("삭제 되었습니다.");
+                        navigate(URL.ADMIN__CONTENTS__POP_UP ,{ replace: true });
+                    } else {
+                        navigate({pathname: URL.ERROR}, {state: {msg : resp.resultMessage}});
+                    }    
                 }
+            );
+        };        
 
-            }
-        );
+        setConfirm({...confirm, open: true, body: "삭제하시겠습니까?", yesCallback: requestTask});
     }
 
+    const onClickList = (e) => {
+
+        const requestTask = () => {       
+            navigate(URL.ADMIN__CONTENTS__POP_UP ,{ replace: true });
+        };
+        if( text !== textOriginal ) {
+            setConfirm({...confirm, open: true, body: "작업 내용을 취소하시겠습니까?", yesCallback: requestTask});
+        } else {
+            requestTask();
+        }
+        
+    }
+    
+
     const convertDate = (str) => {
         let year = str.substring(0, 4);
         let month = str.substring(4, 6);
@@ -244,7 +276,7 @@ function PopupWriter(props) {
                                     <dd>
                                         <input className="f_input2 w_full" type="text" name="title" title="제목" id="title" placeholder="제목을 입력하세요."
                                             value={popupDetail.title}
-                                            onChange={(e) => setScheduleDetail({ ...popupDetail, title: e.target.value })}
+                                            onChange={(e) => setPopupDetail({ ...popupDetail, title: e.target.value })}
                                         />
                                     </dd>
                                 </dl>
@@ -260,7 +292,7 @@ function PopupWriter(props) {
                                                 showTimeInput
                                                 onChange={(date) => {
                                                     console.log("setStartDate : ", date);
-                                                    setScheduleDetail({ ...popupDetail, schdulBgnde: getDateFourteenDigit(date), schdulBgndeYYYMMDD: getYYYYMMDD(date), schdulBgndeHH: date.getHours(), schdulBgndeMM: date.getMinutes(), startDate: date });
+                                                    setPopupDetail({ ...popupDetail, schdulBgnde: getDateFourteenDigit(date), schdulBgndeYYYMMDD: getYYYYMMDD(date), schdulBgndeHH: date.getHours(), schdulBgndeMM: date.getMinutes(), startDate: date });
                                                     setSchdulBgndeHH(date.getHours());
                                                     setSchdulBgndeMM(date.getMinutes());
                                                 }} />
@@ -278,7 +310,7 @@ function PopupWriter(props) {
                                                 minDate={popupDetail.startDate}
                                                 onChange={(date) => {
                                                     console.log("setEndDate: ", date);
-                                                    setScheduleDetail({ ...popupDetail, schdulEndde: getDateFourteenDigit(date), schdulEnddeYYYMMDD: getYYYYMMDD(date), schdulEnddeHH: date.getHours(), schdulEnddeMM: date.getMinutes(), endDate: date });
+                                                    setPopupDetail({ ...popupDetail, schdulEndde: getDateFourteenDigit(date), schdulEnddeYYYMMDD: getYYYYMMDD(date), schdulEnddeHH: date.getHours(), schdulEnddeMM: date.getMinutes(), endDate: date });
                                                     setSchdulEnddeHH(date.getHours());
                                                     setSchdulEnddeMM(date.getMinutes());
                                                 }
@@ -295,7 +327,7 @@ function PopupWriter(props) {
 									for ( let i = 0; i < attachfile.length; i++) {
 										arrayConcat[`file_${i}`] = attachfile[i];
 									}
-                                    setScheduleDetail(arrayConcat);
+                                    setPopupDetail(arrayConcat);
                                 }}
                                 fnDeleteFile={(deletedFile) => {
                                     console.log("====>>> Delete deletedFile = ", deletedFile);
@@ -324,11 +356,13 @@ function PopupWriter(props) {
                                     }                                    
                                 </div>
                                 <div className="right_col btn1">
-                                    <Link to={URL.ADMIN__CONTENTS__POP_UP} className="btn btn_blue_h46 w_100">목록</Link>
+                                    <button className="btn btn_blue_h46 w_100"
+                                        onClick={onClickList}>목록</button> 
                                 </div>
                             </div>
                             {/* <!--// 버튼영역 --> */}
 
+                            <AlertDialogSlide confirm={confirm} setConfirm={setConfirm} />
                         </StyledDiv>                        
                         {/* <!--// 본문 --> */}
                     </div>

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/controller/SchedulesApiController.java

@@ -151,13 +151,13 @@ public class SchedulesApiController {
 	(
 			@AuthenticationPrincipal LoginVO user,
 			HttpServletRequest request,
-			@PathVariable("scheduleId") String schdulId
+			@PathVariable("scheduleId") String strSchdulId
 	) throws Exception {
 
 		ResultVO resultVO = new ResultVO();
-		Long test = Long.valueOf(schdulId);
+		Long schdulId = Long.valueOf(strSchdulId);
 		try {
-			resultVO = egovIndvdlSchdulManageService.deleteSchedule(resultVO, request, test);
+			resultVO = egovIndvdlSchdulManageService.deleteSchedule(resultVO, request, schdulId);
 		} catch (Exception e) {
 			resultVO.setResultCode(ResponseCode.FAILED.getCode());
 			resultVO.setResultMessage(e.getMessage());

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/controller/PopUpApiController.java

@@ -13,6 +13,7 @@ import com.dbnt.kcscbackend.auth.entity.LoginVO;
 import com.dbnt.kcscbackend.config.common.ResponseCode;
 import com.dbnt.kcscbackend.config.common.ResultVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
@@ -129,7 +130,6 @@ public class PopUpApiController {
 	@ApiResponses(value = {
 			@ApiResponse(responseCode = "200", description = "등록 성공"),
 			@ApiResponse(responseCode = "403", description = "인가된 사용자가 아님"),
-			@ApiResponse(responseCode = "900", description = "입력값 무결성 오류")
 	})
 	@PutMapping(value = "/contents/api/popup-manage/{popupId}")
 	public ResultVO contentsApiPopUpManageUpdate(
@@ -162,6 +162,86 @@ public class PopUpApiController {
 
 	}
 
+
+	@Operation(
+			summary = "팝업 비활성화 API",
+			description = "관리자 단에서 '컨텐츠 관리' > '팝업 관리' 페이지에서 팝업을 비활성화 API. 삭제가 아닌 비활성화 임. 삭제는 없음.",
+			tags = {"PopUpApiController"}
+	)
+	@ApiResponses(value = {
+			@ApiResponse(responseCode = "200", description = "등록 성공"),
+			@ApiResponse(responseCode = "403", description = "인가된 사용자가 아님"),
+	})
+	@DeleteMapping(value = "/contents/api/popup-manage/{popupId}")
+	public ResultVO contentsApiPopUpManageDelete
+			(
+					@AuthenticationPrincipal LoginVO user,
+					HttpServletRequest request,
+					@PathVariable("popupId") String strPopupId
+			) throws Exception {
+
+		ResultVO resultVO = new ResultVO();
+		Long popupId = Long.valueOf(strPopupId);
+		try {
+			resultVO = popUpApiService.contentsApiPopUpManageDelete(resultVO, request, user, popupId);
+		} catch (Exception e) {
+			resultVO.setResultCode(ResponseCode.FAILED.getCode());
+			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 = "팝업 활성화 또는 비활성화 설정하는 API",
+			description = "관리자 단에서 '컨텐츠 관리' > '팝업 관리' 페이지에서 '사용여부'를 활성화 또는 비활성화 설정해주는 API.",
+			tags = {"PopUpApiController"}
+	)
+	@ApiResponses(value = {
+			@ApiResponse(responseCode = "200", description = "등록 성공"),
+			@ApiResponse(responseCode = "403", description = "인가된 사용자가 아님"),
+	})
+	@PutMapping(value = "/contents/api/popup-manage/activation-switch/{popupId}")
+	public ResultVO contentsApiPopUpManageUpdateActivationSwitch(
+			HttpServletRequest request,
+			@AuthenticationPrincipal LoginVO loginVO,
+			@ApiParam(value="활성화 여부") @RequestParam(required=true) String checked,
+			@PathVariable("popupId") Long popupId
+	) throws Exception {
+
+		ResultVO resultVO = new ResultVO();
+
+		try {
+			resultVO = popUpApiService.contentsApiPopUpManageUpdateActivationSwitch(resultVO, request, loginVO, checked, popupId);
+		} catch (Exception e) {
+			resultVO.setResultCode(ResponseCode.FAILED.getCode());
+			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 = "팝업 내용 불러오기 API",
 			description = "관리자 단에서 '컨텐츠 관리' > '팝업 관리' 페이지에서 저장된 팝업을 불러오는 API",

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/PopUpApiService.java

@@ -4,7 +4,11 @@ import com.dbnt.kcscbackend.admin.contents.popUp.model.CreatePopupVO;
 import com.dbnt.kcscbackend.admin.contents.popUp.model.UpdatePopupVO;
 import com.dbnt.kcscbackend.auth.entity.LoginVO;
 import com.dbnt.kcscbackend.config.common.ResultVO;
+import io.swagger.annotations.ApiParam;
 import org.springframework.data.domain.Pageable;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import javax.servlet.http.HttpServletRequest;
@@ -14,6 +18,7 @@ public interface PopUpApiService {
 	public ResultVO contentsApiPopUpManageCreate(ResultVO resultVO, HttpServletRequest request, LoginVO user, final MultipartHttpServletRequest multiRequest, CreatePopupVO createPopupVO) throws Exception;
 	public ResultVO contentsApiPopUpManageRead(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long popupId) throws Exception;
 	public ResultVO contentsApiPopUpManageUpdate(ResultVO resultVO, HttpServletRequest request, LoginVO user, UpdatePopupVO updatePopupVO, Long popupId) throws Exception;
-
 	public ResultVO contentsApiPopUpManageDelete(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long popupId) throws Exception;
+	public ResultVO contentsApiPopUpManageUpdateActivationSwitch(ResultVO resultVO, HttpServletRequest request, LoginVO user, String checked, Long popupId) throws Exception;
+
 }

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java

@@ -226,7 +226,85 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU
 
 	@Override
 	public ResultVO contentsApiPopUpManageDelete(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long popupId) throws Exception {
-		return null;
+		System.out.println(
+				"\n--------------------------------------------------------------\n" +
+						request.getRequestURI() + " IN:" +
+						"\n--------------------------------------------------------------\n" +
+						"popupId:" + "\n" +
+						popupId + "\n" +
+						"\n--------------------------------------------------------------\n"
+		);
+
+
+
+
+
+		Map<String, Object> dto = new HashMap<String, Object>();
+
+		if( false ) {
+			// 삭제 procedure가 삭제가 아닌 비활성화만 시키므로 해당 프로시저 사용 안 함.
+			Map<String, Object> response = tnPopupMngRepository.spDeleteTnPopupMng(
+					popupId.intValue(),
+					"admin",
+					null,
+					null,
+					null
+			);
+			dto.put("errorMessage", response.get("_error_message") );
+		} else {
+			tnPopupMngRepository.deleteById(popupId);
+		}
+
+
+		dto.put("popupId", popupId );
+
+		resultVO.setResult(dto);
+		resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
+		resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage());
+
+		return resultVO;
+	}
+
+	@Override
+	public ResultVO contentsApiPopUpManageUpdateActivationSwitch(ResultVO resultVO, HttpServletRequest request, LoginVO user, String checked, Long popupId) throws Exception {
+		System.out.println(
+				"\n--------------------------------------------------------------\n" +
+						request.getRequestURI() + " IN:" +
+						"\n--------------------------------------------------------------\n" +
+						"checked:" + "\n" +
+						checked + "\n" +
+						"popupId:" + "\n" +
+						popupId + "\n" +
+						"\n--------------------------------------------------------------\n"
+		);
+
+
+
+		// 유효성 검사 실시
+		int isValid = tnPopupMngRepository.spIsValidTnPopupMngId( popupId.intValue() );
+
+		if( isValid == 0 ) {
+			throw new Exception("대상이 존재하지 않습니다.");
+		}
+
+		TnPopupMng tnPopupMng = tnPopupMngRepository.findByPopupSeq(popupId);
+		if( Boolean.parseBoolean(checked) ) {
+			tnPopupMng.setUseYn("Y");
+		} else {
+			tnPopupMng.setUseYn("N");
+		}
+
+		tnPopupMngRepository.saveAndFlush(tnPopupMng);
+
+
+		Map<String, Object> dto = new HashMap<String, Object>();
+		dto.put("popupId",  popupId);
+
+		resultVO.setResult(dto);
+		resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
+		resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage());
+
+		return resultVO;
 	}
 
 

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/entity/TnPopupMng.java

@@ -62,6 +62,7 @@ public class TnPopupMng {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class TnPopupMngId implements Serializable {
+    private static final long serialVersionUID = -6558812991140219351L;
     private String popupSeq;
   }
 

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/repository/TnPopupMngRepository.java

@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 
-public interface TnPopupMngRepository extends JpaRepository<TnPopupMng, TnPopupMng.TnPopupMngId> {
+public interface TnPopupMngRepository extends JpaRepository<TnPopupMng, Long> {
 
     @Query(value = "CALL sp_add_tn_popup_mng (" +
             ":_popup_title, " +
@@ -76,6 +76,23 @@ public interface TnPopupMngRepository extends JpaRepository<TnPopupMng, TnPopupM
             @Param("_error_message")        String          errorMessage
     );
 
+
+    @Query(value = "CALL sp_delete_tn_popup_mng (" +
+            ":_popup_seq, " +
+            ":_modi_id, " +
+            ":_result_count, " +
+            ":_result_code, " +
+            ":_error_message)",
+            nativeQuery = true)
+    Map<String, Object> spDeleteTnPopupMng(
+            @Param("_popup_seq")        Integer       popupSeq,
+            @Param("_modi_id")          String        modiId,
+            @Param("_result_count")     Integer       resultCount,
+            @Param("_result_code")      String        resultCode,
+            @Param("_error_message")    String        errorMessage
+    );
+
+
     @Procedure("sp_is_valid_tn_popup_mng_id")
     int spIsValidTnPopupMngId( Integer        popupSeq );