겹치는 VO 정리

This commit is contained in:
박성은 2024-06-12 14:03:23 +09:00
parent ddec2b6a8d
commit e630ceeed5
12 changed files with 77 additions and 106 deletions

7
.idea/dataSources.xml generated
View File

@ -8,5 +8,12 @@
<jdbc-url>jdbc:postgresql://211.199.70.9:5433/dpc</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
<data-source source="LOCAL" name="geo@211.199.70.9" uuid="3d4dd385-488b-4383-957f-62dd30b0c1e5">
<driver-ref>postgresql</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
<jdbc-url>jdbc:postgresql://211.199.70.9:5433/geo</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>
</project>

View File

@ -166,17 +166,17 @@ public interface DatabaseMapper {
* DB 테이블 정보 리스트 조회
*
* @param vo
* @return List<DBTblInfoVO>
* @return List<TableInfoVO>
*/
List<DBTblInfoVO> selectInstDbTblInfoList(DBTblInfoVO vo);
List<TableInfoVO> 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<DBTblColInfoVO>
* @return List<ColumnInfoVO>
*/
List<DBTblColInfoVO> selectInstDbTblColInfoList(DBTblColInfoVO vo);
List<ColumnInfoVO> 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;
}

View File

@ -183,17 +183,17 @@ public interface DatabaseService {
* DB 테이블 정보 리스트 조회
*
* @param vo
* @return List<DBTblInfoVO>
* @return List<TableInfoVO>
*/
List<DBTblInfoVO> selectInstDbTblInfoList(DBTblInfoVO vo);
List<TableInfoVO> 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<DBTblColInfoVO>
* @return List<ColumnInfoVO>
*/
List<DBTblColInfoVO> selectInstDbTblColInfoList(DBTblColInfoVO vo);
List<ColumnInfoVO> 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;
}

View File

@ -153,53 +153,53 @@ public class DatabaseServiceImpl extends EgovAbstractServiceImpl implements Data
}
@Override
public List<DBTblInfoVO> selectInstDbTblInfoList(DBTblInfoVO vo) {
public List<TableInfoVO> 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<DBTblColInfoVO> selectInstDbTblColInfoList(DBTblColInfoVO vo) {
public List<ColumnInfoVO> 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);
}

View File

@ -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;

View File

@ -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;
}

View File

@ -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;
}

View File

@ -60,5 +60,4 @@ public class DatabaseInfoVO {
/** 데이터베이서 연결 정보 등록일자 */
private String dbConnRegistDate;
}

View File

@ -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;

View File

@ -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);

View File

@ -269,14 +269,14 @@
WHERE 1=1
</sql>
<select id="selectInstDbTblInfoList" parameterType="DBTblInfoVO" resultType="DBTblInfoVO">
<select id="selectInstDbTblInfoList" parameterType="TableInfoVO" resultType="TableInfoVO">
<include refid="selectInstDbTblInfo" />
<if test="dbLinkId != null and dbLinkId != ''">
AND db_link_id = #{dbLinkId}
</if>
</select>
<select id="selectInstDbTblInfo" parameterType="DBTblInfoVO" resultType="DBTblInfoVO">
<select id="selectInstDbTblInfo" parameterType="TableInfoVO" resultType="TableInfoVO">
<include refid="selectInstDbTblInfo" />
AND table_id = #{tableId}
<if test="dbLinkId != null and dbLinkId != ''">
@ -284,7 +284,7 @@
</if>
</select>
<insert id="insertInstDbTblInfo" parameterType="DBTblInfoVO">
<insert id="insertInstDbTblInfo" parameterType="TableInfoVO">
INSERT INTO inst_db_tbl_info (
db_link_id,
table_nm,
@ -298,7 +298,7 @@
)
</insert>
<update id="updateInstDbTblInfo" parameterType="DBTblInfoVO">
<update id="updateInstDbTblInfo" parameterType="TableInfoVO">
UPDATE inst_db_tbl_info
<set>
<if test="tableNm != null and tableNm != ''">
@ -329,18 +329,18 @@
WHERE 1=1
</sql>
<select id="selectInstDbTblColInfoList" parameterType="DBTblColInfoVO" resultType="DBTblColInfoVO">
<select id="selectInstDbTblColInfoList" parameterType="ColumnInfoVO" resultType="ColumnInfoVO">
<include refid="selectInstDbTblInfo" />
AND table_id = #{tableId}
</select>
<select id="selectInstDbTblColInfo" parameterType="DBTblColInfoVO" resultType="DBTblColInfoVO">
<select id="selectInstDbTblColInfo" parameterType="ColumnInfoVO" resultType="ColumnInfoVO">
<include refid="selectInstDbTblInfo" />
AND table_id = #{tableId}
AND column_id = #{columnId}
</select>
<insert id="insertInstDbTblColInfo" parameterType="DBTblColInfoVO">
<insert id="insertInstDbTblColInfo" parameterType="ColumnInfoVO">
INSERT INTO inst_tbl_col_info (
table_id,
column_nm,
@ -365,7 +365,7 @@
</selectKey>
</insert>
<update id="updateInstDbTblColInfo" parameterType="DBTblColInfoVO">
<update id="updateInstDbTblColInfo" parameterType="ColumnInfoVO">
UPDATE inst_tbl_col_info
<set>
<if test="columnNm != null and columnNm != ''">

View File

@ -10,10 +10,6 @@
<typeAlias alias="databaseInfoVO" type="egovframework.com.mtdata.database.vo.DatabaseInfoVO"/>
<typeAlias alias="DBConnInfoVO" type="egovframework.com.mtdata.database.vo.DBConnInfoVO"/>
<typeAlias alias="DBInfoVO" type="egovframework.com.mtdata.database.vo.DBInfoVO"/>
<typeAlias alias="DBTblInfoVO" type="egovframework.com.mtdata.database.vo.DBTblInfoVO"/>
<typeAlias alias="DBTblColInfoVO" type="egovframework.com.mtdata.database.vo.DBTblColInfoVO"/>
<typeAlias alias="tableInfoVO" type="egovframework.com.mtdata.database.vo.TableInfoVO"/>
<typeAlias alias="columnInfoVO" type="egovframework.com.mtdata.database.vo.ColumnInfoVO"/>