From 83b3027e0a2d2decfc8f816868e54a0a74a98acc Mon Sep 17 00:00:00 2001 From: nhj Date: Thu, 12 Mar 2026 19:45:22 +0900 Subject: [PATCH] =?UTF-8?q?kic,=20=ED=82=A8=ED=85=8D=EC=8A=A4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EC=9A=94=EA=B5=AC=EC=82=AC=ED=95=AD=20=EB=B0=98?= =?UTF-8?q?=EC=98=81(url=20=EB=B3=B4=EC=95=88=EC=B2=B4=ED=81=AC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80,=20=EC=8A=B9=EC=9D=B8=EB=8C=80=EC=83=81?= =?UTF-8?q?=EC=9E=90=EB=A3=8C=EB=A7=8C=20=EC=A1=B0=EA=B1=B4=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20....)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/controller/MainController.java | 29 ++++++++++++++ .../baseapi/main/dao/MainMenuManageDao.java | 3 ++ .../main/service/MainMenuManageService.java | 6 +++ .../srm/controller/ReportCheckController.java | 12 +++--- .../sqlmap/itms/rem/ResourceManagerMapper.xml | 6 ++- .../sqlmap/itms/srm/ReportCheckMapper.xml | 38 +++++++++++++++---- .../sqlmap/itms/srm/ReportErrorMapper.xml | 26 +++++++++++++ .../sqlmap/itms/srm/ReportIssueMapper.xml | 26 +++++++++++++ .../sqlmap/itms/srm/ReportOtherMapper.xml | 26 +++++++++++++ .../sqlmap/itms/srm/SvcDeskMapper.xml | 18 +++++++++ .../sqlmap/main/MainMenuManageMapper.xml | 16 ++++++++ 11 files changed, 192 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/urpsys/baseapi/main/controller/MainController.java b/src/main/java/com/urpsys/baseapi/main/controller/MainController.java index 9ed46009..210b1e80 100644 --- a/src/main/java/com/urpsys/baseapi/main/controller/MainController.java +++ b/src/main/java/com/urpsys/baseapi/main/controller/MainController.java @@ -152,6 +152,35 @@ public class MainController return ResultData.ok(resBody); } + /** + * url 화면 권한 맵 정보 추출 + * @author urp 인프라본부 나혁제 + * 작성일 : 2026.03.12 + */ + @RequestMapping(value="/main/selectMenuScrnAuth.do") + @ResponseBody + public ResponseEntity selectMenuScrnAuth( @RequestBody LinkedHashMap requestMap + , HttpServletRequest request + , HttpServletResponse response + ) throws Exception + { + + log.info("\n\n"); + log.info(">>>>>>>>>>>>>>>>>>>>>>>>> /main/selectMenuScrnAuth.do <<<<<<<<<<<<<<<<<<<<<<<<<"); + log.info("getRequestURI [{}]", request.getRequestURI() ); + log.info("입력값 확인 requestMap [{}]", requestMap.toString() ); + + LinkedHashMap resBody = new LinkedHashMap(); + + List> listMeunUrl = menuManageService.selectMenuScrnAuth(); + + resBody.put("listMeunUrl", listMeunUrl); + + log.info("<<<<<<<<<<<<<<<<<<<<<<<<< /main/selectMenuScrnAuth.do >>>>>>>>>>>>>>>>>>>>>>>>>"); + + return ResultData.ok(resBody); + } + /** * ID 찾기 * @author urp 인프라본부 나혁제 diff --git a/src/main/java/com/urpsys/baseapi/main/dao/MainMenuManageDao.java b/src/main/java/com/urpsys/baseapi/main/dao/MainMenuManageDao.java index ba65ea05..e3e2cee5 100644 --- a/src/main/java/com/urpsys/baseapi/main/dao/MainMenuManageDao.java +++ b/src/main/java/com/urpsys/baseapi/main/dao/MainMenuManageDao.java @@ -31,4 +31,7 @@ public interface MainMenuManageDao { public List> selectMainMenuHead(String strVal1); public List> selectMainMenuLeft(String strVal1); + + // 2026.03.12 나혁제 메뉴url 맵핑 정보 + public List> selectMenuScrnAuth(); } diff --git a/src/main/java/com/urpsys/baseapi/main/service/MainMenuManageService.java b/src/main/java/com/urpsys/baseapi/main/service/MainMenuManageService.java index 2dc7f2ba..ebcdadea 100644 --- a/src/main/java/com/urpsys/baseapi/main/service/MainMenuManageService.java +++ b/src/main/java/com/urpsys/baseapi/main/service/MainMenuManageService.java @@ -45,6 +45,12 @@ public class MainMenuManageService return menuManageDao.selectMainMenuLeft(strVal1); } + // 2026.03.12 나혁제 메뉴url 맵핑 정보 + public List> selectMenuScrnAuth() + { + return menuManageDao.selectMenuScrnAuth(); + } + 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 e359d852..75dee195 100644 --- a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java +++ b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java @@ -74,11 +74,11 @@ public class ReportCheckController // 토큰정보 획득 TokenInfo tokenInfo = CommonUtil.getAccessTokenInfo(request); - String strGrpId = CommonUtil.nvl(tokenInfo.getStrGRP_ID()); - String strRole = CommonUtil.nvl(tokenInfo.getAuthorities()); + String strGrpId = CommonUtil.nvl(tokenInfo.getStrGRP_ID ()); + String strRole = CommonUtil.nvl(tokenInfo.getAuthorities ()); - log.info("strGrpId [{}]", strGrpId); - log.info("strRole [{}]" , strRole); + log.info("strGrpId [{}]" , strGrpId); + log.info("strRole [{}]" , strRole ); log.info("순서 [{}]" , strRole.indexOf("ROLE_ADMIN")); // 2025.11.24 나혁제 권한미부여 상태 조회불가 @@ -93,8 +93,8 @@ public class ReportCheckController requestMap.put("strGrpId", strGrpId); } - log.info("tokenInfo [{}]", tokenInfo.toString() ); - log.info("tokenInfo [{}]", tokenInfo.getAuthorities() ); + // log.info("tokenInfo [{}]", tokenInfo.toString() ); + // log.info("tokenInfo [{}]", tokenInfo.getAuthorities() ); requestMap.put("reqUser", tokenInfo.getUniqId()); // requestMap.put("reqUser", "0"); 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 40e9ad73..c0c9a34d 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/itms/rem/ResourceManagerMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/itms/rem/ResourceManagerMapper.xml @@ -143,7 +143,11 @@ - + + + AND A.VC_ASSET_SERIAL = #{vcInAssetSerial} + AND A.VC_REAL_CHRGR_NM = #{vcInRealChargrNm} + AND ( (A.VC_ASSET_ID LIKE "%${searchAll}%" ) OR 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 bd51c9ce..899da55f 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportCheckMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportCheckMapper.xml @@ -3,7 +3,8 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + @@ -35,6 +36,7 @@ + @@ -159,14 +161,31 @@ AND A.IN_ASSET_SEQ = B.IN_ASSET_SEQ GROUP BY B.IN_REPORT_SEQ ) - - + + + + AND A.IN_REPORT_SEQ IN ( SELECT A.IN_REPORT_SEQ + FROM ( + SELECT IN_REPORT_SEQ + , MIN(IN_ORDER) IN_ORDER + FROM CM_REPORT_APPROVAL A + WHERE DT_APPROVAL_DATETIME IS NULL + GROUP BY IN_REPORT_SEQ + ) N + , CM_REPORT_APPROVAL A + WHERE A.IN_REPORT_SEQ = N.IN_REPORT_SEQ + AND A.IN_ORDER = N.IN_ORDER + AND IN_USER_SEQ = #{reqUser} + ) + AND A.IN_REPORT_STATUS ='1' + + + @@ -35,6 +36,7 @@ + @@ -133,12 +135,31 @@ AND A.IN_TASK = ${taskCode} = UNIX_TIMESTAMP("${sdate}")]]> + + + + AND A.IN_REPORT_SEQ IN ( SELECT A.IN_REPORT_SEQ + FROM ( + SELECT IN_REPORT_SEQ + , MIN(IN_ORDER) IN_ORDER + FROM CM_REPORT_APPROVAL A + WHERE DT_APPROVAL_DATETIME IS NULL + GROUP BY IN_REPORT_SEQ + ) N + , CM_REPORT_APPROVAL A + WHERE A.IN_REPORT_SEQ = N.IN_REPORT_SEQ + AND A.IN_ORDER = N.IN_ORDER + AND IN_USER_SEQ = #{reqUser} + ) + AND A.IN_REPORT_STATUS ='1' + + AND A.IN_SERVICE_CODE = ${serviceCode} = UNIX_TIMESTAMP("${sdate}")]]> + + + AND A.IN_INCIDENT_SEQ IN ( SELECT A.IN_INCIDENT_SEQ + FROM ( + SELECT IN_INCIDENT_SEQ + , MIN(IN_ORDER) IN_ORDER + FROM CM_INCIDENT_APPROVAL A + WHERE DT_APPROVAL_DATETIME IS NULL + GROUP BY IN_INCIDENT_SEQ + ) N + , CM_INCIDENT_APPROVAL A + WHERE A.IN_INCIDENT_SEQ = N.IN_INCIDENT_SEQ + AND A.IN_ORDER = N.IN_ORDER + AND IN_USER_SEQ = #{reqUser} + ) + AND A.IN_INCIDENT_STATUS ='1' + + diff --git a/src/main/resources/mapper/primarydb/sqlmap/main/MainMenuManageMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/main/MainMenuManageMapper.xml index 82701e81..a173b2af 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/main/MainMenuManageMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/main/MainMenuManageMapper.xml @@ -58,5 +58,21 @@ + + + \ No newline at end of file