자산정보추가

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;
 	}

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;
+	}
 	
 	
 	

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<String, Object> bodyMap   = new LinkedHashMap(); 
     	Map<String, Object> returnMap = new LinkedHashMap();
     	
@@ -386,6 +394,7 @@ public class GroupManageController
         List<GroupManageVO> 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";
 	}
-    
-    
-    
         
 	
 }

src/main/webapp/WEB-INF/jsp/itms/rem/AdminServiceDetail.jsp

@@ -374,7 +374,7 @@
 						<td><input type="text" name="vcServiceName" id="vcServiceName" value="${resultService.vcServiceName}" style="width:80%;" /></td>
 						<th> 조치예정자 </th>
 						<td>
-							<input type="text" name="vcChargeUser" id="vcChargeUser" value="${resultService.vcChargeUser}" style="width:80%;" />
+							<input type="text" name="vcChargeUser" id="vcChargeUser" readonly value="${resultService.vcChargeUser}" style="width:80%;" />
 							
 							<a href="<c:url value='/cmm/selectUserListPopup.do' />" target="_blank"   title="새 창으로 이동"  onclick="fn_User_Search('조치예정', 'inChargeUser', '', 'vcChargeUser', '', '');return false;">
 							<img src="<c:url value='/egov/images/egovframework/com/cmm/btn/btn_search.gif' />" alt="조치예정자 검색" title="조치예정자 검색">

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("<c:url value='/sys/GroupSearchList.do?resType=P'/>","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 @@
 						<td><input type="text" name="vcVersion" id="vcVersion" value=""/></td>
 						<th>시리얼</th>
 						<td><input type="text" name="vcAssetSerial" id="vcAssetSerial" value=""/></td>
-						<th></th>
+						<th>관리그룹</th>
-						<td></td>
+						<td>
+							<input type="text" name="vcGrpNm" id="vcGrpNm" value="" style="width:80%;" />
+							
+							<a href="<c:url value='/sys/GroupSearchList.do' />" target="_blank"   title="새 창으로 이동"  onclick="fncSelectAuthorGroupPop();return false;">
+							<img src="<c:url value='/egov/images/egovframework/com/cmm/btn/btn_search.gif' />" alt="조치예정자 검색" title="조치예정자 검색">
+							</a>
+							
+							<input type="hidden" name="vcGrpId" id="vcGrpId" value="" >
+							
+						</td>
 					</tr>
 					<tr>
 						<th>호스트명</th>
@@ -412,9 +440,38 @@
 							<input type="text" class="btn_calendar" name="dtEos" id="dtEos" 
 								maxlength="10" value="${dtEos}" title="EOS일" readonly   style="width:80%;" />
 						</td>
+						<%-- 2025.08.18 나혁제 추가  --%>
+						<th>점검대상여부</th>
+						<td>
+							<select name="chkTrgYn" id="chkTrgYn" style="width:100px;">
+								<option value="N" >미대상</option>
+								<option value="Y" selected>대상</option>
+							</select>
+						</td>
+					</tr>
+					
+					<tr>
+						<th>상세 CPU</th>
+						<td><input type="text" name="vcDtlCpu" id="vcHost" value="" style="width:90%;" /></td>
+						<th>상세 DISK</th>
+						<td><input type="text" name="vcDtlDisk" id="vcHost" value="" style="width:90%;" /></td>
+						<th>상세 MEM</th>
+						<td><input type="text" name="vcDtlMem" id="vcHost" value="" style="width:90%;" /></td>						
+					</tr>
+					
+					<tr>
+						<th>IP ADDRESS</th>
+						<td><input type="text" name="vcIp" id="vcIp" value="" style="width:90%;" /></td>
+						
+						<th></th>
+						<td></td>
+						
 						<th></th>
 						<td></td>
 					</tr>
+					
+					
+					
 					<tr>
 						<th>용도</th>
 						<td colspan="5">

src/main/webapp/WEB-INF/jsp/itms/sys/GroupSearch.jsp

@@ -37,9 +37,14 @@
 	function fncManageChecked() 
 	{
 	
-	    var checkField = document.listForm.delYn;
+	    var checkField = document.listForm.delYn  ;
-	    var checkId = document.listForm.checkId;
+	    
+	    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("<spring:message code="comCopSecGmt.validate.groupOneSelect"/>");
 	                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("<spring:message code="comCopSecGmt.validate.groupSelectResult"/>");
 	    }
 	
 	    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 = "<c:url value='/sec/gmt/EgovGroupSearchList.do'/>";
+	 // document.listForm.action = "<c:url value='/sys/GroupSearchList.do'/>";
 	    document.listForm.submit();
 	}
 	
@@ -111,8 +127,16 @@
 	{
 		if(fncManageChecked()) 
 		{
-			opener.listForm.searchKeyword.value = document.listForm.groupId.value;
+			// 2025.08.18 나혁제 응답유형에 따라 변경처리 
-	     // window.returnValue = document.listForm.groupId.value;
+			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 = "<c:url value='/sec/gmt/EgovGroupSearchList.do'/>";
+	 // document.listForm.action = "<c:url value='/sys/GroupSearchList.do'/>";
 	    document.listForm.submit();
 	}
 	
@@ -139,7 +163,7 @@
 <!-- javascript warning tag  -->
 <noscript class="noScriptTitle"><spring:message code="common.noScriptTitle.msg" /></noscript>
 
-<form:form name="listForm" action="${pageContext.request.contextPath}/sec/gmt/EgovGroupSearchList.do" method="post">
+<form:form name="listForm" action="${pageContext.request.contextPath}/sys/GroupSearchList.do" method="post">
 
 	<%-- 2025.01.23 나혁제 신디자인 적용 
 	<div class="content">
@@ -234,6 +258,8 @@
 						<input type="checkbox" name="delYn" class="check2" title="선택">
 						<span class="checkbox_icon"></span>
 						<input type="hidden" name="checkId" value="<c:out value="${group.groupId}"/>" />
+						<input type="hidden" name="checkNm" value="<c:out value="${group.groupNm}"/>" />
+						
 					</label>
 				</td>
 				<td class="lt_text" nowrap="nowrap"><a href="#LINK" onclick="javascript:fncSelectGroup('<c:out value="${group.groupId}"/>')"><c:out value="${group.groupId}"/></a></td>
@@ -258,9 +284,11 @@
 	--%>
 	
 	<input type="hidden" name="groupId"/>
+	<input type="hidden" name="groupNm"/>
 	<input type="hidden" name="groupIds"/>
 	<input type="hidden" name="pageIndex" value="<c:out value='${groupManageVO.pageIndex}'/>"/>
 	<input type="hidden" name="searchCondition"/>
+	<input type="hidden" name="resType" value='${resType}' />
 </form:form>