diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 4fd39c6..ce04658 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,11 +1,11 @@ - + postgresql true org.postgresql.Driver - jdbc:postgresql://211.199.70.9:5433/dpc_db + jdbc:postgresql://211.199.70.9:5433/dpc $ProjectFileDir$ 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 08ee947..03f6c52 100644 --- a/src/main/java/egovframework/com/mtdata/comtrls/web/ComtrlsdataController.java +++ b/src/main/java/egovframework/com/mtdata/comtrls/web/ComtrlsdataController.java @@ -172,8 +172,8 @@ public class ComtrlsdataController { * @return * @throws Exception */ - @GetMapping(value="/deIdendtify/masking.do") - public ResponseEntity deIdendtifyMasking(ComtrlsColVO comtrlsColVO) { + @PostMapping(value="/deIdendtify/masking.do") + public ResponseEntity deIdendtifyMasking(@RequestBody ComtrlsColVO comtrlsColVO) { try{ comtrlsdataService.deIdentificationMasking(comtrlsColVO); return ResponseEntity.ok().build(); 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 7dbe1d1..a72337b 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 @@ -62,38 +62,32 @@ public class DatabaseServiceImpl extends EgovAbstractServiceImpl implements Data @Transactional public void updateRegisterdDBInfoList(DatabaseInfoVO vo) throws Exception{ - //TODO: 연결체크 로직 추가 - if (true) { - DBConnInfoVO dbConnInfoVO = new DBConnInfoVO(); - dbConnInfoVO.setSysId(vo.getSysId()); - dbConnInfoVO.setDbConnUser(vo.getDbConnUser()); - dbConnInfoVO.setDbConnPw(vo.getDbConnPw()); - dbConnInfoVO.setDbType(vo.getDbType()); - dbConnInfoVO.setDbConnIp(vo.getDbConnIp()); - dbConnInfoVO.setRegisterId(vo.getRegisterId()); + DBConnInfoVO dbConnInfoVO = new DBConnInfoVO(); + dbConnInfoVO.setSysId(vo.getSysId()); + dbConnInfoVO.setDbConnUser(vo.getDbConnUser()); + dbConnInfoVO.setDbConnPw(vo.getDbConnPw()); + dbConnInfoVO.setDbType(vo.getDbType()); + dbConnInfoVO.setDbConnIp(vo.getDbConnIp()); + dbConnInfoVO.setRegisterId(vo.getRegisterId()); - DBInfoVO dbInfoVO = new DBInfoVO(); - dbInfoVO.setDbLinkId(vo.getDbLinkId()); - dbInfoVO.setDbNm(vo.getDbNm()); + DBInfoVO dbInfoVO = new DBInfoVO(); + dbInfoVO.setDbLinkId(vo.getDbLinkId()); + dbInfoVO.setDbNm(vo.getDbNm()); - int checkDbConnCnt = databaseMapper.checkDbConnInfo(vo); + int checkDbConnCnt = databaseMapper.checkDbConnInfo(vo); - // DB 연결정보 미존재 시 DB 연결 정보 insert - if (checkDbConnCnt < 1) { - databaseMapper.insertInstDbConnInfo(dbConnInfoVO); + // DB 연결정보 미존재 시 DB 연결 정보 insert + if (checkDbConnCnt < 1) { + databaseMapper.insertInstDbConnInfo(dbConnInfoVO); - dbInfoVO.setDbConnId(dbConnInfoVO.getDbConnId()); - databaseMapper.updateInstDbInfo(dbInfoVO); - } else { // 존재 시 update - dbConnInfoVO.setDbConnId(vo.getDbConnId()); - databaseMapper.updateInstDbConnInfo(dbConnInfoVO); + dbInfoVO.setDbConnId(dbConnInfoVO.getDbConnId()); + databaseMapper.updateInstDbInfo(dbInfoVO); + } else { // 존재 시 update + dbConnInfoVO.setDbConnId(vo.getDbConnId()); + databaseMapper.updateInstDbConnInfo(dbConnInfoVO); - dbInfoVO.setDbConnId(vo.getDbConnId()); - databaseMapper.updateInstDbInfo(dbInfoVO); - } - - } else { - throw new Exception(); + dbInfoVO.setDbConnId(vo.getDbConnId()); + databaseMapper.updateInstDbInfo(dbInfoVO); } } @Override 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 3f90856..7ef580a 100644 --- a/src/main/java/egovframework/com/mtdata/database/web/DatabaseConnController.java +++ b/src/main/java/egovframework/com/mtdata/database/web/DatabaseConnController.java @@ -130,7 +130,8 @@ public class DatabaseConnController { } } - // inst_db_conn_info 테이블 기본 CRUD + + // inst_db_conn_info 테이블 기본 CRUD 시작 @GetMapping(value="/get/instDbConnInfoList.do") @ResponseBody public ResponseEntity getDbConnInfoList(DBConnInfoVO dbConnInfoVO) { @@ -191,8 +192,9 @@ public class DatabaseConnController { return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); } } + // inst_db_conn_info 테이블 기본 CRUD 끝 - // inst_db_info 테이블 기본 CRUD + // inst_db_info 테이블 기본 CRUD 시작 @GetMapping(value="/get/instDbInfoList.do") @ResponseBody public ResponseEntity getDbInfoList(DBInfoVO dbInfoVO) { @@ -253,8 +255,9 @@ public class DatabaseConnController { return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); } } + // inst_db_info 테이블 기본 CRUD 끝 - // inst_db_tbl_info 테이블 기본 CRUD + // inst_db_tbl_info 테이블 기본 CRUD 시작 @GetMapping(value="/get/instDbTblInfoList.do") @ResponseBody public ResponseEntity getDbTblInfoList(DBTblInfoVO dbTblInfoVO) { @@ -316,7 +319,9 @@ public class DatabaseConnController { } } - // inst_tbl_col_info 테이블 기본 CRUD + // inst_db_tbl_info 테이블 기본 CRUD 끝 + + // inst_tbl_col_info 테이블 기본 CRUD 시작 @GetMapping(value="/get/instDbTblColInfoList.do") @ResponseBody public ResponseEntity getDbTblColInfoList(DBTblColInfoVO dbTblColInfoVO) { @@ -378,4 +383,5 @@ public class DatabaseConnController { return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); } } + // inst_tbl_col_info 테이블 기본 CRUD 끝 } 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 9945451..2cfb108 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 @@ -108,7 +108,7 @@ - + UPDATE comtrlsdata SET rls_data_vl = jsonb_set( rls_data_vl, 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 2693993..ecb280e 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 @@ -122,7 +122,7 @@ b.sys_id, b.db_type FROM inst_db_info a - LEFT JOIN inst_db_conn_info b ON a.db_conn_id = b.db_conn_id + LEFT JOIN inst_db_conn_info b ON a.db_conn_id = b.db_conn_id AND b.use_yn = 'Y' LEFT JOIN inst_sys_info c ON b.sys_id = c.sys_id WHERE b.register_id = #{registerId} AND a.use_yn = 'Y'