From 90b80708c61b3a095a81e2a20b69ee9f10b154f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Thu, 27 Apr 2023 18:49:40 +0900 Subject: [PATCH] =?UTF-8?q?status=20=EC=97=86=EB=8A=94=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=EC=97=90=20=EC=BB=AC=EB=9F=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/config/SecurityConfig.java | 6 +- .../faisp/main/equip/EquipController.java | 1 + .../faisp/main/equip/model/CellPhone.java | 2 + .../main/fipTarget/FipTargetController.java | 2 + .../faisp/main/fipTarget/model/PartWork.java | 61 ++++--------------- .../faisp/main/fipTarget/model/ShipInfo.java | 2 + .../main/fipTarget/model/Vulnerable.java | 4 +- .../resources/mybatisMapper/FipTarget.xml | 5 +- .../resources/static/js/fipTarget/partWork.js | 13 +--- .../fipTarget/partWorkEditModal.html | 2 +- 10 files changed, 33 insertions(+), 65 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java index e457087f..37585705 100644 --- a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java +++ b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java @@ -176,9 +176,11 @@ public class SecurityConfig{ // https://computer-science-student.tistory.com/497 http.headers().frameOptions().sameOrigin(); // 나모에디터 이미지 업로드시 csrf 토큰을 추가할 수 없어서 예외처리. - http.csrf().ignoringAntMatchers("/Crosseditor/uploadImg"); // 비밀번호찾기 토큰없이 사용 - http.csrf().ignoringAntMatchers("/user/findUser"); + http.csrf().ignoringAntMatchers( + "/Crosseditor/uploadImg", + "/user/findUser" + ); return http.build(); } diff --git a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java index c5e50298..db08274e 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java +++ b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java @@ -285,6 +285,7 @@ public class EquipController { @PostMapping("/saveCellPhone") public Integer saveCellPhone (@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone){ cellPhone.setWrtDt(LocalDateTime.now()); + cellPhone.setStatus("DST007"); return equipService.saveCellPhone(cellPhone); } diff --git a/src/main/java/com/dbnt/faisp/main/equip/model/CellPhone.java b/src/main/java/com/dbnt/faisp/main/equip/model/CellPhone.java index f9691b55..0e4f1ab2 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/model/CellPhone.java +++ b/src/main/java/com/dbnt/faisp/main/equip/model/CellPhone.java @@ -55,6 +55,8 @@ public class CellPhone extends BaseModel{ private String wrtNm; @Column(name = "wrt_dt") private LocalDateTime wrtDt; + @Column(name = "status") + private String status; @Transient private String userNm; diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java index 5f6424b1..15985a96 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java @@ -401,6 +401,7 @@ public class FipTargetController { @RequestParam(value = "fileSeq", required = false) List < Integer > deleteFileSeq){ vulnerable.setMultipartFileList(request.getMultiFileMap().get("uploadFiles")); vulnerable.setWrtDt(LocalDateTime.now()); + vulnerable.setStatus("DST007"); Integer result = fipTargetService.saveVulnerable(vulnerable,deleteFileSeq); return result; } @@ -529,6 +530,7 @@ public class FipTargetController { shipInfo.setWrtUserSeq(loginUser.getUserSeq()); shipInfo.setWrtOrgan(loginUser.getOgCd()); shipInfo.setWrtDt(LocalDateTime.now()); + shipInfo.setStatus("DST007"); fipTargetService.saveShipInfo(shipInfo); } diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartWork.java b/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartWork.java index e6dd15ef..46b4ba82 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartWork.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartWork.java @@ -44,8 +44,8 @@ public class PartWork extends BaseModel implements Serializable{ private String workInfo; @Column(name = "description") private String description; - @Column(name = "save_yn") - private String saveYn; + @Column(name = "status") + private String status; @Column(name = "wrt_organ") private String wrtOrgan; @Column(name = "wrt_part") @@ -59,10 +59,10 @@ public class PartWork extends BaseModel implements Serializable{ @Column(name = "wrt_dt") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime wrtDt; - + @Transient private List multipartFileList; - + @Transient private String excel; @Transient @@ -71,54 +71,19 @@ public class PartWork extends BaseModel implements Serializable{ private String terminalStatus; @Transient private Integer fileCnt; - + @Transient private List fileList; - - - - -@Override -public String toString() { - return "PartWork [pwSeq=" + pwSeq + ", piSeq=" + piSeq + ", workDt=" + workDt + ", workType=" + workType - + ", workInfo=" + workInfo + ", description=" + description + ", saveYn=" + saveYn + ", wrtOrgan=" - + wrtOrgan + ", wrtPart=" + wrtPart + ", wrtUserSeq=" + wrtUserSeq + ", wrtNm=" + wrtNm + ", wrtDt=" + wrtDt - + ", multipartFileList=" + multipartFileList + ", excel=" + excel + ", fileList=" + fileList + "]"; -} - - - - -@Embeddable -@Data -@NoArgsConstructor -@AllArgsConstructor -public static class PartWorkId implements Serializable { - private Integer pwSeq; - private Integer piSeq; -} - - - - - - - - - - - - - - - - - - - - + @Embeddable + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class PartWorkId implements Serializable { + private Integer pwSeq; + private Integer piSeq; + } } diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java b/src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java index f9461c02..164de330 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java @@ -72,6 +72,8 @@ public class ShipInfo extends BaseModel implements Serializable{ @Column(name = "wrt_dt") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime wrtDt; + @Column(name = "status") + private String status; @Transient private String excel; diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/model/Vulnerable.java b/src/main/java/com/dbnt/faisp/main/fipTarget/model/Vulnerable.java index 74516d84..f92c620f 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/model/Vulnerable.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/model/Vulnerable.java @@ -50,7 +50,9 @@ public class Vulnerable extends BaseModel{ private String wrtNm; @Column(name = "wrt_dt") private LocalDateTime wrtDt; - + @Column(name = "status") + private String status; + @Transient private List multipartFileList; diff --git a/src/main/resources/mybatisMapper/FipTarget.xml b/src/main/resources/mybatisMapper/FipTarget.xml index 427e6cdf..c6021ce0 100644 --- a/src/main/resources/mybatisMapper/FipTarget.xml +++ b/src/main/resources/mybatisMapper/FipTarget.xml @@ -250,6 +250,7 @@ + and status <> 'DST008' and pi.mgt_organ in @@ -270,7 +271,7 @@ pw.wrt_nm, pw.wrt_user_seq, pw.work_dt, - pw.save_yn, + pw.status, work_type, pw.description, (select count(*) from part_work_file pwf where pw.pw_seq = pwf.pw_seq and pw.pi_seq = pwf.pi_seq) as file_cnt, @@ -297,7 +298,7 @@ pi.terminal_nm, pw.wrt_nm, pw.work_dt, - pw.save_yn, + pw.status, work_type, case when pw.work_type = 'CH' then 'O' diff --git a/src/main/resources/static/js/fipTarget/partWork.js b/src/main/resources/static/js/fipTarget/partWork.js index a254a825..a5a305fd 100644 --- a/src/main/resources/static/js/fipTarget/partWork.js +++ b/src/main/resources/static/js/fipTarget/partWork.js @@ -32,24 +32,15 @@ $(document).on('click', '#saveBtn', function (){ return false; } if(confirm("저장하시겠습니까?")){ - $('#saveYn').val('Y'); + $('#status').val('DST007'); contentFade("in"); savePartWork(); } }) $(document).on('click', '#temporarySaveBtn', function (){ - if($('#piSeq').val() == ''){ - alert('터미널명을 선택해주세요'); - $('#piSeq').focus(); - return false; - } - if($('input:radio[name="workType"]:checked').length < 1){ - alert('종류를 선택해주세요'); - return false; - } if(confirm("임시 저장하시겠습니까?")){ - $('#saveYn').val('N'); + $('#status').val('DST001'); contentFade("in"); savePartWork(); } diff --git a/src/main/resources/templates/fipTarget/partWorkEditModal.html b/src/main/resources/templates/fipTarget/partWorkEditModal.html index d90107f9..cccd1e4a 100644 --- a/src/main/resources/templates/fipTarget/partWorkEditModal.html +++ b/src/main/resources/templates/fipTarget/partWorkEditModal.html @@ -8,7 +8,7 @@
- +