From d858c0ebac0a36e4241c2c226e1ae7184dcdbb69 Mon Sep 17 00:00:00 2001 From: "DESKTOP-QGC5RJO\\DBNT" Date: Fri, 6 Jan 2023 14:59:25 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EC=9A=94=EC=82=AC=EA=B1=B4=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=ED=98=84=ED=99=A9=203=EC=B0=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../majorStatus/MajorStatusController.java | 4 +- .../repository/MajorFileRepository.java | 2 + .../repository/MajorStatusRepository.java | 1 + .../service/MajorStatusService.java | 16 ++-- .../resources/static/js/ivsgt/majorStatus.js | 80 +++++++++++-------- .../ivsgt/majorStatus/majorStatusPage.html | 2 +- .../majorStatus/majorStatusViewModal.html | 1 + 7 files changed, 63 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java index 9104451b..5beff042 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java @@ -93,9 +93,9 @@ public class MajorStatusController { @PostMapping("/deleteContent") @ResponseBody - public void deleteContent(@AuthenticationPrincipal UserInfo loginUser, @RequestBody List majorStatuses){ + public void deleteContent(@RequestBody MajorStatus majorStatus){ - majorStatusService.deleteContent(majorStatuses,loginUser); + majorStatusService.deleteContent(majorStatus); } diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/repository/MajorFileRepository.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/repository/MajorFileRepository.java index f390d895..7e51dc8a 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/repository/MajorFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/repository/MajorFileRepository.java @@ -11,4 +11,6 @@ public interface MajorFileRepository extends JpaRepository findByMajorKey(Integer majorKey); Optional findTopByMajorKeyOrderByFileSeq(Integer majorKey); + void deleteByMajorKey(Integer majorKey); + } diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/repository/MajorStatusRepository.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/repository/MajorStatusRepository.java index dd374335..caf9fb26 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/repository/MajorStatusRepository.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/repository/MajorStatusRepository.java @@ -6,4 +6,5 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface MajorStatusRepository extends JpaRepository { void deleteByMajorKey(Integer majorKey); + } diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/service/MajorStatusService.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/service/MajorStatusService.java index 1f00972e..86c79739 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/service/MajorStatusService.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/service/MajorStatusService.java @@ -5,6 +5,7 @@ import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.FileInfo; import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseFile; import com.dbnt.faisp.main.equip.model.Equip; +import com.dbnt.faisp.main.fipTarget.model.VulnFile; import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.BoardInvestigation; import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.IvsgtFile; import com.dbnt.faisp.main.ivsgtMgt.majorStatus.mapper.MajorStatusMapper; @@ -86,14 +87,17 @@ public class MajorStatusService extends BaseService { } } + public void deleteContent(MajorStatus majorStatus){ - public void deleteContent(List majorStatuses, UserInfo loginUser){ - - for(MajorStatus majorStatus : majorStatuses){ - - majorStatusRepository.deleteByMajorKey(majorStatus.getMajorKey()); + //파일삭제 + List MajorFileList = majorFileRepository.findByMajorKey(majorStatus.getMajorKey()); + if(MajorFileList != null) { + for(MajorFile file: MajorFileList){ + deleteStoredFile(new File(file.getSavePath(), file.getConvNm())); + } } - + majorFileRepository.deleteByMajorKey(majorStatus.getMajorKey()); + majorStatusRepository.deleteById(majorStatus.getMajorKey()); } private void deleteMajorFile(Integer majorKey, List deleteFileSeq) { diff --git a/src/main/resources/static/js/ivsgt/majorStatus.js b/src/main/resources/static/js/ivsgt/majorStatus.js index b8f0efc0..473e6e43 100644 --- a/src/main/resources/static/js/ivsgt/majorStatus.js +++ b/src/main/resources/static/js/ivsgt/majorStatus.js @@ -41,49 +41,61 @@ $(function(){ }) - - - -$(document).on('click', '#delectMajorBtn', function (){ - if(confirm("선택한 대상을 삭제처리 하시겠습니까?")){ - const checkArr = []; - $('input:checkbox[name=equChk]:checked').each(function (idx, el){ - checkArr.push({}); - const target = $(el); - checkArr[idx].equKey = Number(target.parents('tr').find('.majorKey').val()); +$(document).on('click', '#deleteMajorBtn', function (){ + const majorKey = $('input[name=majorKey]').val(); + console.log(majorKey); + if(confirm("삭제하시겠습니까?")){ + contentFade("in"); + $.ajax({ + type : 'POST', + url : "/ivsgt/deleteContent", + data : JSON.stringify({majorKey:majorKey}), + contentType: 'application/json', + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function(data) { + alert("삭제 처리되었습니다."); + location.reload(); + }, + error : function(xhr, status) { + alert("삭제 처리에 실패하였습니다"); + } }) - deleteMajor(checkArr); - } }) -// $(document).on('click', '#deleteEquip', function (){ +// $(document).on('click', '#delectMajorBtn', function (){ // if(confirm("선택한 대상을 삭제처리 하시겠습니까?")){ // const checkArr = []; -// checkArr.push({}); -// checkArr[0].equKey = Number($('#mEquKey').val()); -// deleteEquip(checkArr); +// $('input:checkbox[name=equChk]:checked').each(function (idx, el){ +// checkArr.push({}); +// const target = $(el); +// checkArr[idx].equKey = Number(target.parents('tr').find('.majorKey').val()); +// }) +// deleteMajor(checkArr); +// // } // }) -function deleteMajor(checkArr){ - $.ajax({ - type : 'POST', - url : "/ivsgt/deleteContent", - data : JSON.stringify(checkArr), - contentType: 'application/json', - beforeSend: function (xhr){ - xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); - }, - success : function() { - alert("삭제처리 되었습니다."); - location.reload(); - }, - error : function(xhr, status) { - alert("삭제처리에 실패하였습니다"); - } - }) -} +// function deleteMajor(checkArr){ +// $.ajax({ +// type : 'POST', +// url : "/ivsgt/deleteContent", +// data : JSON.stringify(checkArr), +// contentType: 'application/json', +// beforeSend: function (xhr){ +// xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); +// }, +// success : function() { +// alert("삭제처리 되었습니다."); +// location.reload(); +// }, +// error : function(xhr, status) { +// alert("삭제처리에 실패하였습니다"); +// } +// }) +// } function getEditModal(majorKey){ $.ajax({ diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html index 4d054530..9ac5ceda 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html @@ -8,7 +8,7 @@
-

주요사건처리현황t

+

주요사건처리현황

diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html index 84fc7229..16cfdc09 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html @@ -76,5 +76,6 @@ +
\ No newline at end of file