원천데이터 select

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>

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

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용이나, 차후 다른 용도로 쓰임이 있다 판단되면 수정)
+	 * [comtsrcdata]테이블 조회
-//	 *
+	 *
-//	 * @param vo
+	 * @param vo
-//	 * @return
+	 * @return vo
-//	 */
+	 * @throws Exception
-//	public List<DatabaseInfoVO> selectSysDbConnList(DatabaseInfoVO vo);
+	 */
+	ComtsrcdataVO selectSrcData(ComtsrcdataVO vo);
+
 
 
 }

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용이나 차후 다른 용도로 쓰임이 있다 판단되면 수정)

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();
+	}
 }

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.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 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());
+		}
+	}
 
 }

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 egovframework.com.mtdata.config.dbConn.mySql.CreateYaml;
-import java.util.List;
+import egovframework.com.mtdata.database.service.DatabaseService;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
 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 javax.annotation.Resource;
-import egovframework.com.mtdata.database.service.DatabaseService;
+import java.util.List;
-import egovframework.com.mtdata.schema.service.impl.DatabaseSchemaViewerService;
 
 @RestController
 @RequestMapping("/api")

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>

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">