diff --git a/src/main/java/egovframework/com/mtdata/comtrls/dto/ComtrlsSrcdataDTO.java b/src/main/java/egovframework/com/mtdata/comtrls/dto/ComtrlsSrcdataDTO.java new file mode 100644 index 0000000..8875625 --- /dev/null +++ b/src/main/java/egovframework/com/mtdata/comtrls/dto/ComtrlsSrcdataDTO.java @@ -0,0 +1,20 @@ +package egovframework.com.mtdata.comtrls.dto; + +import lombok.Builder; +import lombok.Getter; + +import java.util.List; +@Getter +public class ComtrlsSrcdataDTO { + /** 공유데이터 테이블 ID */ + private int rlsDataId; + /** 공유데이터 */ + private List rlsDataVl; + + @Builder + ComtrlsSrcdataDTO(int rlsDataId, List data) { + this.rlsDataId = rlsDataId; + this.rlsDataVl = data; + } +} + diff --git a/src/main/java/egovframework/com/mtdata/comtrls/mapper/ComtrlsdataMapper.java b/src/main/java/egovframework/com/mtdata/comtrls/mapper/ComtrlsdataMapper.java index b3c7690..8926b2c 100644 --- a/src/main/java/egovframework/com/mtdata/comtrls/mapper/ComtrlsdataMapper.java +++ b/src/main/java/egovframework/com/mtdata/comtrls/mapper/ComtrlsdataMapper.java @@ -4,10 +4,14 @@ import egovframework.com.mtdata.comtrls.vo.ComtrlsColVO; import egovframework.com.mtdata.comtrls.vo.ComtrlsMetaDataVO; import egovframework.com.mtdata.comtrls.vo.ComtrlsSrcdataVO; import egovframework.com.mtdata.comtsrcdata.vo.ComtExtrtVO; +import egovframework.com.mtdata.comtsrcdata.vo.ComtsrcdataVO; +import org.apache.ibatis.annotations.Select; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; import java.util.Map; +import java.util.List; + @Mapper("ComtrlsdataMapper") public interface ComtrlsdataMapper { /** @@ -19,6 +23,42 @@ public interface ComtrlsdataMapper { */ public int insertComtrlsMetadataInfo(ComtrlsMetaDataVO vo) throws Exception; + /** + * 공유데이터의 메타데이터 리스트 조회 + * + * @param vo + * @return + * @throws Exception + */ + List selectComtrlsMetaDataList(ComtrlsMetaDataVO vo); + + /** + * 공유데이터의 메타데이터 정보 조회 + * + * @param vo + * @return + * @throws Exception + */ + ComtrlsMetaDataVO selectComtrlsMetaDataInfo(ComtrlsMetaDataVO vo); + + /** + * 공유데이터의 테이블의 컬럼 정보 조회 + * + * @param vo + * @return + * @throws Exception + */ + @Select("SELECT * FROM comtrlsdatacol WHERE rls_data_id = #{rlsDataId})") + ComtrlsColVO selectComtrlsCol(ComtrlsColVO vo); + + /** + * [comtrlSrcData]테이블 조회 + * + * @param vo + * @return vo + * @throws Exception + */ + List selectComtrlsSrcData(ComtrlsSrcdataVO vo); /** * 공유데이터 컬럼정보 삭제 diff --git a/src/main/java/egovframework/com/mtdata/comtrls/service/ComtrlsdataService.java b/src/main/java/egovframework/com/mtdata/comtrls/service/ComtrlsdataService.java index 1f055f2..ee35e2b 100644 --- a/src/main/java/egovframework/com/mtdata/comtrls/service/ComtrlsdataService.java +++ b/src/main/java/egovframework/com/mtdata/comtrls/service/ComtrlsdataService.java @@ -1,7 +1,12 @@ package egovframework.com.mtdata.comtrls.service; + +import egovframework.com.mtdata.comtrls.dto.ComtrlsSrcdataDTO; +import egovframework.com.mtdata.comtrls.vo.ComtrlsColVO; import egovframework.com.mtdata.comtrls.vo.ComtrlsMetaDataVO; import java.util.Map; +import java.util.List; + public interface ComtrlsdataService { @@ -48,5 +53,12 @@ public interface ComtrlsdataService { // // ComtsrcdataDTO selectComtSrcData(ComtrlsSrcdataVO vo) throws Exception; + List selectComtrlsMetaDataList(ComtrlsMetaDataVO vo); + + ComtrlsMetaDataVO selectComtrlsMetaDataInfo(ComtrlsMetaDataVO vo); + + ComtrlsColVO selectComtrlsCol(ComtrlsColVO vo); + + ComtrlsSrcdataDTO selectComtrlsSrcData(ComtrlsSrcdataVO vo) throws Exception; } diff --git a/src/main/java/egovframework/com/mtdata/comtrls/service/impl/ComtrlsdataServiceImpl.java b/src/main/java/egovframework/com/mtdata/comtrls/service/impl/ComtrlsdataServiceImpl.java index 6b37a7b..5d9d8ef 100644 --- a/src/main/java/egovframework/com/mtdata/comtrls/service/impl/ComtrlsdataServiceImpl.java +++ b/src/main/java/egovframework/com/mtdata/comtrls/service/impl/ComtrlsdataServiceImpl.java @@ -1,16 +1,21 @@ package egovframework.com.mtdata.comtrls.service.impl; +import egovframework.com.mtdata.comtrls.dto.ComtrlsSrcdataDTO; import egovframework.com.mtdata.comtrls.mapper.ComtrlsdataMapper; import egovframework.com.mtdata.comtrls.service.ComtrlsdataService; import egovframework.com.mtdata.comtrls.vo.ComtrlsColVO; import egovframework.com.mtdata.comtrls.vo.ComtrlsMetaDataVO; import egovframework.com.mtdata.comtrls.vo.ComtrlsSrcdataVO; +import egovframework.com.mtdata.comtsrcdata.dto.ComtsrcdataDTO; +import egovframework.com.mtdata.comtsrcdata.vo.ComtsrcdataVO; import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl; import org.json.simple.parser.JSONParser; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Map; +import java.util.ArrayList; +import java.util.List; @Service("ComtrlsdataService") public class ComtrlsdataServiceImpl extends EgovAbstractServiceImpl implements ComtrlsdataService { @@ -36,4 +41,38 @@ public class ComtrlsdataServiceImpl extends EgovAbstractServiceImpl implements C } + @Override + public List selectComtrlsMetaDataList(ComtrlsMetaDataVO vo) { + return comtrlsdataMapper.selectComtrlsMetaDataList(vo); + } + + @Override + public ComtrlsMetaDataVO selectComtrlsMetaDataInfo(ComtrlsMetaDataVO vo) { + return comtrlsdataMapper.selectComtrlsMetaDataInfo(vo); + } + + @Override + public ComtrlsColVO selectComtrlsCol(ComtrlsColVO vo) { + return comtrlsdataMapper.selectComtrlsCol(vo); + } + + @Override + public ComtrlsSrcdataDTO selectComtrlsSrcData(ComtrlsSrcdataVO vo) throws Exception{ + List resultVO = comtrlsdataMapper.selectComtrlsSrcData(vo); + JSONParser jsonParser = new JSONParser(); + List dataList = new ArrayList<>(); + + int size = resultVO.size(); + + for(int i = 0; i < size; i++) { + String rlsDataVl = resultVO.get(i).getRlsDataVl(); + Object data = jsonParser.parse(rlsDataVl); + dataList.add(data); + } + + return ComtrlsSrcdataDTO.builder() + .rlsDataId(vo.getRlsDataId()) + .data(dataList) + .build(); + } } diff --git a/src/main/java/egovframework/com/mtdata/comtrls/web/ComtrlsdataController.java b/src/main/java/egovframework/com/mtdata/comtrls/web/ComtrlsdataController.java index 3657fcc..854f1d6 100644 --- a/src/main/java/egovframework/com/mtdata/comtrls/web/ComtrlsdataController.java +++ b/src/main/java/egovframework/com/mtdata/comtrls/web/ComtrlsdataController.java @@ -1,10 +1,13 @@ package egovframework.com.mtdata.comtrls.web; +import egovframework.com.mtdata.comtrls.dto.ComtrlsSrcdataDTO; import egovframework.com.mtdata.comtrls.service.ComtrlsdataService; +import egovframework.com.mtdata.comtrls.vo.ComtrlsColVO; import egovframework.com.mtdata.comtrls.vo.ComtrlsMetaDataVO; import egovframework.com.mtdata.comtrls.vo.ComtrlsSrcdataVO; import egovframework.com.mtdata.comtsrcdata.service.ComtsrcdataService; import egovframework.com.mtdata.comtsrcdata.vo.ComtTableVO; +import egovframework.com.mtdata.comtsrcdata.vo.ComtsrcdataVO; import egovframework.com.mtdata.database.vo.DatabaseInfoVO; import org.json.simple.JSONObject; import org.slf4j.Logger; @@ -12,6 +15,10 @@ import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -88,7 +95,72 @@ public class ComtrlsdataController { } + /** + * 공유데이터의 메타데이터 리스트 조회 + * + * @param comtrlsMetaDataVO + * @return + * @throws Exception + */ + @GetMapping(value="/get/comtrlsMetaDataList.do") + public ResponseEntity getComtrlsMetaDataList(ComtrlsMetaDataVO comtrlsMetaDataVO) { + try{ + return ResponseEntity.ok().body(comtrlsdataService.selectComtrlsMetaDataList(comtrlsMetaDataVO)); + } catch(Exception e){ + log.error("Exception", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); + } + } + + /** + * 공유데이터의 메타데이터 상세 조회 + * + * @param comtrlsMetaDataVO + * @return + * @throws Exception + */ + @GetMapping(value="/get/comtrlsMetaData.do") + public ResponseEntity getComtrlsMetaData(ComtrlsMetaDataVO comtrlsMetaDataVO) { + try{ + return ResponseEntity.ok().body(comtrlsdataService.selectComtrlsMetaDataInfo(comtrlsMetaDataVO)); + } catch(Exception e){ + log.error("Exception", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); + } + } + /** + * 공유데이터의 컬럼정보 상세 조회 + * + * @param comtrlsColVO + * @return + * @throws Exception + */ + @GetMapping(value="/get/comtrlsCol.do") + public ResponseEntity getComtrlsCol(ComtrlsColVO comtrlsColVO) { + try{ + return ResponseEntity.ok().body(comtrlsdataService.selectComtrlsCol(comtrlsColVO)); + } catch(Exception e){ + log.error("Exception", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); + } + } + /** + * 공유데이터의 데이터 상세 조회 + * + * @param comtrlsSrcdataVO + * @return + * @throws Exception + */ + @GetMapping(value="/get/comsrcdata.do") + public ResponseEntity getComsrcdata(ComtrlsSrcdataVO comtrlsSrcdataVO) { + try{ + return ResponseEntity.ok().body(comtrlsdataService.selectComtrlsSrcData(comtrlsSrcdataVO)); + } catch(Exception e){ + log.error("Exception", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); + } + } } diff --git a/src/main/java/egovframework/com/mtdata/institution/mapper/InstitutionMapper.java b/src/main/java/egovframework/com/mtdata/institution/mapper/InstitutionMapper.java deleted file mode 100644 index c0bf09f..0000000 --- a/src/main/java/egovframework/com/mtdata/institution/mapper/InstitutionMapper.java +++ /dev/null @@ -1,4 +0,0 @@ -package egovframework.com.mtdata.institution.mapper; - -public interface InstitutionMapper { -} diff --git a/src/main/java/egovframework/com/mtdata/institution/service/InstitutionService.java b/src/main/java/egovframework/com/mtdata/institution/service/InstitutionService.java deleted file mode 100644 index 5fe8a55..0000000 --- a/src/main/java/egovframework/com/mtdata/institution/service/InstitutionService.java +++ /dev/null @@ -1,4 +0,0 @@ -package egovframework.com.mtdata.institution.service; - -public interface InstitutionService { -} diff --git a/src/main/java/egovframework/com/mtdata/institution/service/impl/InstitutionServiceImpl.java b/src/main/java/egovframework/com/mtdata/institution/service/impl/InstitutionServiceImpl.java deleted file mode 100644 index 9d1672c..0000000 --- a/src/main/java/egovframework/com/mtdata/institution/service/impl/InstitutionServiceImpl.java +++ /dev/null @@ -1,4 +0,0 @@ -package egovframework.com.mtdata.institution.service.impl; - -public class InstitutionServiceImpl { -} diff --git a/src/main/java/egovframework/com/mtdata/institution/vo/InstitutionVO.java b/src/main/java/egovframework/com/mtdata/institution/vo/InstitutionVO.java deleted file mode 100644 index 9ccf2ce..0000000 --- a/src/main/java/egovframework/com/mtdata/institution/vo/InstitutionVO.java +++ /dev/null @@ -1,13 +0,0 @@ -package egovframework.com.mtdata.institution.vo; - -import lombok.Data; - -@Data -public class InstitutionVO { - - private String ogdpInstCd; // 기관코드 - private String instNm; // 기관명 - private String prsInstCd; // 대표기관코드 - private String zip; // 기관명 - -} diff --git a/src/main/java/egovframework/com/mtdata/institution/web/InstitutionController.java b/src/main/java/egovframework/com/mtdata/institution/web/InstitutionController.java deleted file mode 100644 index 9d54ad6..0000000 --- a/src/main/java/egovframework/com/mtdata/institution/web/InstitutionController.java +++ /dev/null @@ -1,4 +0,0 @@ -package egovframework.com.mtdata.institution.web; - -public class InstitutionController { -} diff --git a/src/main/resources/egovframework/sqlmap/mtdata/mappers/comtrls/Comtrlsdata_SQL.xml b/src/main/resources/egovframework/sqlmap/mtdata/mappers/comtrls/Comtrlsdata_SQL.xml index a3c1350..43602db 100644 --- a/src/main/resources/egovframework/sqlmap/mtdata/mappers/comtrls/Comtrlsdata_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mtdata/mappers/comtrls/Comtrlsdata_SQL.xml @@ -69,4 +69,42 @@ WHERE RLS_DATA_ID = #{rlsDataId} + + SELECT + rls_data_id, + rls_data_nm, + rls_data_dc, + rls_data_aplcnt_id, + rls_data_rvw_id, + rls_data_mng_dept_id, + rls_data_src_inst_id, + reg_dt, + crt_ymd, + inq_cnt, + dwnld_type, + dwnld_cnt, + rls_data_file_path, + rls_data_stts_chg, + rls_yn + FROM comtrlstrgtmetadata + WHERE 1=1 + + + + + + + +