From 7cbe7dcb4e9731098ed4810ff8b5517fbd2e5199 Mon Sep 17 00:00:00 2001 From: nhj Date: Mon, 18 Aug 2025 18:18:06 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=90=EC=82=B0=EC=A0=95=EB=B3=B4=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResourceManagerController.java | 2 +- .../urpsys/itmsfront/rem/domain/AssetVo.java | 44 +++++++++++++ .../sys/controller/GroupManageController.java | 12 +++- .../jsp/itms/rem/AdminServiceDetail.jsp | 2 +- .../WEB-INF/jsp/itms/rem/ResourceInsert.jsp | 61 ++++++++++++++++++- .../WEB-INF/jsp/itms/sys/GroupSearch.jsp | 50 +++++++++++---- 6 files changed, 153 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/urpsys/itmsfront/rem/controller/ResourceManagerController.java b/src/main/java/com/urpsys/itmsfront/rem/controller/ResourceManagerController.java index 50d9ea5f..a59fbd34 100644 --- a/src/main/java/com/urpsys/itmsfront/rem/controller/ResourceManagerController.java +++ b/src/main/java/com/urpsys/itmsfront/rem/controller/ResourceManagerController.java @@ -833,7 +833,7 @@ public class ResourceManagerController resBody.put("iDup" , iDup); - log.info("<<<<<<<<<<<<<<< /rem/insertViewResource.do >>>>>>>>>>>>>>>"); + log.info("<<<<<<<<<<<<<<< /rem/checkAssetIdDup.do >>>>>>>>>>>>>>>"); return resBody; } diff --git a/src/main/java/com/urpsys/itmsfront/rem/domain/AssetVo.java b/src/main/java/com/urpsys/itmsfront/rem/domain/AssetVo.java index dffad117..3a71057f 100644 --- a/src/main/java/com/urpsys/itmsfront/rem/domain/AssetVo.java +++ b/src/main/java/com/urpsys/itmsfront/rem/domain/AssetVo.java @@ -70,6 +70,14 @@ public class AssetVo extends ComDefaultVO private String atchFileId ; private String atchFileInUpGb ; + // 2025.08.18 나혁제 추가정보 + private String vcGrpId ; + private String vcGrpNm ; + private String vcChkTrgYn ; + private String vcDtlCpu ; + private String vcDtlDisk ; + private String vcDtlMem ; + public String getInAssetSeq() { return inAssetSeq; } @@ -328,6 +336,42 @@ public class AssetVo extends ComDefaultVO public void setAtchFileInUpGb(String atchFileInUpGb) { this.atchFileInUpGb = atchFileInUpGb; } + public String getVcDtlCpu() { + return vcDtlCpu; + } + public void setVcDtlCpu(String vcDtlCpu) { + this.vcDtlCpu = vcDtlCpu; + } + public String getVcDtlDisk() { + return vcDtlDisk; + } + public void setVcDtlDisk(String vcDtlDisk) { + this.vcDtlDisk = vcDtlDisk; + } + public String getVcDtlMem() { + return vcDtlMem; + } + public void setVcDtlMem(String vcDtlMem) { + this.vcDtlMem = vcDtlMem; + } + public String getVcGrpNm() { + return vcGrpNm; + } + public void setVcGrpNm(String vcGrpNm) { + this.vcGrpNm = vcGrpNm; + } + public String getVcGrpId() { + return vcGrpId; + } + public void setVcGrpId(String vcGrpId) { + this.vcGrpId = vcGrpId; + } + public String getVcChkTrgYn() { + return vcChkTrgYn; + } + public void setVcChkTrgYn(String vcChkTrgYn) { + this.vcChkTrgYn = vcChkTrgYn; + } diff --git a/src/main/java/com/urpsys/itmsfront/sys/controller/GroupManageController.java b/src/main/java/com/urpsys/itmsfront/sys/controller/GroupManageController.java index b4ff4d51..b67bee32 100644 --- a/src/main/java/com/urpsys/itmsfront/sys/controller/GroupManageController.java +++ b/src/main/java/com/urpsys/itmsfront/sys/controller/GroupManageController.java @@ -7,6 +7,8 @@ import java.util.List; import java.util.Map; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.egovframe.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springmodules.validation.commons.DefaultBeanValidator; import com.urpsys.basefront.common.service.CommonService; +import com.urpsys.basefront.common.util.CommonUtil; import com.urpsys.basefront.common.util.ConvertUtils; import com.urpsys.basefront.common.util.RestApiCallUtil; @@ -353,10 +356,15 @@ public class GroupManageController */ @RequestMapping(value="/sys/GroupSearchList.do") public String selectGroupSearchList( @ModelAttribute("groupManageVO") GroupManageVO groupManageVO + , HttpServletRequest request + , HttpServletResponse response , ModelMap model) throws Exception { log.info(">>>>>>>>>>>>>>> /sys/GroupSearchList.do <<<<<<<<<<<<<<<"); + // 2025.08.17 팝업 결과처리 플래그 추가 + String strResType = CommonUtil.nvl(request.getParameter("resType" )); + Map bodyMap = new LinkedHashMap(); Map returnMap = new LinkedHashMap(); @@ -386,6 +394,7 @@ public class GroupManageController List groupList = ConvertUtils.convertToValueObjectsAll(resultList, GroupManageVO.class); paginationInfo.setTotalRecordCount(totCnt); + model.addAttribute("resType" , strResType); model.addAttribute("groupList", groupList); model.addAttribute("paginationInfo", paginationInfo); model.addAttribute("message", egovMessageSource.getMessage("success.common.select")); @@ -394,9 +403,6 @@ public class GroupManageController return "uritms-popup1/sys/GroupSearch"; } - - - } diff --git a/src/main/webapp/WEB-INF/jsp/itms/rem/AdminServiceDetail.jsp b/src/main/webapp/WEB-INF/jsp/itms/rem/AdminServiceDetail.jsp index e22df015..78a6c963 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/rem/AdminServiceDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/rem/AdminServiceDetail.jsp @@ -374,7 +374,7 @@ 조치예정자 - + 조치예정자 검색 diff --git a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceInsert.jsp b/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceInsert.jsp index 0fd234be..c063996b 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceInsert.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceInsert.jsp @@ -135,6 +135,25 @@ proc.fn_get_assetCate3(inData); } + //---------------------------------------- + // 2025.08.18 나혁제 추가 + // 그룹조회 + // ---------------------------------------- + function fncSelectAuthorGroupPop() + { + window.open("","notice","height=500, width=650, top=50, left=20, scrollbars=no, resizable=no"); + } + + //---------------------------------------- + // 2025.08.18 나혁제 추가 + // 그룹조회 후 응답 함수 + // ---------------------------------------- + function resGroupConfirm(strGroupId, strGroupNm) + { + $('#vcGrpNm').val(strGroupNm); + $('#vcGrpId').val(strGroupId); + } + // 서블릿 통신 var proc = @@ -401,8 +420,17 @@ 시리얼 - - + 관리그룹 + + + + + 조치예정자 검색 + + + + + 호스트명 @@ -412,9 +440,38 @@ + <%-- 2025.08.18 나혁제 추가 --%> + 점검대상여부 + + + + + + + 상세 CPU + + 상세 DISK + + 상세 MEM + + + + + IP ADDRESS + + + + + + + + 용도 diff --git a/src/main/webapp/WEB-INF/jsp/itms/sys/GroupSearch.jsp b/src/main/webapp/WEB-INF/jsp/itms/sys/GroupSearch.jsp index 27011eca..5ffb1946 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/sys/GroupSearch.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/sys/GroupSearch.jsp @@ -37,9 +37,14 @@ function fncManageChecked() { - var checkField = document.listForm.delYn; - var checkId = document.listForm.checkId; + var checkField = document.listForm.delYn ; + + var checkId = document.listForm.checkId; + var checkNm = document.listForm.checkNm; + var returnValue = ""; + var returnName = ""; + var checkCount = 0; var returnBoolean = false; @@ -52,12 +57,19 @@ if(checkField[i].checked) { checkCount++; - checkField[i].value = checkId[i].value; - returnValue = checkField[i].value; + + // checkField[i].value = checkId[i].value; + // checkField[i].value = checkId[i].value; + + // returnValue = checkField[i].value; + + returnValue = checkId[i].value; + returnName = checkNm[i].value; } } - if(checkCount > 1) { + if(checkCount > 1) + { alert(""); return; } @@ -72,6 +84,7 @@ if(checkField.checked == true) { returnValue = checkId.value; + returnName = checkNm.value; } else { @@ -82,11 +95,14 @@ returnBoolean = true; - } else { + } + else + { alert(""); } document.listForm.groupId.value = returnValue; + document.listForm.groupNm.value = returnName; return returnBoolean; @@ -96,7 +112,7 @@ { document.listForm.searchCondition.value = "1"; document.listForm.pageIndex.value = pageNo; - // document.listForm.action = ""; + // document.listForm.action = ""; document.listForm.submit(); } @@ -111,8 +127,16 @@ { if(fncManageChecked()) { - opener.listForm.searchKeyword.value = document.listForm.groupId.value; - // window.returnValue = document.listForm.groupId.value; + // 2025.08.18 나혁제 응답유형에 따라 변경처리 + if(document.listForm.resType.value == 'P') + { + opener.resGroupConfirm(document.listForm.groupId.value, document.listForm.groupNm.value); + } + else + { + opener.listForm.searchKeyword.value = document.listForm.groupId.value; + } + window.close(); } } @@ -121,7 +145,7 @@ { document.listForm.searchCondition.value = "1"; document.listForm.pageIndex.value = pageNo; - // document.listForm.action = ""; + // document.listForm.action = ""; document.listForm.submit(); } @@ -139,7 +163,7 @@ - + <%-- 2025.01.23 나혁제 신디자인 적용
@@ -234,6 +258,8 @@ " /> + " /> + ')"> @@ -258,9 +284,11 @@ --%> + +