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 2de07fe..81f3297 100644 --- a/src/main/java/egovframework/com/mtdata/comtsrcdata/dto/ComtsrcdataDTO.java +++ b/src/main/java/egovframework/com/mtdata/comtsrcdata/dto/ComtsrcdataDTO.java @@ -4,21 +4,20 @@ import egovframework.com.mtdata.comtsrcdata.vo.ComtsrcdataVO; import lombok.Builder; import lombok.Getter; +import java.util.List; + @Getter public class ComtsrcdataDTO { - /** 원천데이터 데이터 ID */ - private Integer srcDataId ; - /** 추출 ID */ - private Integer extrId; + /** 원천데이터 테이블 ID */ + private int srcDataMetaId; /** 원천데이터 값 */ - private Object srcDataVl; + private List srcDataVl; @Builder - ComtsrcdataDTO(ComtsrcdataVO vo, Object data) { - this.extrId = vo.getExtrId(); - this.srcDataId = vo.getSrcDataId(); + ComtsrcdataDTO(int srcDataMetaId, List data) { + this.srcDataMetaId = srcDataMetaId; this.srcDataVl = data; } diff --git a/src/main/java/egovframework/com/mtdata/comtsrcdata/mapper/ComtsrcdataMapper.java b/src/main/java/egovframework/com/mtdata/comtsrcdata/mapper/ComtsrcdataMapper.java index 8c50200..5afecc2 100644 --- a/src/main/java/egovframework/com/mtdata/comtsrcdata/mapper/ComtsrcdataMapper.java +++ b/src/main/java/egovframework/com/mtdata/comtsrcdata/mapper/ComtsrcdataMapper.java @@ -4,8 +4,12 @@ import egovframework.com.mtdata.comtsrcdata.vo.ComtColVO; import egovframework.com.mtdata.comtsrcdata.vo.ComtExtrtVO; import egovframework.com.mtdata.comtsrcdata.vo.ComtTableVO; import egovframework.com.mtdata.comtsrcdata.vo.ComtsrcdataVO; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; +import java.util.List; + @Mapper("ComtsrcdataMapper") public interface ComtsrcdataMapper { @@ -58,8 +62,35 @@ public interface ComtsrcdataMapper { * @return vo * @throws Exception */ - ComtsrcdataVO selectSrcData(ComtsrcdataVO vo); + List selectSrcData(ComtsrcdataVO vo) throws Exception; + /** + * 원천데이터[테이블] 리스트 + * + * @param + * @return vo + * @throws + */ + List selectSrcDataMetaList(); + + /** + * 원천데이터[테이블] 상세정보 + * + * @param + * @return vo + * @throws + */ + ComtExtrtVO selectSrcDataMeta(ComtExtrtVO vo); + + /** + * [comtsrcdatameta]테이블 별 [comtsrcdatacol] 상세 정보 + * + * @param + * @return vo + * @throws + */ + @Select("SELECT * FROM comtsrcdatacol_new WHERE src_data_meta_id = #{srcDataMetaId}") + List selectSrcDataCol(ComtColVO vo); } diff --git a/src/main/java/egovframework/com/mtdata/comtsrcdata/service/ComtsrcdataService.java b/src/main/java/egovframework/com/mtdata/comtsrcdata/service/ComtsrcdataService.java index c6af924..b9ba10c 100644 --- a/src/main/java/egovframework/com/mtdata/comtsrcdata/service/ComtsrcdataService.java +++ b/src/main/java/egovframework/com/mtdata/comtsrcdata/service/ComtsrcdataService.java @@ -5,6 +5,9 @@ import egovframework.com.mtdata.comtsrcdata.vo.ComtColVO; import egovframework.com.mtdata.comtsrcdata.vo.ComtExtrtVO; import egovframework.com.mtdata.comtsrcdata.vo.ComtTableVO; import egovframework.com.mtdata.comtsrcdata.vo.ComtsrcdataVO; +import org.apache.ibatis.annotations.Select; + +import java.util.List; public interface ComtsrcdataService { @@ -59,5 +62,24 @@ public interface ComtsrcdataService { ComtsrcdataDTO selectComtSrcData(ComtsrcdataVO vo) throws Exception; + List selectSrcDataMetaList(); + /** + * 원천데이터[테이블] 상세정보 + * + * @param + * @return vo + * @throws + */ + ComtExtrtVO selectSrcDataMeta(ComtExtrtVO vo); + + /** + * [comtsrcdatameta]테이블 별 [comtsrcdatacol] 상세 정보 + * + * @param + * @return vo + * @throws + */ + @Select("SELECT * FROM comtsrcdatacol_new WHERE src_data_meta_id = #{srcDataMetaId}") + List selectSrcDataCol(ComtColVO vo); } 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 75c1f6b..8e7b85c 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 @@ -7,13 +7,19 @@ import egovframework.com.mtdata.comtsrcdata.vo.ComtColVO; import egovframework.com.mtdata.comtsrcdata.vo.ComtExtrtVO; import egovframework.com.mtdata.comtsrcdata.vo.ComtTableVO; import egovframework.com.mtdata.comtsrcdata.vo.ComtsrcdataVO; +import lombok.extern.slf4j.Slf4j; import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl; +import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.json.stream.JsonParser; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +@Slf4j @Service("ComtsrcdataService") public class ComtsrcdataServiceImpl extends EgovAbstractServiceImpl implements ComtsrcdataService { @@ -47,14 +53,36 @@ public class ComtsrcdataServiceImpl extends EgovAbstractServiceImpl implements C @Override public ComtsrcdataDTO selectComtSrcData(ComtsrcdataVO vo) throws Exception { - ComtsrcdataVO resultVO = comtsrcdataMapper.selectSrcData(vo); - + List resultVO = comtsrcdataMapper.selectSrcData(vo); JSONParser jsonParser = new JSONParser(); - Object data = jsonParser.parse(resultVO.getSrcDataVl()); + List dataList = new ArrayList<>(); + + int size = resultVO.size(); + + for(int i = 0; i < size; i++) { + String srcDataVI = resultVO.get(i).getSrcDataVl(); + Object data = jsonParser.parse(srcDataVI); + dataList.add(data); + } return ComtsrcdataDTO.builder() - .vo(resultVO) - .data(data) + .srcDataMetaId(vo.getSrcDataMetaId()) + .data(dataList) .build(); } + + @Override + public List selectSrcDataMetaList() { + return comtsrcdataMapper.selectSrcDataMetaList(); + } + + @Override + public ComtExtrtVO selectSrcDataMeta(ComtExtrtVO vo){ + return comtsrcdataMapper.selectSrcDataMeta(vo); + } + + @Override + public List selectSrcDataCol(ComtColVO vo) { + return comtsrcdataMapper.selectSrcDataCol(vo); + } } 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 88175eb..5786467 100644 --- a/src/main/java/egovframework/com/mtdata/comtsrcdata/vo/ComtExtrtVO.java +++ b/src/main/java/egovframework/com/mtdata/comtsrcdata/vo/ComtExtrtVO.java @@ -11,8 +11,20 @@ public class ComtExtrtVO { /** 추출 날짜 */ private String extrYmd; /** 추출한 기관정보시스템 ID */ - private int sysId; + private Integer sysId; /** 추출 ID */ - private int extrId; + private Integer extrId; + + /** 추출한 기관정보시스템명 */ + private String sysNm; + /** 추출한 기관코드 */ + private String ogdpInstCd; + /** 추출한 기관명 */ + private String instNm; + + /** 원천데이터 테이블 ID */ + private Integer srcDataMetaId; + /** 원천데이터 테이블 이름 */ + private String srcDataTblNm; } 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 aa9a885..de07d31 100644 --- a/src/main/java/egovframework/com/mtdata/comtsrcdata/web/ComtsrcdataController.java +++ b/src/main/java/egovframework/com/mtdata/comtsrcdata/web/ComtsrcdataController.java @@ -2,6 +2,8 @@ package egovframework.com.mtdata.comtsrcdata.web; import egovframework.com.mtdata.comtsrcdata.dto.ComtsrcdataDTO; import egovframework.com.mtdata.comtsrcdata.service.ComtsrcdataService; +import egovframework.com.mtdata.comtsrcdata.vo.ComtColVO; +import egovframework.com.mtdata.comtsrcdata.vo.ComtExtrtVO; import egovframework.com.mtdata.comtsrcdata.vo.ComtsrcdataVO; import egovframework.com.mtdata.database.vo.DatabaseInfoVO; import org.json.simple.JSONObject; @@ -94,4 +96,34 @@ public class ComtsrcdataController { } } + @GetMapping(value="/get/srcDataMetaList.do") + public ResponseEntity getSrcDataMetaList(ComtExtrtVO comtExtrtVO) { + try{ + return ResponseEntity.ok().body(service.selectSrcDataMetaList()); + } catch(Exception e){ + log.error("Exception", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); + } + } + + @GetMapping(value="/get/srcDataMeta.do") + public ResponseEntity getSrcDataMeta(ComtExtrtVO comtExtrtVO) { + try{ + return ResponseEntity.ok().body(service.selectSrcDataMeta(comtExtrtVO)); + } catch(Exception e){ + log.error("Exception", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); + } + } + + @GetMapping(value="/get/srcDataCol.do") + public ResponseEntity getSrcDataMetaList(ComtColVO comtColVO) { + try{ + return ResponseEntity.ok().body(service.selectSrcDataCol(comtColVO)); + } catch(Exception e){ + log.error("Exception", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); + } + } + } 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 a978c04..409f430 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 @@ -58,13 +58,28 @@ + +