From 23825b2d76dcd7ff22f179caa8924c7e34f93542 Mon Sep 17 00:00:00 2001 From: nhj Date: Wed, 20 Aug 2025 11:34:43 +0900 Subject: [PATCH] =?UTF-8?q?-=20=EC=A0=90=EA=B2=80=EB=B3=B4=EA=B3=A0?= =?UTF-8?q?=EC=84=9C,=20=EC=9E=90=EC=82=B0=20=EC=B2=98=EB=A6=AC=EC=8B=9C?= =?UTF-8?q?=20=EA=B7=B8=EB=A3=B9=20=EC=82=AC=EC=9A=A9=EC=9E=90=EC=97=90=20?= =?UTF-8?q?=EB=8C=80=ED=95=9C=20=EC=B2=98=EB=A6=AC=20=EB=B0=A9=ED=96=A5=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20-=20=EA=B2=8C=EC=8B=9C=ED=8C=90=20?= =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=EA=B0=80=EB=8A=A5=EA=B0=9C?= =?UTF-8?q?=EC=88=98,=20=EA=B0=80=EB=8A=A5=ED=99=95=EC=9E=A5=EC=9E=90=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/EgovConfigAppProperties.java | 3 +- .../controller/TotalSearchController.java | 19 ---- .../srm/controller/ReportCheckController.java | 3 + .../resources/validator/urp/ItsmValidator.xml | 7 +- .../WEB-INF/jsp/itms/bbs/BoardMstrRegist.jsp | 8 ++ .../WEB-INF/jsp/itms/bbs/BoardMstrUpdt.jsp | 7 ++ .../WEB-INF/jsp/itms/rem/ResourceCodeSet.jsp | 33 +++++++ .../WEB-INF/jsp/itms/rem/ResourceDetail.jsp | 39 +++++++- .../jsp/itms/rem/ResourceMultiList.jsp | 34 +++++-- .../jsp/itms/srm/ReportCheckInsert.jsp | 6 ++ .../jsp/itms/srm/ReportCheckPrintPop.jsp | 99 ++++++++++++++----- .../WEB-INF/jsp/itms/srm/SvcDeskDetail.jsp | 10 +- 12 files changed, 208 insertions(+), 60 deletions(-) diff --git a/src/main/java/com/urpsys/basefront/config/EgovConfigAppProperties.java b/src/main/java/com/urpsys/basefront/config/EgovConfigAppProperties.java index cad80dad..7853fe4c 100644 --- a/src/main/java/com/urpsys/basefront/config/EgovConfigAppProperties.java +++ b/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"); diff --git a/src/main/java/com/urpsys/itmsfront/search/controller/TotalSearchController.java b/src/main/java/com/urpsys/itmsfront/search/controller/TotalSearchController.java index 3c701e4e..9aadae4e 100644 --- a/src/main/java/com/urpsys/itmsfront/search/controller/TotalSearchController.java +++ b/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; /** diff --git a/src/main/java/com/urpsys/itmsfront/srm/controller/ReportCheckController.java b/src/main/java/com/urpsys/itmsfront/srm/controller/ReportCheckController.java index 9fabdc94..94da6dc1 100644 --- a/src/main/java/com/urpsys/itmsfront/srm/controller/ReportCheckController.java +++ b/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> resultForm = (List>)returnMap.get("resultForm"); Map resultTaskMap = (Map)returnMap.get("resultTask"); Map resultIncident = (Map)returnMap.get("resultIncident"); // 인스던트 정보 확인 + Map resultAsset = (Map)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) diff --git a/src/main/resources/validator/urp/ItsmValidator.xml b/src/main/resources/validator/urp/ItsmValidator.xml index 2d2322c0..5dfeda2f 100644 --- a/src/main/resources/validator/urp/ItsmValidator.xml +++ b/src/main/resources/validator/urp/ItsmValidator.xml @@ -10,8 +10,13 @@ - + + + + maxlength + 50 + diff --git a/src/main/webapp/WEB-INF/jsp/itms/bbs/BoardMstrRegist.jsp b/src/main/webapp/WEB-INF/jsp/itms/bbs/BoardMstrRegist.jsp index 5695d2ce..3330ef9b 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/bbs/BoardMstrRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/bbs/BoardMstrRegist.jsp @@ -264,6 +264,7 @@ + @@ -272,6 +273,13 @@ 1개 2개 3개 + 4개 + 5개 + 6개 + 7개 + 8개 + 9개 + 10개
diff --git a/src/main/webapp/WEB-INF/jsp/itms/bbs/BoardMstrUpdt.jsp b/src/main/webapp/WEB-INF/jsp/itms/bbs/BoardMstrUpdt.jsp index 7761ec7c..a1708293 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/bbs/BoardMstrUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/bbs/BoardMstrUpdt.jsp @@ -248,6 +248,13 @@ + + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceCodeSet.jsp b/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceCodeSet.jsp index d54e4ff8..c80a84d4 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceCodeSet.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceCodeSet.jsp @@ -261,6 +261,39 @@
+ +
+

점검대상여부

+
+ + +
+ + + + + + + + + + + + + + + + + + + + + +
코드코드명
Y 대상
N 미대상
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceDetail.jsp b/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceDetail.jsp index 5189e1f9..c20b13ce 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceDetail.jsp +++ b/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 @@ 연결보고서 +
+ +
+
diff --git a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceMultiList.jsp b/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceMultiList.jsp index 9512bd60..7a25b7a8 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceMultiList.jsp +++ b/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 @@ - - diff --git a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckInsert.jsp b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckInsert.jsp index f3a2c651..e8c1c517 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckInsert.jsp +++ b/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}'); + } }); //---------------------------------------- diff --git a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckPrintPop.jsp b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckPrintPop.jsp index fa177994..7518facf 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckPrintPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckPrintPop.jsp @@ -49,6 +49,23 @@ + + +
제조사 처리결과 처리결과메세지