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 dd26eb06..85487bb1 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java @@ -120,7 +120,8 @@ public class FipTargetController { @PostMapping("/savePartInfo") public void savePartInfo (@AuthenticationPrincipal UserInfo loginUser, PartInfo partInfo,MultipartHttpServletRequest request){ partInfo.setMultipartFileList(request.getMultiFileMap().get("uploadFiles")); - partInfo.setWrtNm(loginUser.getUserId()); + partInfo.setWrtNm(loginUser.getUserNm()); + partInfo.setWrtTitle(loginUser.getTitleCd()); partInfo.setWrtPart(loginUser.getOfcCd()); partInfo.setWrtUserSeq(loginUser.getUserSeq()); partInfo.setWrtOrgan(loginUser.getOgCd()); @@ -141,8 +142,8 @@ public class FipTargetController { //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/target/partInfoList").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); - mav.addObject("userId", loginUser.getUserId()); - mav.addObject("wrtId", fipTargetService.selectPartInfoFirstId(partInfo)); + mav.addObject("userSeq", loginUser.getUserSeq()); + mav.addObject("wrtUserSeq", fipTargetService.selectPartInfoFirstId(partInfo)); return mav; } @@ -152,9 +153,10 @@ public class FipTargetController { @RequestParam(value = "fileSeq", required = false) List < Integer > deleteFileSeq){ partInfo.setMultipartFileList(request.getMultiFileMap().get("uploadFiles")); partInfo.setWrtUserSeq(loginUser.getUserSeq()); - partInfo.setWrtNm(loginUser.getUserId()); + partInfo.setWrtNm(loginUser.getUserNm()); partInfo.setWrtOrgan(loginUser.getOgCd()); partInfo.setWrtPart(loginUser.getOfcCd()); + partInfo.setWrtTitle(loginUser.getTitleCd()); partInfo.setWrtDt(LocalDateTime.now()); fipTargetService.updatePartInfo(partInfo,deleteFileSeq); return partInfo.getPiSeq(); @@ -305,10 +307,11 @@ public class FipTargetController { @PostMapping("/savePartWork") public void savePartWork (@AuthenticationPrincipal UserInfo loginUser, PartWork partWork,MultipartHttpServletRequest request){ partWork.setMultipartFileList(request.getMultiFileMap().get("uploadFiles")); - partWork.setWrtNm(loginUser.getUserId()); + partWork.setWrtNm(loginUser.getUserNm()); partWork.setWrtPart(loginUser.getOfcCd()); partWork.setWrtUserSeq(loginUser.getUserSeq()); partWork.setWrtOrgan(loginUser.getOgCd()); + partWork.setWrtTitle(loginUser.getTitleCd()); partWork.setWrtDt(LocalDateTime.now()); fipTargetService.savePartWork(partWork); } @@ -391,15 +394,16 @@ public class FipTargetController { if(vulnerable.getVulnKey() != null) { vulnerable = fipTargetService.selectVulnInfo(vulnerable); vulnerable.setFileList(fipTargetService.selectVulnFile(vulnerable.getVulnKey())); - mav.addObject("userId", loginUser.getUserId()); + mav.addObject("userSeq", loginUser.getUserSeq()); } //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/target/vulnerableList").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); - vulnerable.setWrtNm(loginUser.getUserId()); + vulnerable.setWrtNm(loginUser.getUserNm()); vulnerable.setWrtPart(loginUser.getOfcCd()); vulnerable.setWrtUserSeq(loginUser.getUserSeq()); vulnerable.setWrtOrgan(loginUser.getOgCd()); + vulnerable.setWrtTitle(loginUser.getTitleCd()); mav.addObject("info", vulnerable); return mav; } @@ -524,7 +528,7 @@ public class FipTargetController { @PostMapping("/saveShipInfo") public void saveShipInfo (@AuthenticationPrincipal UserInfo loginUser, ShipInfo shipInfo){ - shipInfo.setWrtNm(loginUser.getUserId()); + shipInfo.setWrtNm(loginUser.getUserNm()); shipInfo.setWrtPart(loginUser.getOfcCd()); shipInfo.setWrtTitle(loginUser.getTitleCd()); shipInfo.setWrtUserSeq(loginUser.getUserSeq()); @@ -549,7 +553,7 @@ public class FipTargetController { @PostMapping("/updateShipInfo") public ShipInfo updateShipInfo (@AuthenticationPrincipal UserInfo loginUser,ShipInfo shipInfo){ - shipInfo.setWrtNm(loginUser.getUserId()); + shipInfo.setWrtNm(loginUser.getUserNm()); shipInfo.setWrtPart(loginUser.getOfcCd()); shipInfo.setWrtTitle(loginUser.getTitleCd()); shipInfo.setWrtUserSeq(loginUser.getUserSeq()); @@ -561,7 +565,7 @@ public class FipTargetController { @GetMapping("/ipShipHistory") public ModelAndView ipShipHistory(ShipInfo shipInfo) { ModelAndView mav = new ModelAndView("fipTarget/ipShipHistory"); - mav.addObject("shipInfoList", fipTargetService.selectShipInfoSeq(shipInfo)); + mav.addObject("shipInfoList", fipTargetService.selectIpShiwHistoryList(shipInfo)); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java b/src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java index 455a96e0..6ca661c2 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java @@ -60,6 +60,8 @@ public interface FipTargetMapper { List selectShipInfoListToExcle(ShipInfo shipInfo); + List selectIpShiwHistoryList(ShipInfo shipInfo); + diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfo.java b/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfo.java index 9f9fb61c..f087daa5 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfo.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfo.java @@ -66,6 +66,8 @@ public class PartInfo extends BaseModel implements Serializable{ private String wrtOrgan; @Column(name = "wrt_part") private String wrtPart; + @Column(name = "wrt_title") + private String wrtTitle; @Column(name = "wrt_user_seq") private Integer wrtUserSeq; @Column(name = "wrt_nm") 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 a0e028ec..c076c1b8 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 @@ -50,6 +50,8 @@ public class PartWork extends BaseModel implements Serializable{ private String wrtOrgan; @Column(name = "wrt_part") private String wrtPart; + @Column(name = "wrt_title") + private String wrtTitle; @Column(name = "wrt_user_seq") private Integer wrtUserSeq; @Column(name = "wrt_nm") 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 6db484a2..74516d84 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 @@ -42,6 +42,8 @@ public class Vulnerable extends BaseModel{ private String wrtOrgan; @Column(name = "wrt_part") private String wrtPart; + @Column(name = "wrt_title") + private String wrtTitle; @Column(name = "wrt_user_seq") private Integer wrtUserSeq; @Column(name = "wrt_nm") diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java index fa5e9214..b5acbe98 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java @@ -473,8 +473,8 @@ public class FipTargetService extends BaseService { return shipInfoRepository.save(shipTmp); } - public List selectShipInfoSeq(ShipInfo shipInfo) { - return shipInfoRepository.findBySiSeqAndSiTypeOrderByVersionNoDesc(shipInfo.getSiSeq(),shipInfo.getSiType()); + public List selectIpShiwHistoryList(ShipInfo shipInfo) { + return fipTargetMapper.selectIpShiwHistoryList(shipInfo); } public ShipInfo selectIpShipHistoryView(ShipInfo shipInfo) { diff --git a/src/main/resources/mybatisMapper/FipTarget.xml b/src/main/resources/mybatisMapper/FipTarget.xml index 14c85713..1d2dbe7e 100644 --- a/src/main/resources/mybatisMapper/FipTarget.xml +++ b/src/main/resources/mybatisMapper/FipTarget.xml @@ -247,6 +247,7 @@ + + select user_seq, - user_id - user_name + user_id, + (select item_value from code_mgt where item_cd = title_cd) as title_cd, + user_nm from user_info where og_cd in diff --git a/src/main/resources/templates/fipTarget/ipShipHistory.html b/src/main/resources/templates/fipTarget/ipShipHistory.html index 574312c9..4a6d8cbc 100644 --- a/src/main/resources/templates/fipTarget/ipShipHistory.html +++ b/src/main/resources/templates/fipTarget/ipShipHistory.html @@ -34,7 +34,7 @@ - + diff --git a/src/main/resources/templates/fipTarget/partInfoHistory.html b/src/main/resources/templates/fipTarget/partInfoHistory.html index 8fed6b46..a4223ec4 100644 --- a/src/main/resources/templates/fipTarget/partInfoHistory.html +++ b/src/main/resources/templates/fipTarget/partInfoHistory.html @@ -41,7 +41,7 @@ type="hidden" class="piSeq" th:value="${partInfo.piSeq}"> - + diff --git a/src/main/resources/templates/fipTarget/partInfoModifyModal.html b/src/main/resources/templates/fipTarget/partInfoModifyModal.html index 0a6d815b..352f2c9d 100644 --- a/src/main/resources/templates/fipTarget/partInfoModifyModal.html +++ b/src/main/resources/templates/fipTarget/partInfoModifyModal.html @@ -42,7 +42,7 @@ @@ -145,8 +145,8 @@ \ No newline at end of file diff --git a/src/main/resources/templates/fipTarget/partInfoSelecBox.html b/src/main/resources/templates/fipTarget/partInfoSelecBox.html index cb36fb68..8e989dcc 100644 --- a/src/main/resources/templates/fipTarget/partInfoSelecBox.html +++ b/src/main/resources/templates/fipTarget/partInfoSelecBox.html @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/main/resources/templates/fipTarget/partWorkList.html b/src/main/resources/templates/fipTarget/partWorkList.html index 21ba13eb..7cb3fc3f 100644 --- a/src/main/resources/templates/fipTarget/partWorkList.html +++ b/src/main/resources/templates/fipTarget/partWorkList.html @@ -62,7 +62,7 @@ - + @@ -82,7 +82,7 @@ - + diff --git a/src/main/resources/templates/fipTarget/partWorkModifyModal.html b/src/main/resources/templates/fipTarget/partWorkModifyModal.html index 0fca2542..719e29e2 100644 --- a/src/main/resources/templates/fipTarget/partWorkModifyModal.html +++ b/src/main/resources/templates/fipTarget/partWorkModifyModal.html @@ -25,7 +25,7 @@
- +
diff --git a/src/main/resources/templates/fipTarget/vulnEditModal.html b/src/main/resources/templates/fipTarget/vulnEditModal.html index 9d1f904d..c896f459 100644 --- a/src/main/resources/templates/fipTarget/vulnEditModal.html +++ b/src/main/resources/templates/fipTarget/vulnEditModal.html @@ -17,6 +17,7 @@ +
@@ -86,8 +87,8 @@ - - + +
diff --git a/src/main/resources/templates/fipTarget/vulnInfoModal.html b/src/main/resources/templates/fipTarget/vulnInfoModal.html index 43d5d624..35efa299 100644 --- a/src/main/resources/templates/fipTarget/vulnInfoModal.html +++ b/src/main/resources/templates/fipTarget/vulnInfoModal.html @@ -24,7 +24,7 @@ - + diff --git a/src/main/resources/templates/fipTarget/vulnViewModal.html b/src/main/resources/templates/fipTarget/vulnViewModal.html index 15253928..266c5f4c 100644 --- a/src/main/resources/templates/fipTarget/vulnViewModal.html +++ b/src/main/resources/templates/fipTarget/vulnViewModal.html @@ -23,7 +23,7 @@ - +