diff --git a/src/main/java/com/urpsys/itmsapi/rem/controller/ResourceManagerController.java b/src/main/java/com/urpsys/itmsapi/rem/controller/ResourceManagerController.java index 4f105489..443cc592 100644 --- a/src/main/java/com/urpsys/itmsapi/rem/controller/ResourceManagerController.java +++ b/src/main/java/com/urpsys/itmsapi/rem/controller/ResourceManagerController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import com.urpsys.baseapi.common.util.CommonUtil; import com.urpsys.baseapi.common.util.ResultData; - +import com.urpsys.baseapi.domain.TokenInfo; import com.urpsys.itmsapi.rem.service.CodeAssetCateService; import com.urpsys.itmsapi.rem.service.ResourceManagerService; @@ -64,6 +64,18 @@ public class ResourceManagerController LinkedHashMap resBody = new LinkedHashMap(); + // 토큰정보 획득 + TokenInfo tokenInfo = CommonUtil.getAccessTokenInfo(request); + + String strGrpId = tokenInfo.getStrGRP_ID(); + String strRole = tokenInfo.getAuthorities(); + + // 본사그룹 혹은 관리자 가 아닌경우 해당그룹자산만 조회 가능 + if(strGrpId != "GROUP_00000000000000" && strRole != "ROLE_ADMIN") + { + requestMap.put("strGrpId", strGrpId); + } + // 자산조회 List> resultList = resourceManagerService.searchAsset(requestMap); diff --git a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java index 155343ef..48cb0faa 100644 --- a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java +++ b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController; import com.urpsys.baseapi.common.util.CommonUtil; import com.urpsys.baseapi.common.util.ResultData; import com.urpsys.baseapi.domain.TokenInfo; +import com.urpsys.itmsapi.rem.service.ResourceManagerService; import com.urpsys.itmsapi.srm.service.ReportCheckService; import com.urpsys.itmsapi.srm.service.SvcDeskService; @@ -48,6 +49,9 @@ public class ReportCheckController @Autowired SvcDeskService svcDeskService; // 서비스 인스던트 관리 서비스 + @Autowired + ResourceManagerService resourceManagerService; // 2025.08.20 나혀제 자산관리 서비스 추가 + /** * 점검보고서 목록 조회 * @author urp 인프라본부 나혁제 @@ -70,6 +74,15 @@ public class ReportCheckController // 토큰정보 획득 TokenInfo tokenInfo = CommonUtil.getAccessTokenInfo(request); + String strGrpId = tokenInfo.getStrGRP_ID(); + String strRole = tokenInfo.getAuthorities(); + + // 본사그룹 혹은 관리자 가 아닌경우 해당그룹자산만 조회 가능 + if(strGrpId != "GROUP_00000000000000" && strRole != "ROLE_ADMIN") + { + requestMap.put("strGrpId", strGrpId); + } + log.info("tokenInfo [{}]", tokenInfo.toString() ); log.info("tokenInfo [{}]", tokenInfo.getAuthorities() ); @@ -484,6 +497,8 @@ public class ReportCheckController // 서비스데스크 인스던트 정보 조회 int inIncidentSeq = CommonUtil.zeroConvert(requestMap.get("inIncidentSeq")); + // 2025.08.20 나혁제 추가 연결자산 정보 + int inAssetSeq = CommonUtil.zeroConvert(requestMap.get("inAssetSeq")); LinkedHashMap resultIncident = new LinkedHashMap(); @@ -495,6 +510,15 @@ public class ReportCheckController int inServiceCode = CommonUtil.zeroConvert(resultIncident.get("inServiceCode")); + // 2025.08.20 나혁제 연결자산정보 + LinkedHashMap resultAsset = new LinkedHashMap(); + + // 인스던트 정보 조회 + if(inAssetSeq>0) + { + resultAsset = resourceManagerService.getAssetInfo(inAssetSeq); + } + // 서비스정보 조회 List> resultService = reportCheckService.getServiceCombo(inServiceCode); @@ -508,7 +532,7 @@ public class ReportCheckController resBody.put("resultService" , resultService ); resBody.put("resultTask" , resultTask ); resBody.put("resultForm" , resultForm ); - + resBody.put("resultAsset" , resultAsset ); // 2025.08.20 나혁제 자산정보 추가 log.info("<<<<<<<<<<<<<<<<<<<<<<<<< /srm/getInitReportCheck.do >>>>>>>>>>>>>>>>>>>>>>>>>"); diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/rem/ResourceManagerMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/rem/ResourceManagerMapper.xml index d9f3ea2d..367c9a1c 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/itms/rem/ResourceManagerMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/itms/rem/ResourceManagerMapper.xml @@ -115,6 +115,9 @@ = ("sdateEos")]]> + + + AND A.VC_GRP_ID = #{strGrpId} AND ( @@ -198,6 +201,7 @@ AND A.IN_CATE1=D.IN_CATE1 AND A.IN_CATE2=D.IN_CATE2 AND A.IN_CATE3=D.IN_CATE3 + ORDER BY A.VC_ASSET_ID diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportCheckMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportCheckMapper.xml index 3d850660..889e0d56 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportCheckMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportCheckMapper.xml @@ -66,6 +66,7 @@ + @@ -73,6 +74,16 @@ + + + + + + + + + + @@ -129,6 +140,17 @@ AND A.IN_TASK = ${taskCode} = UNIX_TIMESTAMP("${sdate}")]]> + + + AND A.IN_REPORT_SEQ IN ( SELECT B.IN_REPORT_SEQ + FROM CM_ASSET A + , CM_REPORT_ASSET B + WHERE A.VC_GRP_ID =#{strGrpId} + AND A.IN_ASSET_SEQ = B.IN_ASSET_SEQ + GROUP BY B.IN_REPORT_SEQ + ) + +