diff --git a/src/main/java/com/urpsys/baseapi/urpBaseResourceApplication.java b/src/main/java/com/urpsys/baseapi/urpBaseResourceApplication.java index ffeaa366..12996456 100644 --- a/src/main/java/com/urpsys/baseapi/urpBaseResourceApplication.java +++ b/src/main/java/com/urpsys/baseapi/urpBaseResourceApplication.java @@ -71,6 +71,13 @@ public class urpBaseResourceApplication System.out.println("############# keiti_prod Env ###################"); System.out.println("################################################"); } + // 2025.09.12 나혁제 킨텍스 추가 + else if(activeProfile.equals("kintex_prod")) + { + System.out.println("################################################"); + System.out.println("############# kintex_prod Env ##################"); + System.out.println("################################################"); + } else { System.out.println("################################################"); 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 428e1a78..946b11ad 100644 --- a/src/main/java/com/urpsys/itmsapi/rem/controller/ResourceManagerController.java +++ b/src/main/java/com/urpsys/itmsapi/rem/controller/ResourceManagerController.java @@ -94,6 +94,51 @@ public class ResourceManagerController return ResultData.ok(resBody); } + /** + * 자산 조회 엑셀저장 + * @author urp 인프라본부 나혁제 + * 작성일 : 2025.09.11 + */ + @ResponseBody + @RequestMapping(value="/rem/searchAssetExcel.do") + public ResponseEntity searchAssetExcel( @RequestBody LinkedHashMap requestMap + , HttpServletRequest request + , HttpServletResponse response + ) throws Exception + { + log.info("\n\n\n\n\n"); + log.info(">>>>>>>>>>>>>>>>>>>>>>>>> /rem/searchAssetExcel.do <<<<<<<<<<<<<<<<<<<<<<<<<"); + log.info("getRequestURI [{}]", request.getRequestURI() ); + log.info("입력값 확인 requestMap [{}]", requestMap.toString() ); + + LinkedHashMap resBody = new LinkedHashMap(); + + // 토큰정보 획득 + TokenInfo tokenInfo = CommonUtil.getAccessTokenInfo(request); + + String strGrpId = tokenInfo.getStrGRP_ID(); + String strRole = tokenInfo.getAuthorities(); + + log.info("strGrpId [{}]", strGrpId); + log.info("strRole [{}]" , strRole); + log.info("순서 [{}]" , strRole.indexOf("ROLE_ADMIN")); + + // 본사그룹 혹은 관리자 가 아닌경우 해당그룹자산만 조회 가능 + if(!strGrpId.equals("GROUP_00000000000000") && strRole.indexOf("ROLE_ADMIN")<0) + { + requestMap.put("strGrpId", strGrpId); + } + + // 자산조회 + List> resultList = resourceManagerService.searchAssetExcel(requestMap); + + resBody.put("resultList", resultList ); + + log.info("<<<<<<<<<<<<<<<<<<<<<<<<< /rem/searchAssetExcel.do >>>>>>>>>>>>>>>>>>>>>>>>>"); + + return ResultData.ok(resBody); + } + /** * 자산이력 조회 * @author urp 인프라본부 나혁제 diff --git a/src/main/java/com/urpsys/itmsapi/rem/dao/ResourceManagerDao.java b/src/main/java/com/urpsys/itmsapi/rem/dao/ResourceManagerDao.java index d6b2952b..09638b50 100644 --- a/src/main/java/com/urpsys/itmsapi/rem/dao/ResourceManagerDao.java +++ b/src/main/java/com/urpsys/itmsapi/rem/dao/ResourceManagerDao.java @@ -34,6 +34,9 @@ public interface ResourceManagerDao // 자산 조회 count 조회 public int searchAssetCount(LinkedHashMap inMap) throws Exception; + // 2025.09.11 나혁제 자산엑셀처리 추가 + public List> searchAssetExcel(LinkedHashMap inMap) throws Exception; + // 자산등록 public int addAssetVo(LinkedHashMap inMap) throws Exception; diff --git a/src/main/java/com/urpsys/itmsapi/rem/service/ResourceManagerService.java b/src/main/java/com/urpsys/itmsapi/rem/service/ResourceManagerService.java index ca1621a5..239881cc 100644 --- a/src/main/java/com/urpsys/itmsapi/rem/service/ResourceManagerService.java +++ b/src/main/java/com/urpsys/itmsapi/rem/service/ResourceManagerService.java @@ -52,6 +52,11 @@ public class ResourceManagerService return resourceManagerDao.searchAssetCount(inMap); } + public List> searchAssetExcel(LinkedHashMap inMap) throws Exception + { + return resourceManagerDao.searchAssetExcel(inMap); + } + // 2025.03.31 나혁제 자산이력 조회 public List> searchAssetHist(LinkedHashMap inMap) throws Exception { diff --git a/src/main/resources/application-kintex_prod.yml b/src/main/resources/application-kintex_prod.yml new file mode 100644 index 00000000..051e7907 --- /dev/null +++ b/src/main/resources/application-kintex_prod.yml @@ -0,0 +1,60 @@ + # Service port + server: + port: 11010 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true +# 인증서버에서 JWT 보안키 확인 + security: + oauth2: + resourceserver: + jwt: + jwk-set-uri: + http://localhost:11000/oauth/token_key + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://10.2.11.37:3307/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false + + # custom 설정 + custom: + api_server : null + sendmail: + id: tW9kMpd3SiAnf3RQBOZapw== + password: Tkkj8p2PYfZ+AmpQMPLHF8ksj8vrtJouj6xczU8ShM8= + port: 587 + host: smtp.gmail.com + sendEmail: hhjj0701@gmail.com + senderName: 나혁제 + socketFactory-class: javax.net.ssl.SSLSocketFactory + supplier: gmail.com + front_host_info : http://10.2.11.37:11020 + client : kintex + \ No newline at end of file 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 bd49d491..76d24360 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/itms/rem/ResourceManagerMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/itms/rem/ResourceManagerMapper.xml @@ -68,6 +68,10 @@ + + + + @@ -126,11 +130,19 @@ = ("${sdateMasEnd}")]]> + + + = #{sdateEos}]]> + AND A.VC_GRP_ID = #{strGrpId} + + + AND ( @@ -156,6 +168,7 @@ + + +