Compare commits

..

No commits in common. "f81a89b517290915ca77e2ece4d76546269ffca4" and "4185fc3726a3807bd5374feb5e2b2513f801a439" have entirely different histories.

6 changed files with 37 additions and 37 deletions

4
.idea/dataSources.xml generated
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="dpc@211.199.70.9" uuid="4191748a-eb73-41fa-9dfc-ac815cba1dc4">
<data-source source="LOCAL" name="dpc_db@211.199.70.9" uuid="4191748a-eb73-41fa-9dfc-ac815cba1dc4">
<driver-ref>postgresql</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
<jdbc-url>jdbc:postgresql://211.199.70.9:5433/dpc</jdbc-url>
<jdbc-url>jdbc:postgresql://211.199.70.9:5433/dpc_db</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>

View File

@ -172,8 +172,8 @@ public class ComtrlsdataController {
* @return
* @throws Exception
*/
@PostMapping(value="/deIdendtify/masking.do")
public ResponseEntity<?> deIdendtifyMasking(@RequestBody ComtrlsColVO comtrlsColVO) {
@GetMapping(value="/deIdendtify/masking.do")
public ResponseEntity<?> deIdendtifyMasking(ComtrlsColVO comtrlsColVO) {
try{
comtrlsdataService.deIdentificationMasking(comtrlsColVO);
return ResponseEntity.ok().build();

View File

@ -62,32 +62,38 @@ public class DatabaseServiceImpl extends EgovAbstractServiceImpl implements Data
@Transactional
public void updateRegisterdDBInfoList(DatabaseInfoVO vo) throws Exception{
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());
//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());
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);
dbInfoVO.setDbConnId(vo.getDbConnId());
databaseMapper.updateInstDbInfo(dbInfoVO);
}
} else {
throw new Exception();
}
}
@Override

View File

@ -130,8 +130,7 @@ public class DatabaseConnController {
}
}
// inst_db_conn_info 테이블 기본 CRUD 시작
// inst_db_conn_info 테이블 기본 CRUD
@GetMapping(value="/get/instDbConnInfoList.do")
@ResponseBody
public ResponseEntity<?> getDbConnInfoList(DBConnInfoVO dbConnInfoVO) {
@ -192,9 +191,8 @@ 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) {
@ -255,9 +253,8 @@ 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) {
@ -319,9 +316,7 @@ public class DatabaseConnController {
}
}
// inst_db_tbl_info 테이블 기본 CRUD
// inst_tbl_col_info 테이블 기본 CRUD 시작
// inst_tbl_col_info 테이블 기본 CRUD
@GetMapping(value="/get/instDbTblColInfoList.do")
@ResponseBody
public ResponseEntity<?> getDbTblColInfoList(DBTblColInfoVO dbTblColInfoVO) {
@ -383,5 +378,4 @@ public class DatabaseConnController {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage());
}
}
// inst_tbl_col_info 테이블 기본 CRUD
}

View File

@ -108,7 +108,7 @@
</select>
<update id="deIdentificationMasking" parameterType="ComtrlsColVO" >
<bind name="path" value="'\'{' + rlsDataColNm + '}\''" />
<bind name="path" value="'{' + rlsDataColNm + '}'" />
UPDATE comtrlsdata
SET rls_data_vl = jsonb_set(
rls_data_vl,

View File

@ -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 AND b.use_yn = 'Y'
LEFT JOIN inst_db_conn_info b ON a.db_conn_id = b.db_conn_id
LEFT JOIN inst_sys_info c ON b.sys_id = c.sys_id
WHERE b.register_id = #{registerId}
AND a.use_yn = 'Y'