diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index ce04658..5489b85 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -8,5 +8,12 @@ jdbc:postgresql://211.199.70.9:5433/dpc $ProjectFileDir$ + + postgresql + true + org.postgresql.Driver + jdbc:postgresql://211.199.70.9:5433/geo + $ProjectFileDir$ + \ No newline at end of file diff --git a/src/main/java/egovframework/com/mtdata/database/mapper/DatabaseMapper.java b/src/main/java/egovframework/com/mtdata/database/mapper/DatabaseMapper.java index 2541753..dfa3807 100644 --- a/src/main/java/egovframework/com/mtdata/database/mapper/DatabaseMapper.java +++ b/src/main/java/egovframework/com/mtdata/database/mapper/DatabaseMapper.java @@ -166,17 +166,17 @@ public interface DatabaseMapper { * DB 테이블 정보 리스트 조회 * * @param vo - * @return List + * @return List */ - List selectInstDbTblInfoList(DBTblInfoVO vo); + List selectInstDbTblInfoList(TableInfoVO vo); /** * DB 테이블 정보 조회 * * @param vo - * @return DBTblInfoVO + * @return TableInfoVO */ - DBTblInfoVO selectInstDbTblInfo(DBTblInfoVO vo); + TableInfoVO selectInstDbTblInfo(TableInfoVO vo); /** * DB 테이블 정보 저장 @@ -184,7 +184,7 @@ public interface DatabaseMapper { * @param vo * @return */ - void insertInstDbTblInfo(DBTblInfoVO vo) throws Exception; + void insertInstDbTblInfo(TableInfoVO vo) throws Exception; /** * DB 테이블 정보 수정 @@ -192,7 +192,7 @@ public interface DatabaseMapper { * @param vo * @return */ - void updateInstDbTblInfo(DBTblInfoVO vo) throws Exception; + void updateInstDbTblInfo(TableInfoVO vo) throws Exception; /** @@ -202,23 +202,23 @@ public interface DatabaseMapper { * @return */ @Delete("DELETE FROM inst_db_tbl_info WHERE table_id = #{tableId}") - void deleteInstDbTblInfo(DBTblInfoVO vo) throws Exception; + void deleteInstDbTblInfo(TableInfoVO vo) throws Exception; /** * DB 테이블 컬럼 정보 리스트 조회 * * @param vo - * @return List + * @return List */ - List selectInstDbTblColInfoList(DBTblColInfoVO vo); + List selectInstDbTblColInfoList(ColumnInfoVO vo); /** * DB 테이블 컬럼 정보 조회 * * @param vo - * @return DBTblColInfoVO + * @return ColumnInfoVO */ - DBTblColInfoVO selectInstDbTblColInfo(DBTblColInfoVO vo); + ColumnInfoVO selectInstDbTblColInfo(ColumnInfoVO vo); /** * DB 테이블 컬럼 정보 저장 @@ -226,7 +226,7 @@ public interface DatabaseMapper { * @param vo * @return */ - void insertInstDbTblColInfo(DBTblColInfoVO vo) throws Exception; + void insertInstDbTblColInfo(ColumnInfoVO vo) throws Exception; /** * DB 테이블 컬럼 정보 수정 @@ -234,7 +234,7 @@ public interface DatabaseMapper { * @param vo * @return */ - void updateInstDbTblColInfo(DBTblColInfoVO vo) throws Exception; + void updateInstDbTblColInfo(ColumnInfoVO vo) throws Exception; /** @@ -244,7 +244,7 @@ public interface DatabaseMapper { * @return */ @Delete("DELETE FROM inst_tbl_col_info WHERE table_id = #{tableId} AND column_id = #{columnId}") - void deleteInstDbTblColInfo(DBTblColInfoVO vo) throws Exception; + void deleteInstDbTblColInfo(ColumnInfoVO vo) throws Exception; } diff --git a/src/main/java/egovframework/com/mtdata/database/service/DatabaseService.java b/src/main/java/egovframework/com/mtdata/database/service/DatabaseService.java index 4afd338..a44319e 100644 --- a/src/main/java/egovframework/com/mtdata/database/service/DatabaseService.java +++ b/src/main/java/egovframework/com/mtdata/database/service/DatabaseService.java @@ -183,17 +183,17 @@ public interface DatabaseService { * DB 테이블 정보 리스트 조회 * * @param vo - * @return List + * @return List */ - List selectInstDbTblInfoList(DBTblInfoVO vo); + List selectInstDbTblInfoList(TableInfoVO vo); /** * DB 테이블 정보 조회 * * @param vo - * @return DBTblInfoVO + * @return TableInfoVO */ - DBTblInfoVO selectInstDbTblInfo(DBTblInfoVO vo); + TableInfoVO selectInstDbTblInfo(TableInfoVO vo); /** * DB 테이블 정보 저장 @@ -201,7 +201,7 @@ public interface DatabaseService { * @param vo * @return */ - void insertInstDbTblInfo(DBTblInfoVO vo) throws Exception; + void insertInstDbTblInfo(TableInfoVO vo) throws Exception; /** * DB 테이블 정보 수정 @@ -209,7 +209,7 @@ public interface DatabaseService { * @param vo * @return */ - void updateInstDbTblInfo(DBTblInfoVO vo) throws Exception; + void updateInstDbTblInfo(TableInfoVO vo) throws Exception; /** @@ -218,7 +218,7 @@ public interface DatabaseService { * @param vo * @return */ - void deleteInstDbTblInfo(DBTblInfoVO vo) throws Exception; + void deleteInstDbTblInfo(TableInfoVO vo) throws Exception; @@ -226,17 +226,17 @@ public interface DatabaseService { * DB 테이블 컬럼 정보 리스트 조회 * * @param vo - * @return List + * @return List */ - List selectInstDbTblColInfoList(DBTblColInfoVO vo); + List selectInstDbTblColInfoList(ColumnInfoVO vo); /** * DB 테이블 컬럼 정보 조회 * * @param vo - * @return DBTblColInfoVO + * @return ColumnInfoVO */ - DBTblColInfoVO selectInstDbTblColInfo(DBTblColInfoVO vo); + ColumnInfoVO selectInstDbTblColInfo(ColumnInfoVO vo); /** * DB 테이블 컬럼 정보 저장 @@ -244,7 +244,7 @@ public interface DatabaseService { * @param vo * @return */ - void insertInstDbTblColInfo(DBTblColInfoVO vo) throws Exception; + void insertInstDbTblColInfo(ColumnInfoVO vo) throws Exception; /** * DB 테이블 컬럼 정보 수정 @@ -252,7 +252,7 @@ public interface DatabaseService { * @param vo * @return */ - void updateInstDbTblColInfo(DBTblColInfoVO vo) throws Exception; + void updateInstDbTblColInfo(ColumnInfoVO vo) throws Exception; /** @@ -261,6 +261,6 @@ public interface DatabaseService { * @param vo * @return */ - void deleteInstDbTblColInfo(DBTblColInfoVO vo) throws Exception; + void deleteInstDbTblColInfo(ColumnInfoVO vo) throws Exception; } diff --git a/src/main/java/egovframework/com/mtdata/database/service/impl/DatabaseServiceImpl.java b/src/main/java/egovframework/com/mtdata/database/service/impl/DatabaseServiceImpl.java index b16be22..735bf0b 100644 --- a/src/main/java/egovframework/com/mtdata/database/service/impl/DatabaseServiceImpl.java +++ b/src/main/java/egovframework/com/mtdata/database/service/impl/DatabaseServiceImpl.java @@ -153,53 +153,53 @@ public class DatabaseServiceImpl extends EgovAbstractServiceImpl implements Data } @Override - public List selectInstDbTblInfoList(DBTblInfoVO vo) { + public List selectInstDbTblInfoList(TableInfoVO vo) { return databaseMapper.selectInstDbTblInfoList(vo); } @Override - public DBTblInfoVO selectInstDbTblInfo(DBTblInfoVO vo) { + public TableInfoVO selectInstDbTblInfo(TableInfoVO vo) { return databaseMapper.selectInstDbTblInfo(vo); } @Override - public void insertInstDbTblInfo(DBTblInfoVO vo) throws Exception { + public void insertInstDbTblInfo(TableInfoVO vo) throws Exception { databaseMapper.insertInstDbTblInfo(vo); } @Override - public void updateInstDbTblInfo(DBTblInfoVO vo) throws Exception { + public void updateInstDbTblInfo(TableInfoVO vo) throws Exception { databaseMapper.updateInstDbTblInfo(vo); } @Override - public void deleteInstDbTblInfo(DBTblInfoVO vo) throws Exception { + public void deleteInstDbTblInfo(TableInfoVO vo) throws Exception { databaseMapper.deleteInstDbTblInfo(vo); } @Override - public List selectInstDbTblColInfoList(DBTblColInfoVO vo) { + public List selectInstDbTblColInfoList(ColumnInfoVO vo) { return databaseMapper.selectInstDbTblColInfoList(vo); } @Override - public DBTblColInfoVO selectInstDbTblColInfo(DBTblColInfoVO vo) { + public ColumnInfoVO selectInstDbTblColInfo(ColumnInfoVO vo) { return databaseMapper.selectInstDbTblColInfo(vo); } @Override - public void insertInstDbTblColInfo(DBTblColInfoVO vo) throws Exception { + public void insertInstDbTblColInfo(ColumnInfoVO vo) throws Exception { databaseMapper.insertInstDbTblColInfo(vo); } @Override - public void updateInstDbTblColInfo(DBTblColInfoVO vo) throws Exception { + public void updateInstDbTblColInfo(ColumnInfoVO vo) throws Exception { databaseMapper.updateInstDbTblColInfo(vo); } @Override - public void deleteInstDbTblColInfo(DBTblColInfoVO vo) throws Exception { + public void deleteInstDbTblColInfo(ColumnInfoVO vo) throws Exception { databaseMapper.deleteInstDbTblColInfo(vo); } diff --git a/src/main/java/egovframework/com/mtdata/database/vo/ColumnInfoVO.java b/src/main/java/egovframework/com/mtdata/database/vo/ColumnInfoVO.java index 46f29c4..ce4b329 100644 --- a/src/main/java/egovframework/com/mtdata/database/vo/ColumnInfoVO.java +++ b/src/main/java/egovframework/com/mtdata/database/vo/ColumnInfoVO.java @@ -1,11 +1,13 @@ package egovframework.com.mtdata.database.vo; +import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Getter; import lombok.Setter; // author : psh @Getter @Setter +@JsonInclude(JsonInclude.Include.NON_NULL) public class ColumnInfoVO { /** 컬럼 아이디 */ private int columnId; diff --git a/src/main/java/egovframework/com/mtdata/database/vo/DBTblColInfoVO.java b/src/main/java/egovframework/com/mtdata/database/vo/DBTblColInfoVO.java deleted file mode 100644 index ef650e9..0000000 --- a/src/main/java/egovframework/com/mtdata/database/vo/DBTblColInfoVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package egovframework.com.mtdata.database.vo; - -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; - -@Data -@JsonInclude(JsonInclude.Include.NON_NULL) -public class DBTblColInfoVO { - - private Integer columnId; - private Integer tableId; - private String columnNm; - private String columnType; - private Boolean isNullable; - private Boolean isPkey; - private Boolean isFkey; - private String columnDc; - private String defaultValue; -} diff --git a/src/main/java/egovframework/com/mtdata/database/vo/DBTblInfoVO.java b/src/main/java/egovframework/com/mtdata/database/vo/DBTblInfoVO.java deleted file mode 100644 index 456e9f1..0000000 --- a/src/main/java/egovframework/com/mtdata/database/vo/DBTblInfoVO.java +++ /dev/null @@ -1,16 +0,0 @@ -package egovframework.com.mtdata.database.vo; - -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; - -@Data -@JsonInclude(JsonInclude.Include.NON_NULL) -public class DBTblInfoVO { - private Integer dbConnId; - private Integer dbLinkId; - private String dbNm; - private String dbCmment; - private String registDate; - private String useYn; - -} diff --git a/src/main/java/egovframework/com/mtdata/database/vo/DatabaseInfoVO.java b/src/main/java/egovframework/com/mtdata/database/vo/DatabaseInfoVO.java index 74499d9..2e5bb8a 100644 --- a/src/main/java/egovframework/com/mtdata/database/vo/DatabaseInfoVO.java +++ b/src/main/java/egovframework/com/mtdata/database/vo/DatabaseInfoVO.java @@ -60,5 +60,4 @@ public class DatabaseInfoVO { /** 데이터베이서 연결 정보 등록일자 */ private String dbConnRegistDate; - } diff --git a/src/main/java/egovframework/com/mtdata/database/vo/TableInfoVO.java b/src/main/java/egovframework/com/mtdata/database/vo/TableInfoVO.java index 2778f60..f57b11b 100644 --- a/src/main/java/egovframework/com/mtdata/database/vo/TableInfoVO.java +++ b/src/main/java/egovframework/com/mtdata/database/vo/TableInfoVO.java @@ -1,11 +1,13 @@ package egovframework.com.mtdata.database.vo; +import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Getter; import lombok.Setter; // author : psh @Getter @Setter +@JsonInclude(JsonInclude.Include.NON_NULL) public class TableInfoVO { /** 테이블 아이디 */ private int tableId; 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 ec871e8..638a43b 100644 --- a/src/main/java/egovframework/com/mtdata/database/web/DatabaseConnController.java +++ b/src/main/java/egovframework/com/mtdata/database/web/DatabaseConnController.java @@ -277,9 +277,9 @@ public class DatabaseConnController { // inst_db_tbl_info 테이블 기본 CRUD 시작 @GetMapping(value="/get/instDbTblInfoList.do") @ResponseBody - public ResponseEntity getDbTblInfoList(DBTblInfoVO dbTblInfoVO) { + public ResponseEntity getDbTblInfoList(TableInfoVO TableInfoVO) { try{ - return ResponseEntity.ok().body(dbService.selectInstDbTblInfoList(dbTblInfoVO)); + return ResponseEntity.ok().body(dbService.selectInstDbTblInfoList(TableInfoVO)); } catch(Exception e){ log.error("Exception", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); @@ -288,9 +288,9 @@ public class DatabaseConnController { @GetMapping(value="/get/instDbTblInfo.do") @ResponseBody - public ResponseEntity getDbTblInfo(DBTblInfoVO dbTblInfoVO) { + public ResponseEntity getDbTblInfo(TableInfoVO TableInfoVO) { try{ - return ResponseEntity.ok().body(dbService.selectInstDbTblInfo(dbTblInfoVO)); + return ResponseEntity.ok().body(dbService.selectInstDbTblInfo(TableInfoVO)); } catch(Exception e){ log.error("Exception", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); @@ -299,10 +299,10 @@ public class DatabaseConnController { @PostMapping(value="/insert/instDbTblInfo.do") @ResponseBody - public ResponseEntity insertDbTblInfo(@RequestBody DBTblInfoVO dbTblInfoVO) { + public ResponseEntity insertDbTblInfo(@RequestBody TableInfoVO TableInfoVO) { try{ - dbService.insertInstDbTblInfo(dbTblInfoVO); + dbService.insertInstDbTblInfo(TableInfoVO); return ResponseEntity.ok().build(); } catch(Exception e){ log.error("Exception", e); @@ -312,10 +312,10 @@ public class DatabaseConnController { @PostMapping(value="/update/instDbTblInfo.do") @ResponseBody - public ResponseEntity updateDbTblInfo(@RequestBody DBTblInfoVO dbTblInfoVO) { + public ResponseEntity updateDbTblInfo(@RequestBody TableInfoVO TableInfoVO) { try{ - dbService.updateInstDbTblInfo(dbTblInfoVO); + dbService.updateInstDbTblInfo(TableInfoVO); return ResponseEntity.ok().build(); } catch(Exception e){ log.error("Exception", e); @@ -325,10 +325,10 @@ public class DatabaseConnController { @PostMapping(value="/delete/instDbTblInfo.do") @ResponseBody - public ResponseEntity deleteDbTblInfo(@RequestBody DBTblInfoVO dbTblInfoVO) { + public ResponseEntity deleteDbTblInfo(@RequestBody TableInfoVO TableInfoVO) { try{ - dbService.deleteInstDbTblInfo(dbTblInfoVO); + dbService.deleteInstDbTblInfo(TableInfoVO); return ResponseEntity.ok().build(); } catch(Exception e){ log.error("Exception", e); @@ -341,9 +341,9 @@ public class DatabaseConnController { // inst_tbl_col_info 테이블 기본 CRUD 시작 @GetMapping(value="/get/instDbTblColInfoList.do") @ResponseBody - public ResponseEntity getDbTblColInfoList(DBTblColInfoVO dbTblColInfoVO) { + public ResponseEntity getDbTblColInfoList(ColumnInfoVO ColumnInfoVO) { try{ - return ResponseEntity.ok().body(dbService.selectInstDbTblColInfoList(dbTblColInfoVO)); + return ResponseEntity.ok().body(dbService.selectInstDbTblColInfoList(ColumnInfoVO)); } catch(Exception e){ log.error("Exception", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); @@ -353,9 +353,9 @@ public class DatabaseConnController { @GetMapping(value="/get/instDbTblColInfo.do") @ResponseBody - public ResponseEntity getDbTblColInfo(DBTblColInfoVO dbTblColInfoVO) { + public ResponseEntity getDbTblColInfo(ColumnInfoVO ColumnInfoVO) { try{ - return ResponseEntity.ok().body(dbService.selectInstDbTblColInfo(dbTblColInfoVO)); + return ResponseEntity.ok().body(dbService.selectInstDbTblColInfo(ColumnInfoVO)); } catch(Exception e){ log.error("Exception", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); @@ -364,10 +364,10 @@ public class DatabaseConnController { @PostMapping(value="/insert/instDbTblColInfo.do") @ResponseBody - public ResponseEntity insertDbTblColInfo(@RequestBody DBTblColInfoVO dbTblColInfoVO) { + public ResponseEntity insertDbTblColInfo(@RequestBody ColumnInfoVO ColumnInfoVO) { try{ - dbService.insertInstDbTblColInfo(dbTblColInfoVO); + dbService.insertInstDbTblColInfo(ColumnInfoVO); return ResponseEntity.ok().build(); } catch(Exception e){ log.error("Exception", e); @@ -377,10 +377,10 @@ public class DatabaseConnController { @PostMapping(value="/update/instDbTblColInfo.do") @ResponseBody - public ResponseEntity updateDbTblColInfo(@RequestBody DBTblColInfoVO dbTblColInfoVO) { + public ResponseEntity updateDbTblColInfo(@RequestBody ColumnInfoVO ColumnInfoVO) { try{ - dbService.updateInstDbTblColInfo(dbTblColInfoVO); + dbService.updateInstDbTblColInfo(ColumnInfoVO); return ResponseEntity.ok().build(); } catch(Exception e){ log.error("Exception", e); @@ -390,10 +390,10 @@ public class DatabaseConnController { @PostMapping(value="/delete/instDbTblColInfo.do") @ResponseBody - public ResponseEntity deleteDbTblColInfo(@RequestBody DBTblColInfoVO dbTblColInfoVO) { + public ResponseEntity deleteDbTblColInfo(@RequestBody ColumnInfoVO ColumnInfoVO) { try{ - dbService.deleteInstDbTblColInfo(dbTblColInfoVO); + dbService.deleteInstDbTblColInfo(ColumnInfoVO); return ResponseEntity.ok().build(); } catch(Exception e){ log.error("Exception", e); diff --git a/src/main/resources/egovframework/sqlmap/mtdata/mappers/database/DatabaseConnect_SQL.xml b/src/main/resources/egovframework/sqlmap/mtdata/mappers/database/DatabaseConnect_SQL.xml index a759d8a..d624b6a 100644 --- a/src/main/resources/egovframework/sqlmap/mtdata/mappers/database/DatabaseConnect_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mtdata/mappers/database/DatabaseConnect_SQL.xml @@ -269,14 +269,14 @@ WHERE 1=1 - AND db_link_id = #{dbLinkId} - AND table_id = #{tableId} @@ -284,7 +284,7 @@ - + INSERT INTO inst_db_tbl_info ( db_link_id, table_nm, @@ -298,7 +298,7 @@ ) - + UPDATE inst_db_tbl_info @@ -329,18 +329,18 @@ WHERE 1=1 - AND table_id = #{tableId} - AND table_id = #{tableId} AND column_id = #{columnId} - + INSERT INTO inst_tbl_col_info ( table_id, column_nm, @@ -365,7 +365,7 @@ - + UPDATE inst_tbl_col_info diff --git a/src/main/resources/egovframework/sqlmap/mtdata/sql-mapper-config.xml b/src/main/resources/egovframework/sqlmap/mtdata/sql-mapper-config.xml index c89767d..dc0cf23 100644 --- a/src/main/resources/egovframework/sqlmap/mtdata/sql-mapper-config.xml +++ b/src/main/resources/egovframework/sqlmap/mtdata/sql-mapper-config.xml @@ -10,10 +10,6 @@ - - - -