diff --git a/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp b/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp index 7483acd..7d3e5bd 100644 --- a/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp +++ b/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp @@ -101,6 +101,32 @@ } }); + $("#btn_app_force_reject").click(function () { + if (!confirm("승인자 목록에 삭제된 사용자가 있어 승인 진행이 불가능한 건입니다.\n강제 반려하시겠습니까?")) { + return; + } + var rejectReason = prompt("강제 반려 사유를 입력해 주세요"); + if (rejectReason != null) { + $.ajax({ + type: "POST", + url: url, + data: {cmd: "FORCE_REJECT", id: key, rejectReason: rejectReason}, + success: function (args) { + alert("강제 반려되었습니다."); + if (window.dialogArguments && window.dialogArguments.self) { + window.dialogArguments.self.location.reload(); + } else if (window.opener) { + window.opener.location.reload(); + } + window.close(); + }, + error: function (e) { + alert(e.responseText); + } + }); + } + }); + $('#btn_app_redeploy').click(function () { if (confirm("재배포 하시겠습니까?")) { $.ajax({ @@ -178,10 +204,11 @@ $("#createdDate").text(data.createdDate).inputmask("9999-99-99 99:99:99.999", {'autoUnmask': true}); $("#expectEndDate").val(data.expectEndDate); - if (data.approvers.some(approver => + var isCurrentApprover = data.approvers.some(approver => approver.approverStatus === 'CURRENT' && - approver.user.USERID === loginUser - )) { + approver.user && approver.user.USERID === loginUser + ); + if (isCurrentApprover) { document.getElementById("btn_app_approve").style.display = ""; document.getElementById("btn_app_reject").style.display = ""; } else { @@ -189,6 +216,14 @@ document.getElementById("btn_app_reject").style.display = "none"; } + // 삭제된 승인자(USERID 없음)로 진행 불가한 건: 요청됨/진행중 상태면 승인자가 아니어도 강제 반려 허용 + var hasDeletedApprover = data.approvers.some(approver => + !approver.user || !approver.user.USERID + ); + var isProgressStatus = data.approvalStatus.code === 'REQUESTED' || data.approvalStatus.code === 'PROCESSING'; + document.getElementById("btn_app_force_reject").style.display = + (hasDeletedApprover && isProgressStatus && !isCurrentApprover) ? "" : "none"; + if (data.approvalStatus.code === 'FAILED') { document.getElementById("btn_app_redeploy").style.display = ""; } @@ -345,6 +380,9 @@ + diff --git a/WebContent/jsp/onl/apim/approval/portalUserApprovalManPopup.jsp b/WebContent/jsp/onl/apim/approval/portalUserApprovalManPopup.jsp index 101cfcc..cc5b70b 100644 --- a/WebContent/jsp/onl/apim/approval/portalUserApprovalManPopup.jsp +++ b/WebContent/jsp/onl/apim/approval/portalUserApprovalManPopup.jsp @@ -150,6 +150,32 @@ } }); + $("#btn_user_force_reject").click(function() { + if (!confirm("승인자 목록에 삭제된 사용자가 있어 승인 진행이 불가능한 건입니다.\n강제 반려하시겠습니까?")) { + return; + } + var rejectReason = prompt("강제 반려 사유를 입력해 주세요"); + if (rejectReason != null) { + $.ajax({ + type: "POST", + url: url, + data: {cmd: "FORCE_REJECT", id: key, rejectReason: rejectReason}, + success: function(args) { + alert("강제 반려되었습니다."); + if (window.dialogArguments && window.dialogArguments.self) { + window.dialogArguments.self.location.reload(); + } else if (window.opener) { + window.opener.location.reload(); + } + window.close(); + }, + error: function(e) { + alert(e.responseText); + } + }); + } + }); + $('#btn_user_redeploy').click(function() { if (confirm("재배포 하시겠습니까?")) { $.ajax({ @@ -222,10 +248,11 @@ $("#mobileNumber").text(portalUser.mobileNumber); $("#userStatusDescription").text(portalUser.userStatusDescription); $("#roleCodeDescription").text(portalUser.roleCodeDescription); - if (data.approvers.some(approver => + var isCurrentApprover = data.approvers.some(approver => approver.approverStatus === 'CURRENT' && - approver.user.USERID === loginUser - )) { + approver.user && approver.user.USERID === loginUser + ); + if (isCurrentApprover) { document.getElementById("btn_user_approve").style.display = ""; document.getElementById("btn_user_reject").style.display = ""; } else { @@ -233,6 +260,14 @@ document.getElementById("btn_user_reject").style.display = "none"; } + // 삭제된 승인자(USERID 없음)로 진행 불가한 건: 요청됨/진행중 상태면 승인자가 아니어도 강제 반려 허용 + var hasDeletedApprover = data.approvers.some(approver => + !approver.user || !approver.user.USERID + ); + var isProgressStatus = data.approvalStatus.code === 'REQUESTED' || data.approvalStatus.code === 'PROCESSING'; + document.getElementById("btn_user_force_reject").style.display = + (hasDeletedApprover && isProgressStatus && !isCurrentApprover) ? "" : "none"; + if (data.approvalStatus.description === '배포실패'){ document.getElementById("btn_user_redeploy").style.display = ""; } @@ -486,6 +521,7 @@
+ diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/common/DjbProperty.java b/src/main/java/com/eactive/eai/rms/ext/djb/common/DjbProperty.java index e7c4ac6..55575db 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/common/DjbProperty.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/common/DjbProperty.java @@ -41,7 +41,7 @@ public class DjbProperty { description = "API 접근 허용 IP 목록 (콤마(,)로 구분된 IP들, 예: 192.168.0.1, 192.168.1.*,127.*.*.*", defaultValue = "10.15.106.*, 10.14.8.*, 10.15.8.*, 192.168.240.*, 127.0.0.1, 192.168.132.*, 192.168.131.*" ) - private String apiAllowIpList = "10.15.106.*, 10.14.8.*, 10.15.8.*, 192.168.240.*, 127.0.0.1, 192.168.132.*, 192.168.131.*"; + private String dapiAllowIpList = "10.15.106.*, 10.14.8.*, 10.15.8.*, 192.168.240.*, 127.0.0.1, 192.168.132.*, 192.168.131.*"; diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java index a8a0500..d97086d 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java @@ -77,6 +77,15 @@ public class PortalApprovalManController extends BaseAnnotationController { return ResponseEntity.ok().build(); } + @PostMapping(value = "/onl/apim/approval/portalApprovalMan.json", params = "cmd=FORCE_REJECT") + public ResponseEntity forceReject(String id, String rejectReason) { + if (StringUtils.isBlank(rejectReason)) { + throw new BizException("강제 반려 사유를 입력해 주세요."); + } + portalApprovalManService.forceReject(id, SessionManager.getLoginVo().getUserId(), rejectReason); + return ResponseEntity.ok().build(); + } + @PostMapping(value = "/onl/apim/approval/portalApprovalMan.json", params = "cmd=REDEPLOY") public ResponseEntity redeploy(String id) { portalApprovalManService.redeploy(id); diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java index 6aa080a..96b4172 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java @@ -5,6 +5,7 @@ import com.eactive.apim.portal.apprequest.entity.AppRequest; import com.eactive.apim.portal.apprequest.repository.AppRequestRepository; import com.eactive.apim.portal.approval.entity.Approval; import com.eactive.apim.portal.approval.entity.ApprovalType; +import com.eactive.apim.portal.approval.entity.ApproverStatus; import com.eactive.apim.portal.approval.statemachine.*; import com.eactive.apim.portal.portalproperty.service.PortalPropertyService; import com.eactive.apim.portal.portaluser.entity.PortalUser; @@ -41,6 +42,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; +import java.time.LocalDateTime; import java.util.*; @Service @@ -342,6 +344,51 @@ public class PortalApprovalManService extends BaseService { sendEvent(id, ApprovalEvent.DENY, options); } + /** + * 강제 반려: 승인자 목록에 삭제된 사용자가 있어 승인 진행이 불가능한 건을 + * 승인자가 아닌 관리자도 반려 처리할 수 있다. (요청됨/진행중 상태에서만 허용) + */ + public void forceReject(String id, String adminUserId, String rejectReason) { + Approval approval = approvalService.findById(id) + .orElseThrow(() -> new IllegalArgumentException("승인 정보를 찾을 수 없습니다. ID: " + id)); + + ApprovalState currentStatus = approval.getApprovalStatus(); + if (!(currentStatus instanceof RequestedState) && !(currentStatus instanceof ProcessingState)) { + throw new BizException("요청됨/진행중 상태의 승인 요청만 강제 반려할 수 있습니다."); + } + boolean hasDeletedApprover = approval.getApprovers().stream() + .anyMatch(approver -> approver.getUser() == null); + if (!hasDeletedApprover) { + throw new BizException("승인자 목록에 삭제된 사용자가 있는 경우에만 강제 반려할 수 있습니다."); + } + + approval.getApprovers().forEach(approver -> { + if (approver.getUser() == null + && (ApproverStatus.CURRENT.equals(approver.getApproverStatus()) + || ApproverStatus.PENDING.equals(approver.getApproverStatus()))) { + approver.setApproverStatus(ApproverStatus.DENIED); + approver.setApprovedDate(LocalDateTime.now()); + approver.setApprovalMessage("[관리자 강제 반려: " + adminUserId + "] " + rejectReason); + } + }); + approval.setApprovalStatus(new DeniedState()); + + Map options = new HashMap<>(); + options.put(ApprovalConstants.APPROVER, adminUserId); + options.put((String) ApprovalConstants.MESSAGE, rejectReason); + options.put("authorizer", portalApprovalAuthorizer); + if (approval.getApprovalType().equals(ApprovalType.APP)) { + options.put("listener", portalAppApprovalListener); + } else if (approval.getApprovalType().equals(ApprovalType.USER)) { + options.put("listener", portalUserApprovalListener); + } + // DENY 이벤트는 authorizer 검증에 걸리므로 상태를 직접 DENIED 로 만든 뒤 END 로 롤백만 수행 + approvalStateMachine.transition(approval, ApprovalEvent.END, options); + + approvalService.save(approval); + logger.info("Approval {} force-rejected by admin {} (deleted approver present)", id, adminUserId); + } + public void update(String id, String expectEndDate) { Approval approval = approvalService.findById(id) .orElseThrow(() -> new IllegalArgumentException("승인 정보를 찾을 수 없습니다. ID: " + id));