From f49f9b503fc621d2e4bfda7fdd1bd7ecc9eb10ae Mon Sep 17 00:00:00 2001
From: Seongeun Park <pse@smsoft.kr>
Date: Fri, 7 Jun 2024 13:12:30 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9B=90=EC=B2=9C=EB=8D=B0=EC=9D=B4=ED=84=B0?=
 =?UTF-8?q?=20select?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  7 ++++++
 .../comtsrcdata/dto/ComtsrcdataDTO.java       | 25 +++++++++++++++++++
 .../comtsrcdata/mapper/ComtsrcdataMapper.java | 16 ++++++------
 .../service/ComtsrcdataService.java           |  3 +++
 .../service/impl/ComtsrcdataServiceImpl.java  | 16 ++++++++++++
 .../web/ComtsrcdataController.java            | 16 +++++++++---
 .../database/web/DatabaseConnController.java  | 14 ++++-------
 .../mappers/comtsrcdata/Comtsrcdata_SQL.xml   |  9 +++++++
 .../mappers/database/DatabaseConnect_SQL.xml  |  9 ++++---
 9 files changed, 93 insertions(+), 22 deletions(-)
 create mode 100644 src/main/java/egovframework/com/mtdata/comtsrcdata/dto/ComtsrcdataDTO.java

diff --git a/pom.xml b/pom.xml
index c573b5d..ae6b4d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,6 +153,13 @@
             <version>8.0.29</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+
 <!--         <dependency>
             <groupId>ojdbc</groupId>
             <artifactId>ojdbc</artifactId>
diff --git a/src/main/java/egovframework/com/mtdata/comtsrcdata/dto/ComtsrcdataDTO.java b/src/main/java/egovframework/com/mtdata/comtsrcdata/dto/ComtsrcdataDTO.java
new file mode 100644
index 0000000..2de07fe
--- /dev/null
+++ b/src/main/java/egovframework/com/mtdata/comtsrcdata/dto/ComtsrcdataDTO.java
@@ -0,0 +1,25 @@
+package egovframework.com.mtdata.comtsrcdata.dto;
+
+import egovframework.com.mtdata.comtsrcdata.vo.ComtsrcdataVO;
+import lombok.Builder;
+import lombok.Getter;
+
+
+@Getter
+public class ComtsrcdataDTO {
+
+    /** 원천데이터 데이터 ID */
+    private Integer srcDataId ;
+    /** 추출 ID  */
+    private Integer extrId;
+    /** 원천데이터 값 */
+    private Object srcDataVl;
+
+    @Builder
+    ComtsrcdataDTO(ComtsrcdataVO vo, Object data) {
+        this.extrId = vo.getExtrId();
+        this.srcDataId = vo.getSrcDataId();
+        this.srcDataVl = data;
+    }
+
+}
diff --git a/src/main/java/egovframework/com/mtdata/comtsrcdata/mapper/ComtsrcdataMapper.java b/src/main/java/egovframework/com/mtdata/comtsrcdata/mapper/ComtsrcdataMapper.java
index 0d7da52..300e13f 100644
--- a/src/main/java/egovframework/com/mtdata/comtsrcdata/mapper/ComtsrcdataMapper.java
+++ b/src/main/java/egovframework/com/mtdata/comtsrcdata/mapper/ComtsrcdataMapper.java
@@ -38,13 +38,15 @@ public interface ComtsrcdataMapper {
 
 	public int updateDatasrc(ComtsrcdataVO vo) throws Exception;
 
-//	/**
-//	 * Yaml 파일을 업데이트하기 위해 목록을 조회한다(pg_chameleon yaml용이나, 차후 다른 용도로 쓰임이 있다 판단되면 수정)
-//	 *
-//	 * @param vo
-//	 * @return
-//	 */
-//	public List<DatabaseInfoVO> selectSysDbConnList(DatabaseInfoVO vo);
+	/**
+	 * [comtsrcdata]테이블 조회
+	 *
+	 * @param vo
+	 * @return vo
+	 * @throws Exception
+	 */
+	ComtsrcdataVO selectSrcData(ComtsrcdataVO vo);
+
 
 
 }
diff --git a/src/main/java/egovframework/com/mtdata/comtsrcdata/service/ComtsrcdataService.java b/src/main/java/egovframework/com/mtdata/comtsrcdata/service/ComtsrcdataService.java
index c1f8b21..80fc1e2 100644
--- a/src/main/java/egovframework/com/mtdata/comtsrcdata/service/ComtsrcdataService.java
+++ b/src/main/java/egovframework/com/mtdata/comtsrcdata/service/ComtsrcdataService.java
@@ -1,5 +1,6 @@
 package egovframework.com.mtdata.comtsrcdata.service;
 
+import egovframework.com.mtdata.comtsrcdata.dto.ComtsrcdataDTO;
 import egovframework.com.mtdata.comtsrcdata.vo.ComtExtrtVO;
 import egovframework.com.mtdata.comtsrcdata.vo.ComtTableVO;
 import egovframework.com.mtdata.comtsrcdata.vo.ComtsrcdataVO;
@@ -45,6 +46,8 @@ public interface ComtsrcdataService {
 
 	public int updateDatasrc(ComtsrcdataVO vo) throws Exception;
 
+	ComtsrcdataDTO selectComtSrcData(ComtsrcdataVO vo) throws Exception;
+
 
 //	/**
 //	 * Yaml 파일을 업데이트하기 위해 목록을 조회한다(pg_chameleon yaml용이나 차후 다른 용도로 쓰임이 있다 판단되면 수정)
diff --git a/src/main/java/egovframework/com/mtdata/comtsrcdata/service/impl/ComtsrcdataServiceImpl.java b/src/main/java/egovframework/com/mtdata/comtsrcdata/service/impl/ComtsrcdataServiceImpl.java
index 2f86b34..78bd568 100644
--- a/src/main/java/egovframework/com/mtdata/comtsrcdata/service/impl/ComtsrcdataServiceImpl.java
+++ b/src/main/java/egovframework/com/mtdata/comtsrcdata/service/impl/ComtsrcdataServiceImpl.java
@@ -1,14 +1,17 @@
 package egovframework.com.mtdata.comtsrcdata.service.impl;
 
+import egovframework.com.mtdata.comtsrcdata.dto.ComtsrcdataDTO;
 import egovframework.com.mtdata.comtsrcdata.mapper.ComtsrcdataMapper;
 import egovframework.com.mtdata.comtsrcdata.service.ComtsrcdataService;
 import egovframework.com.mtdata.comtsrcdata.vo.ComtExtrtVO;
 import egovframework.com.mtdata.comtsrcdata.vo.ComtTableVO;
 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 javax.json.stream.JsonParser;
 
 @Service("ComtsrcdataService")
 public class ComtsrcdataServiceImpl extends EgovAbstractServiceImpl implements ComtsrcdataService {
@@ -35,4 +38,17 @@ public class ComtsrcdataServiceImpl extends EgovAbstractServiceImpl implements C
 	public int updateDatasrc(ComtsrcdataVO vo) throws Exception {
 		return comtsrcdataMapper.updateDatasrc(vo);
 	}
+
+	@Override
+	public ComtsrcdataDTO selectComtSrcData(ComtsrcdataVO vo) throws Exception {
+		ComtsrcdataVO resultVO = comtsrcdataMapper.selectSrcData(vo);
+
+		JSONParser jsonParser = new JSONParser();
+		Object data = jsonParser.parse(resultVO.getSrcDataVl());
+
+		return ComtsrcdataDTO.builder()
+				.vo(resultVO)
+				.data(data)
+				.build();
+	}
 }
diff --git a/src/main/java/egovframework/com/mtdata/comtsrcdata/web/ComtsrcdataController.java b/src/main/java/egovframework/com/mtdata/comtsrcdata/web/ComtsrcdataController.java
index ef0c65e..1a9daab 100644
--- a/src/main/java/egovframework/com/mtdata/comtsrcdata/web/ComtsrcdataController.java
+++ b/src/main/java/egovframework/com/mtdata/comtsrcdata/web/ComtsrcdataController.java
@@ -1,15 +1,16 @@
 package egovframework.com.mtdata.comtsrcdata.web;
 
+import egovframework.com.mtdata.comtsrcdata.dto.ComtsrcdataDTO;
 import egovframework.com.mtdata.comtsrcdata.service.ComtsrcdataService;
 import egovframework.com.mtdata.comtsrcdata.vo.ComtsrcdataVO;
 import egovframework.com.mtdata.database.vo.DatabaseInfoVO;
 //import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 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.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;
 import java.sql.*;
@@ -79,5 +80,14 @@ public class ComtsrcdataController {
 
 	}
 
+	@GetMapping(value="/get/comsrcdata.do")
+	public ResponseEntity<?> getComsrcdata(ComtsrcdataVO comtsrcdataVO) {
+		try{
+			return ResponseEntity.ok().body(service.selectComtSrcData(comtsrcdataVO));
+		} 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/database/web/DatabaseConnController.java b/src/main/java/egovframework/com/mtdata/database/web/DatabaseConnController.java
index 58689b6..cab27d6 100644
--- a/src/main/java/egovframework/com/mtdata/database/web/DatabaseConnController.java
+++ b/src/main/java/egovframework/com/mtdata/database/web/DatabaseConnController.java
@@ -1,12 +1,9 @@
 package egovframework.com.mtdata.database.web;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
+import egovframework.com.mtdata.config.dbConn.mySql.CreateYaml;
+import egovframework.com.mtdata.database.service.DatabaseService;
 import egovframework.com.mtdata.database.vo.*;
+import egovframework.com.mtdata.schema.service.impl.DatabaseSchemaViewerService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
@@ -14,9 +11,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import egovframework.com.mtdata.config.dbConn.mySql.CreateYaml;
-import egovframework.com.mtdata.database.service.DatabaseService;
-import egovframework.com.mtdata.schema.service.impl.DatabaseSchemaViewerService;
+import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @RequestMapping("/api")
diff --git a/src/main/resources/egovframework/sqlmap/mtdata/mappers/comtsrcdata/Comtsrcdata_SQL.xml b/src/main/resources/egovframework/sqlmap/mtdata/mappers/comtsrcdata/Comtsrcdata_SQL.xml
index 4a19959..c0162a9 100644
--- a/src/main/resources/egovframework/sqlmap/mtdata/mappers/comtsrcdata/Comtsrcdata_SQL.xml
+++ b/src/main/resources/egovframework/sqlmap/mtdata/mappers/comtsrcdata/Comtsrcdata_SQL.xml
@@ -52,5 +52,14 @@
 		where src_data_id= 2
 	</update>
 
+	<select id="selectSrcData" parameterType="ComtsrcdataVO" resultType="ComtsrcdataVO">
+		SELECT  EXTR_ID,
+				SRC_DATA_ID,
+				SRC_DATA_VL
+		FROM    comtsrcdata
+		WHERE	SRC_DATA_ID = #{srcDataId}
+	</select>
+
+
 
 </mapper>
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 21e175a..2693993 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
@@ -46,9 +46,6 @@
 			#{dbConnPort},
 			#{dbConnIp},
 			#{registerId})
-		<selectKey resultType="int" keyProperty="dbConnId" order="AFTER">
-			SELECT LAST_INSERT_ID()
-		</selectKey>
 	</insert>
 
 	<select id="selectSysDb" resultMap="databaseInfoMap">
@@ -179,6 +176,9 @@
 		 #{dbConnIp},
 		 #{registerId}
 	 )
+		<selectKey resultType="int" keyProperty="dbConnId" order="AFTER">
+			SELECT LAST_INSERT_ID()
+		</selectKey>
 	</insert>
 
 	<update id="updateInstDbConnInfo" parameterType="DBConnInfoVO">
@@ -361,6 +361,9 @@
 		 #{columnDc},
 		 #{defaultValue}
 	 )
+		<selectKey resultType="int" keyProperty="dbConnId" order="AFTER">
+			SELECT LAST_INSERT_ID()
+		</selectKey>
 	</insert>
 
 	<update id="updateInstDbTblColInfo" parameterType="DBTblColInfoVO">