- 점검보고서, 자산 처리시 그룹 사용자에 대한 처리 방향 변경

- 게시판 첨부파일가능개수, 가능확장자 변경

src/main/java/com/urpsys/basefront/config/EgovConfigAppProperties.java

@@ -47,7 +47,8 @@ public class EgovConfigAppProperties
 		properties.put("Globals.fileStorePath", storePathString+File.separator);
 		properties.put("Globals.addedOptions", "false");
 
-		properties.put("Globals.fileUpload.Extensions"       , ".gif.jpg.jpeg.png.xls.xlsx.txt.pdf.hwp.hwpx.ppt.pptx.doc.docx");
+		// 2025.08.20 나혁제 pptm 추가 
+		properties.put("Globals.fileUpload.Extensions"       , ".gif.jpg.jpeg.png.xls.xlsx.txt.pdf.hwp.hwpx.ppt.pptx.pptm.doc.docx");
 		properties.put("Globals.fileUpload.Extensions.Images", ".gif.jpg.jpeg.png");
 		
 		

src/main/java/com/urpsys/itmsfront/search/controller/TotalSearchController.java

@@ -1,6 +1,5 @@
 package com.urpsys.itmsfront.search.controller;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -8,35 +7,17 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
-import org.egovframe.rte.fdl.property.EgovPropertyService;
 import org.egovframe.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import com.google.gson.FieldNamingPolicy;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.urpsys.basefront.common.egov.util.EgovStringUtil;
 import com.urpsys.basefront.common.util.CommonUtil;
-import com.urpsys.basefront.common.util.ConvertUtils;
 import com.urpsys.basefront.common.util.RestApiCallUtil;
 import com.urpsys.basefront.domain.ComDefaultVO;
-import com.urpsys.basefront.domain.MemberVO;
-import com.urpsys.basefront.domain.TokenInfo;
-import com.urpsys.itmsfront.sys.domain.PrsnlPortletCreateVO;
-import com.urpsys.itmsfront.sys.domain.PrsnlPortletManageVO;
 
-import kong.unirest.HttpResponse;
-import kong.unirest.JsonNode;
-import kong.unirest.Unirest;
-import kong.unirest.json.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 
 /**

src/main/java/com/urpsys/itmsfront/srm/controller/ReportCheckController.java

@@ -283,6 +283,7 @@ public class ReportCheckController
     	
     	// 서비스 정보 추출
     	bodyMap.put("inIncidentSeq", CommonUtil.getData(request, "inIncidentSeq"));
+    	bodyMap.put("inAssetSeq"   , CommonUtil.getData(request, "inAssetSeq"   )); // 2025.08.20 나혁제 연결자산 추가
     	
     	// RestApi Call Start ---------------------------------
         returnMap = restApiCallUtil.RestApiCall(bodyMap, "/srm/getInitReportCheck.do");
@@ -291,11 +292,13 @@ public class ReportCheckController
         List<Map<String, Object>> resultForm    = (List<Map<String, Object>>)returnMap.get("resultForm");
         Map<String, Object>  resultTaskMap  = (Map<String, Object>)returnMap.get("resultTask");
         Map<String, Object>  resultIncident = (Map<String, Object>)returnMap.get("resultIncident"); // 인스던트 정보 확인 
+        Map<String, Object>  resultAsset    = (Map<String, Object>)returnMap.get("resultAsset"); // 2025.08.20 나혁제 자산정보추가 
         
         model.addAttribute("resultService"  , resultService  );  // 서비스 정보
         model.addAttribute("resultTaskMap"  , resultTaskMap  );  // 작업정보
         model.addAttribute("resultIncident" , resultIncident );  // 인스던트 정보
         model.addAttribute("resultForm"     , resultForm     );  // 보고서 양식 정보
+        model.addAttribute("resultAsset"    , resultAsset    );  // 보고서 양식 정보
         
      // 인스던트 정보가 없는경우 0 으로 세팅 
         if(resultIncident.get("inIncidentSeq") == null)

src/main/resources/validator/urp/ItsmValidator.xml

@@ -10,8 +10,13 @@
     	    <field property="vcAssetName" depends="required">
         		<arg0 key="자산명" />
 			</field>
-			<field property="vcAssetId" depends="required">
+			<field property="vcAssetId" depends="required, maxlength">
         		<arg0 key="자산번호" />
+        		<arg1 key="50" resource="true"/>
+                <var>
+                <var-name>maxlength</var-name>
+                <var-value>50</var-value>
+                </var>
 			</field>
     		<field property="inPrice" depends="required">
         		<arg0 key="도입금맥" />

src/main/webapp/WEB-INF/jsp/itms/bbs/BoardMstrRegist.jsp

@@ -264,6 +264,7 @@
 				</tr>
 				
 				<!-- 첨부가능파일 숫자 -->
+				<!-- 2025.08.20 나혁제 첨부파일 가능개수 10개로 추가  -->
 				<tr>
 					<th><spring:message code="cop.posblAtchFileNumber" /></th>
 					<td colspan="3">
@@ -272,6 +273,13 @@
 							<form:option value="1">1개</form:option>
 							<form:option value="2">2개</form:option>
 							<form:option value="3">3개</form:option>
+							<form:option value="4">4개</form:option>
+							<form:option value="5">5개</form:option>
+							<form:option value="6">6개</form:option>
+							<form:option value="7">7개</form:option>
+							<form:option value="8">8개</form:option>
+							<form:option value="9">9개</form:option>
+							<form:option value="10">10개</form:option>
 						</form:select>
 						<br />
 						<div><form:errors path="posblAtchFileNumber" cssClass="error" />

src/main/webapp/WEB-INF/jsp/itms/bbs/BoardMstrUpdt.jsp

@@ -248,6 +248,13 @@
 							<option value='1' <c:if test="${result.posblAtchFileNumber == '1'}">selected="selected"</c:if>>1개</option>
 							<option value='2' <c:if test="${result.posblAtchFileNumber == '2'}">selected="selected"</c:if>>2개</option>
 							<option value='3' <c:if test="${result.posblAtchFileNumber == '3'}">selected="selected"</c:if>>3개</option>
+							<option value='4' <c:if test="${result.posblAtchFileNumber == '4'}">selected="selected"</c:if>>4개</option>
+							<option value='5' <c:if test="${result.posblAtchFileNumber == '5'}">selected="selected"</c:if>>5개</option>
+							<option value='6' <c:if test="${result.posblAtchFileNumber == '6'}">selected="selected"</c:if>>6개</option>
+							<option value='7' <c:if test="${result.posblAtchFileNumber == '7'}">selected="selected"</c:if>>7개</option>
+							<option value='8' <c:if test="${result.posblAtchFileNumber == '8'}">selected="selected"</c:if>>8개</option>
+							<option value='9' <c:if test="${result.posblAtchFileNumber == '9'}">selected="selected"</c:if>>9개</option>
+							<option value='10' <c:if test="${result.posblAtchFileNumber == '10'}">selected="selected"</c:if>>10개</option>
 						</select> 
 						<br />
 						<form:errors path="posblAtchFileNumber" />

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

@@ -261,6 +261,39 @@
 	</div>
 	<!-- tbl list : end -->
 	
+	<!-- main title -->
+	<div class="main_titWrap">
+		<h3>점검대상여부</h3>
+	</div>
+	
+	<!-- tbl list : start -->
+	<div class="tbl_list">
+		<table class="table">
+		
+			<caption></caption>
+			
+			<colgroup>
+				<col style="width:30%" />
+				<col style="width:*" />
+			</colgroup>
+			
+			<thead>
+				<tr>
+				   <th scope="col">코드</th>
+				   <th scope="col">코드명</th>
+				</tr>
+			</thead>
+			
+			<tbody>
+				<tr> <td> Y </td><td> 대상 </td> </tr>
+				<tr> <td> N </td><td> 미대상 </td> </tr>
+			</tbody>
+		
+		</table>
+	</div>
+	<!-- tbl list : end -->
+	
+	
 	
 	
 	

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

@@ -194,15 +194,15 @@
 	{
 		if(inTask == '1')
 		{
-			gPostDate.url = "/srm/getReportWithBodyCheck.do";	
+			gPostDate.url = "/srm/getReportWithBodyCheck.do?baseMenuNo=3000000";	
 		}
 		else if(inTask == '2')
 		{
-			gPostDate.url = "/srm/getReportWithBodyError.do"; 
+			gPostDate.url = "/srm/getReportWithBodyError.do?baseMenuNo=3000000"; 
 		}
 		else if(inTask == '3')
 		{
-			gPostDate.url = "/srm/getReportWithBodyIssue.do";
+			gPostDate.url = "/srm/getReportWithBodyIssue.do?baseMenuNo=3000000";
 		}
 		else 	
 		{
@@ -220,14 +220,14 @@
 	}
 	
 	//----------------------------------------
-	// 사용자 자산 팝업
+	// 자산이역조회 팝업
 	// ----------------------------------------
 	function fn_Asset_Hist_Search()
 	{
 		var inAssetSeq = $('#inAssetSeq').val();
 		
 		var strUrl = "/rem/SelectResourceHist.do?inAssetSeq="+inAssetSeq;
-		
+		 
 		var arrParam = new Array(6);
 		arrParam[0] = window;
 		
@@ -255,6 +255,29 @@
 		$('#vcGrpId').val(strGroupId);
 	}
 	
+	//----------------------------------------
+	// 2025.08.20 나혁제
+	// 점검보고서 등록 화면 이동  
+	// ----------------------------------------
+	function fncReportRegist()
+	{
+		// 보고서 등록 화면  이동처리 
+		var varFrom = document.getElementById("resourceManage");
+		
+		gPostDate.url = "/srm/insertViewReportCheck.do?baseMenuNo=3000000";
+		
+		var inVal = [];
+		inVal.push(["inAssetSeq", varFrom.inAssetSeq.value] );
+		
+		gPostDate.vals = inVal;
+		
+		gPostDate.target = "_self";
+		pageGoPost(gPostDate);
+		
+		// var varFrom = document.getElementById("resourceManage");
+		// varFrom.action = "/srm/insertViewReportCheck.do?baseMenuNo=3000000&inAssetSeq="+varFrom.inAssetSeq.value;
+		// varFrom.submit();
+	}
 	
 	//----------------------------------------
 	// 서블릿 통신
@@ -618,6 +641,12 @@
 						<th> 연결보고서 </th>
 						<td colspan=5 style="vertical-align: top;">
 							
+							<div class="btn_group" >
+								<button type="button" class="btn-function" onclick="fncReportRegist();return false;" style="margin-top: -10px;"> 
+									점고보고서 등록 
+								</button>
+							</div>
+							
 							<div class="tbl_list" style="margin-top: 10px;">
 								<!-- 목록영역 -->
 								<table class="table" summary="" id="table_report" >

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

@@ -359,6 +359,13 @@
 		        	var txUsage	             = $.trim(rows[i].용도         ) +"";
 		        	var txAssetDesc          = $.trim(rows[i].비고         ) +"";
 		        	
+		        	// 2025.08.19 나혁제 자산 추가속성
+		        	var vcIp                 = $.trim(rows[i].IP         ) +"";
+		        	var vcDtlCpu             = $.trim(rows[i].CPU        ) +"";
+		        	var vcDtlDisk            = $.trim(rows[i].DISK       ) +"";
+		        	var vcDtlMem             = $.trim(rows[i].MEM        ) +"";
+		        	var vcChkTrgYn           = $.trim(rows[i].점검대상여부   ) +"";
+		        	
 		        	if( vcAssetId          == undefined || vcAssetId          == 'undefined' ) vcAssetId = '';
 		        	if( inCate1            == undefined || inCate1            == 'undefined' ) inCate1   = '';
 		        	if( inCate2            == undefined || inCate2            == 'undefined' ) inCate2 = '';
@@ -381,6 +388,15 @@
 		        	if( txUsage            == undefined || txUsage            == 'undefined' ) txUsage = '';
 		        	if( txAssetDesc        == undefined || txAssetDesc        == 'undefined' ) txAssetDesc = '';
 		        	
+		        	// 2025.08.19 나혁제 자산 추가속성
+		        	if( vcIp        == undefined || vcIp       == 'undefined' ) vcIp       = '';
+		        	if( vcDtlCpu    == undefined || vcDtlCpu   == 'undefined' ) vcDtlCpu   = '';
+		        	if( vcDtlDisk   == undefined || vcDtlDisk  == 'undefined' ) vcDtlDisk  = '';
+		        	if( vcDtlMem    == undefined || vcDtlMem   == 'undefined' ) vcDtlMem   = '';
+		        	if( vcChkTrgYn  == undefined || vcChkTrgYn == 'undefined' ) vcChkTrgYn = '';
+		        	
+		        	if( vcChkTrgYn != 'Y') vcChkTrgYn=''; 
+		        	
 		        	var strErrCd             = '';
 		        	var strErrMsg            = '';
 		        	
@@ -391,8 +407,6 @@
 		        	var vcMasCheckPeriodNm = getArMasCheckPeriod(vcMasCheckPeriod);
 		        	var vcMasTarget        = getvcMasTarget(inMasTarget);
 		        	
-		        	
-		        	
 		        	if(vcCate1=='' || vcCate2=='' || vcCate3=='')
 		        	{
 		        		strErrCd = 'E';
@@ -411,6 +425,12 @@
 		        		strErrMsg = strErrMsg+'|'+'자산번호을 입력해 주세요.';
 		        	}
 		        	
+		        	if(vcAssetId.length > 50)
+		        	{
+		        		strErrCd = 'E';
+		        		strErrMsg = strErrMsg+'|'+'자산번호는 50자리 이하로 입력해 주세요.';
+		        	}
+		        	
 		        	if(vcAssetName=='' )
 		        	{
 		        		strErrCd = 'E';
@@ -510,6 +530,11 @@
 		        	            , dtEos	             
 		        	            , txUsage	             
 		        	            , txAssetDesc
+		        	            , vcIp        // 2025.08.19 나혁제 자산 추가속성
+		        	            , vcDtlCpu    // 2025.08.19 나혁제 자산 추가속성
+		        	            , vcDtlDisk   // 2025.08.19 나혁제 자산 추가속성
+		        	            , vcDtlMem    // 2025.08.19 나혁제 자산 추가속성
+		        	            , vcChkTrgYn  // 2025.08.19 나혁제 자산 추가속성
 		        	            , strErrCd
 		        	            , strErrMsg
 		        	            }
@@ -554,9 +579,6 @@
 					 			,"dialogWidth:800px;dialogHeight:1000px;resizable:yes;center:yes");
 	}
 	
-	
-	
-	
 	//서블릿 통신
 	var proc = 
 	{
@@ -678,8 +700,6 @@
 					<th>제조사</th>
 					<th>처리결과</th>
 					<th>처리결과메세지</th>
-					
-					
 				</tr>
 				</thead>
 				<tbody class="ov">

src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckInsert.jsp

@@ -85,6 +85,12 @@
 	    
 		// drawEditor("");
 	    drawEditor("serviceBody", "", false);
+	    
+	    // 2025.08.20 나혁제 연결자산정보가 있는경우 자산정보 Setting
+	    if('${resultAsset.inAssetSeq}' != '')
+	    {
+	    	fn_table_asset_tr_add('${resultAsset.inAssetSeq}', '${resultAsset.vcAssetName}', '${resultAsset.vcCate3}');
+	    }
 	});
 	
 	//----------------------------------------

src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckPrintPop.jsp

@@ -49,6 +49,23 @@
 <!-- 시간처리 -->
 <script type="text/javascript" src="${ctx}/js/js-calendar/jquery-ui-timepicker-addon.js"></script>
 <link rel="stylesheet" type="text/css" href="${ctx}/css/jquery-ui-timepicker-addon.css">
+
+<style type="text/css">
+@media print {
+  /* TinyMCE UI는 숨김 */
+  .tox-tinymce {
+    display: none !important;
+  }
+
+  /* 대신 우리가 복사해둔 div를 출력 */
+  #editorPreview {
+    display: block !important;
+    width: 100% !important;
+    overflow: visible !important;
+  }
+}
+</style>
+
 	
 <script type="text/javaScript" language="javascript">
 
@@ -77,11 +94,18 @@
 		
 		if ( -1 != browser.indexOf('chrome') )
 		{
-		 	setTimeout(function()
+			setTimeout(function()
 			{
+				// 2025.08.19 나혁제 TinyMCE 인쇄조정처리 
+				const editor = tinymce.get('serviceBody');
+				const editorContent = editor.getContent();
+				  
+				document.getElementById("editorPreview").innerHTML = strForm;
+				
 		 		window.print();
 				window.close();
 			} , 3000);
+			
 	    }
 		else if ( -1 != browser.indexOf('trident') )
 		{
@@ -196,39 +220,68 @@
 			</tbody>
 		</table>
 		
-		<!-- 자산 영역 -->
+		
-		<div class="tbl_list">
+		<!-- 2028.08.19 나혁제 자산 상세 영역 -->
+		<c:if test="${ assetDtlYn == 'Y'}">
+			<c:forEach var="assets" items="${resultAssets}" varStatus="status">
+				
+			<div class="tbl_list">
 			<!-- 목록영역 -->
-			<c:if test="${ assetDtlYn == 'Y'}">
-				<c:forEach var="assets" items="${resultAssets}" varStatus="status">
 				<table class="table" summary="" id="table_asset" >
 					<caption>연결자산정보  <spring:message code="title.list" /></caption>
 					<colgroup>
-						<col style="width: 25%;">
+						<col style="width: 20%;">
-						<col style="width: 25%;">
+						<col style="width: 15%;">
-						<col style="width: 25%;">
+						<col style="width: 15%;">
-						<col style="width: 25%;">
+						<col style="width: 20%;">
+						<col style="width: 15%;">
+						<col style="width: 15%;">
 					</colgroup>
 					<tbody>
 						
 						<tr>
-							<th> 구분 </th>
+							<th>구분</th> <td colspan=2>${assets.vcCate1} (${assets.vcCate2})</td>
-							<td>
+							<th>제품영</th>  <td colspan=2 >${assets.vcCate3} </td>
-								${assets.vcCate3}
+						</tr>
-							</td>
+						<tr>
-							<th>제품영</th>
+							<th>Model Name</th> <td colspan=2> ${assets.vcModel}</td>
+							<th>HostName</th>  <td colspan=2>${assets.vcHost} </td>
+						</tr>
+						<tr>
+							<th>업무명</th> <td colspan=2> ${assets.vcAssetName}</td>
+							<th>IP Adress</th>  <td colspan=2>${assets.vcIp} </td>
+						</tr>
+						<tr>
+							<th>OS Version</th> <td colspan=2> ${assets.vcVersion}</td>
+							<th>Serial Number</th>  <td colspan=2>${assets.vcAssetSerial} </td>
+						</tr>
+						<tr >
+							<th rowspan=2 >시스템정보</th>
+							<th>CPU</th>
+							<th>DISK</th>
+							<th>MEM</th>
+							<th>외장스토리지</th>
+							<th>비고</th>
+						</tr>
+						<tr >
+							<td>${assets.vcDtlCpu}</td>
+							<td>${assets.vcDtlDisk}</td>
+							<td>${assets.vcDtlMem}</td>
 							<td></td>
+							<td>${assets.txComment}</td>
 						</tr>
 						
 						
 					</tbody>
 					
 				</table>
-				</c:forEach>
+			</div>	
-			</c:if>
+			</c:forEach>
+		</c:if>
 			
-			<!-- 목록영역 -->
+		<!-- 자산 일반 영역 -->
-			<c:if test="${ assetDtlYn ne 'Y'}">
+		<c:if test="${ assetDtlYn ne 'Y'}">
+		<div class="tbl_list">
 			<table class="table" summary="" id="table_asset" >
 				<caption>연결자산정보  <spring:message code="title.list" /></caption>
 				<colgroup>
@@ -256,13 +309,13 @@
 					</c:forEach>
 					
 				</tbody>
-				
 			</table>
-			</c:if>
+		</div>	
-			
+		</c:if>
-			
-		</div>
 		
+		<!-- 2025.08.19 나혁제 인쇄용 프리뷰 (화면에는 숨기고 print에서만 보이게) -->
+		<div id="editorPreview" style="display:none;"></div>
+
 		<textarea id="serviceBody" name="serviceBody" ></textarea>
 		<textarea id="serviceBody2" name="serviceBody2" style="display:none;">${resultReport.txReportBody}</textarea>
 		

src/main/webapp/WEB-INF/jsp/itms/srm/SvcDeskDetail.jsp

@@ -218,31 +218,33 @@
 	}
 	
 	//----------------------------------------
-	//  점검보고서 등록 화면 이동  
+	//  보고서유형 선택 팝업 오픈   
 	// ----------------------------------------
 	function fncReportRegist()
-	{ㅌ
+	{
 		// 보고서 선택 화면 메세지 팝업 open
 		// CallBack : fncReportChoiceCompleted
 		PopupOpen("/srm/PopReportChoice", 300, 450, '');
 	}
 	
 	//----------------------------------------
-	//  점검보고서 등록 화면 이동  
+	//  보고서 등록 화면 이동  
 	// ----------------------------------------
 	function fncReportChoiceCompleted(inTask)
 	{
-		// 수정화면으로 이동처리 
 		var varFrom = document.getElementById("svcDeskManage");
 		
+		// 점검보고서
 		if(inTask == '1')
 		{
 			varFrom.action = "<c:url value='/srm/insertViewReportCheck.do'/>";	
 		}
+		// 장애보고서
 		else if(inTask == '2')
 		{
 			varFrom.action = "<c:url value='/srm/insertViewReportError.do'/>";
 		}
+		// 이슈보고서
 		else if(inTask == '3')
 		{
 			varFrom.action = "<c:url value='/srm/insertViewReportIssue.do'/>";