From 94a82715c19a1302f7c768a8c90d2711912e8d47 Mon Sep 17 00:00:00 2001 From: Seongeun Park Date: Tue, 11 Jun 2024 16:25:06 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9B=90=EC=B2=9C=EB=8D=B0=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comtsrcdata/dto/ComtsrcdataDTO.java | 4 +-- .../service/impl/ComtsrcdataServiceImpl.java | 7 ++++- .../mtdata/comtsrcdata/vo/ComtExtrtVO.java | 4 --- .../web/ComtsrcdataController.java | 30 ++++++++++++++++++- .../database/web/DatabaseConnController.java | 25 +++++++++++++--- .../mappers/comtsrcdata/Comtsrcdata_SQL.xml | 6 ++-- 6 files changed, 60 insertions(+), 16 deletions(-) diff --git a/src/main/java/egovframework/com/mtdata/comtsrcdata/dto/ComtsrcdataDTO.java b/src/main/java/egovframework/com/mtdata/comtsrcdata/dto/ComtsrcdataDTO.java index 81f3297..9c595e9 100644 --- a/src/main/java/egovframework/com/mtdata/comtsrcdata/dto/ComtsrcdataDTO.java +++ b/src/main/java/egovframework/com/mtdata/comtsrcdata/dto/ComtsrcdataDTO.java @@ -11,12 +11,12 @@ import java.util.List; public class ComtsrcdataDTO { /** 원천데이터 테이블 ID */ - private int srcDataMetaId; + private Integer srcDataMetaId; /** 원천데이터 값 */ private List srcDataVl; @Builder - ComtsrcdataDTO(int srcDataMetaId, List data) { + ComtsrcdataDTO(Integer srcDataMetaId, List data) { this.srcDataMetaId = srcDataMetaId; this.srcDataVl = data; } diff --git a/src/main/java/egovframework/com/mtdata/comtsrcdata/service/impl/ComtsrcdataServiceImpl.java b/src/main/java/egovframework/com/mtdata/comtsrcdata/service/impl/ComtsrcdataServiceImpl.java index 44f1117..0da8a96 100644 --- a/src/main/java/egovframework/com/mtdata/comtsrcdata/service/impl/ComtsrcdataServiceImpl.java +++ b/src/main/java/egovframework/com/mtdata/comtsrcdata/service/impl/ComtsrcdataServiceImpl.java @@ -78,8 +78,13 @@ public class ComtsrcdataServiceImpl extends EgovAbstractServiceImpl implements C dataList.add(data); } + Integer srcDataMetaId = null; + if(size > 0) { + srcDataMetaId = resultVO.get(0).getSrcDataMetaId(); + } + return ComtsrcdataDTO.builder() - .srcDataMetaId(vo.getSrcDataMetaId()) + .srcDataMetaId(srcDataMetaId) .data(dataList) .build(); } diff --git a/src/main/java/egovframework/com/mtdata/comtsrcdata/vo/ComtExtrtVO.java b/src/main/java/egovframework/com/mtdata/comtsrcdata/vo/ComtExtrtVO.java index 5786467..faafa09 100644 --- a/src/main/java/egovframework/com/mtdata/comtsrcdata/vo/ComtExtrtVO.java +++ b/src/main/java/egovframework/com/mtdata/comtsrcdata/vo/ComtExtrtVO.java @@ -17,10 +17,6 @@ public class ComtExtrtVO { /** 추출한 기관정보시스템명 */ private String sysNm; - /** 추출한 기관코드 */ - private String ogdpInstCd; - /** 추출한 기관명 */ - private String instNm; /** 원천데이터 테이블 ID */ private Integer srcDataMetaId; diff --git a/src/main/java/egovframework/com/mtdata/comtsrcdata/web/ComtsrcdataController.java b/src/main/java/egovframework/com/mtdata/comtsrcdata/web/ComtsrcdataController.java index de07d31..47fc7f7 100644 --- a/src/main/java/egovframework/com/mtdata/comtsrcdata/web/ComtsrcdataController.java +++ b/src/main/java/egovframework/com/mtdata/comtsrcdata/web/ComtsrcdataController.java @@ -86,6 +86,13 @@ public class ComtsrcdataController { } + /** + * [comtsrcdata] 원천데이터 데이터 조회 + * + * @param comtsrcdataVO + * @return + * @throws Exception + */ @GetMapping(value="/get/comsrcdata.do") public ResponseEntity getComsrcdata(ComtsrcdataVO comtsrcdataVO) { try{ @@ -96,6 +103,13 @@ public class ComtsrcdataController { } } + /** + * 원천데이터[테이블] 리스트 + * + * @param comtExtrtVO + * @return + * @throws + */ @GetMapping(value="/get/srcDataMetaList.do") public ResponseEntity getSrcDataMetaList(ComtExtrtVO comtExtrtVO) { try{ @@ -106,6 +120,13 @@ public class ComtsrcdataController { } } + /** + * 원천데이터[테이블] 상세정보 + * + * @param comtExtrtVO + * @return + * @throws + */ @GetMapping(value="/get/srcDataMeta.do") public ResponseEntity getSrcDataMeta(ComtExtrtVO comtExtrtVO) { try{ @@ -116,8 +137,15 @@ public class ComtsrcdataController { } } + /** + * [comtsrcdatameta]테이블 별 [comtsrcdatacol] 상세 정보 + * + * @param comtColVO + * @return + * @throws + */ @GetMapping(value="/get/srcDataCol.do") - public ResponseEntity getSrcDataMetaList(ComtColVO comtColVO) { + public ResponseEntity getSrcDataCol(ComtColVO comtColVO) { try{ return ResponseEntity.ok().body(service.selectSrcDataCol(comtColVO)); } catch(Exception e){ diff --git a/src/main/java/egovframework/com/mtdata/database/web/DatabaseConnController.java b/src/main/java/egovframework/com/mtdata/database/web/DatabaseConnController.java index 7ef580a..e23e86f 100644 --- a/src/main/java/egovframework/com/mtdata/database/web/DatabaseConnController.java +++ b/src/main/java/egovframework/com/mtdata/database/web/DatabaseConnController.java @@ -91,7 +91,13 @@ public class DatabaseConnController { } } - // DB관리 > 등록된 DB정보관리 리스트 + /** + * 등록된 DB정보관리 리스트 + * + * @param databaseInfoVO + * @return + * @throws Exception + */ @GetMapping(value="/get/registerdDBInfoList.do") @ResponseBody public ResponseEntity getRegisterdDBInfoList(DatabaseInfoVO databaseInfoVO) { @@ -103,7 +109,13 @@ public class DatabaseConnController { } } - // DB관리 > 등록된 DB정보관리 수정 + /** + * 등록된 DB정보관리 수정 + * + * @param databaseInfoVO + * @return + * @throws Exception + */ @PostMapping(value="/update/registerdDBInfoList.do") @ResponseBody public ResponseEntity updateRegisterdDBInfoList(@RequestBody DatabaseInfoVO databaseInfoVO) { @@ -116,8 +128,13 @@ public class DatabaseConnController { } } - - // DB관리 > 등록된 DB정보관리 삭제 + /** + * 등록된 DB정보관리 삭제 + * + * @param databaseInfoVO + * @return + * @throws Exception + */ @PostMapping(value="/delete/registerdDBInfoList.do") @ResponseBody public ResponseEntity deleteRegisterdDBInfoList(@RequestBody DatabaseInfoVO databaseInfoVO) { diff --git a/src/main/resources/egovframework/sqlmap/mtdata/mappers/comtsrcdata/Comtsrcdata_SQL.xml b/src/main/resources/egovframework/sqlmap/mtdata/mappers/comtsrcdata/Comtsrcdata_SQL.xml index 378f71a..d449ce1 100644 --- a/src/main/resources/egovframework/sqlmap/mtdata/mappers/comtsrcdata/Comtsrcdata_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mtdata/mappers/comtsrcdata/Comtsrcdata_SQL.xml @@ -82,19 +82,17 @@