dev

src/main/java/com/its/traf/config/DatabaseConfig.java

@@ -53,7 +53,7 @@ public class DatabaseConfig {
     }
 
     @Primary
-    @Bean({"sqlSessionFactory", "oper01", "vds01", "gits01", "dsrc01"})
+    @Bean({"sqlSessionFactory", "oper01", "vds01", "gits01", "dsrc01", "moct01"})
     public SqlSessionFactory sqlSessionFactoryBean(
             @Autowired @Qualifier("dataSource") DataSource dataSource, ApplicationContext applicationContext) {
         log.info("mapperLocations: {}", this.mapperLocations);

src/main/java/com/its/traf/config/DatabaseUtisConfig.java

@@ -5,7 +5,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -13,9 +12,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import javax.annotation.PostConstruct;
 import javax.sql.DataSource;
@@ -23,11 +20,11 @@ import java.io.IOException;
 
 @Slf4j
 @ToString
-@Configuration
-@MapperScan(
-        basePackages="com.its.traf.dao.mapper.utis",
-        sqlSessionFactoryRef = "utisSqlSessionFactory")
-@EnableTransactionManagement
+//@Configuration
+//@MapperScan(
+//        basePackages="com.its.traf.dao.mapper.utis",
+//        sqlSessionFactoryRef = "utisSqlSessionFactory")
+//@EnableTransactionManagement
 public class DatabaseUtisConfig {
 
     @Value("${spring.utis-datasource.hikari.mapper-locations:classpath:mybatis/mapper/utis/**/*.xml}")

src/main/resources/application.yml

@@ -44,7 +44,7 @@ spring:
   application:
     name: traf-prcs-server
   profiles:
-    active: dev
+    active: prod
   main:
     web-application-type: none
     log-startup-info: true

src/main/resources/mybatis/mapper/its/collect/LinkRawDataGITS01.xml

@@ -14,9 +14,23 @@
                COUNT(1)                              AS CLCT_CNT
         FROM EI_LINK_CUR A, TB_LINK B
         WHERE A.LINK_ID = TO_CHAR(B.LINK_ID)
-          AND A.COLLE_DATE BETWEEN #{FROM_DT} AND #{TO_DT}
+          AND A.COLLE_DATE  >= TO_CHAR(SYSDATE - 9/1440, 'YYYYMMDDHH24MISS')
         GROUP BY B.LINK_ID
     ]]>
     </select>
-
+    <select id="selectLinkRawDataGITS01_backup" resultType="com.its.traf.dto.its.LinkRawDataDto" parameterType="java.util.Map">
+    <![CDATA[
+        SELECT B.LINK_ID                             AS LINK_ID,
+               ROUND(AVG(NVL(A.LINK_TRVLSPD, 0)), 0) AS SPED,
+               ROUND(AVG(NVL(A.TRAFFICVOL,   0)), 0) AS TFVL,
+               ROUND(AVG(NVL(A.OCCUPRATIO,   0)), 2) AS OCPY_RATE,
+               ROUND(AVG(NVL(A.TRVLTM_SSCNT, 0)), 0) AS TRVL_HH,
+               MAX(A.COLLE_DATE)                     AS CLCT_DT,
+               COUNT(1)                              AS CLCT_CNT
+        FROM EI_LINK_CUR A, TB_LINK B
+        WHERE A.LINK_ID = TO_CHAR(B.LINK_ID)
+          AND A.COLLE_DATE BETWEEN #{FROM_DT} AND #{TO_DT}
+        GROUP BY B.LINK_ID
+        ]]>
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/its/collect/LinkRawDataMOCT01.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.its.traf.dao.mapper.utis.LinkRawDataMOCT1Mapper">
+
+    <select id="selectLinkRawDataMOCT01" resultType="com.its.traf.dto.its.LinkRawDataDto" parameterType="java.util.Map">
+    <![CDATA[
+        SELECT A.LINKID                                    AS LINK_ID,
+               ROUND(AVG(A.SPEED), 0)                      AS SPED,
+               0                                           AS TFVL,
+               0                                           AS OCPY_RATE,
+               ROUND(AVG(TRAVELTIME), 0)                   AS TRVL_HH,
+               TO_CHAR(MAX(A.REGDATE), 'YYYYMMDDHH24MISS') AS CLCT_DT,
+               COUNT(1)                                    AS CLCT_CNT
+        FROM TRAFFIC_MOCT A
+                 INNER JOIN (SELECT TO_CHAR(LINK_ID) AS LINKID
+                             FROM TB_LINK) B
+                            ON A.LINKID    = B.LINKID
+                                AND A.LINKLEVEL = 1
+                                AND A.REGDATE  >= SYSDATE - 9/1440
+                                AND A.SPEED     > 2
+        GROUP BY A.LINKID
+        ]]>
+    </select>
+
+    <select id="selectLinkRawData" resultType="com.its.traf.dto.its.LinkRawDataDto" parameterType="java.util.Map">
+    <![CDATA[
+        SELECT A.LINKID                                    AS LINK_ID,
+               ROUND(AVG(A.SPEED), 0)                      AS SPED,
+               0                                           AS TFVL,
+               0                                           AS OCPY_RATE,
+               ROUND(AVG(TRAVELTIME), 0)                   AS TRVL_HH,
+               TO_CHAR(MAX(A.REGDATE), 'YYYYMMDDHH24MISS') AS CLCT_DT,
+               COUNT(1)                                    AS CLCT_CNT
+        FROM TRAFFIC_MOCT A
+                 INNER JOIN (SELECT TO_CHAR(LINK_ID) AS LINKID
+                             FROM TB_LINK) B
+                            ON A.LINKID    = B.LINKID
+                                AND A.LINKLEVEL = 1
+                                AND A.REGDATE  >= SYSDATE - 9/1440
+                                AND A.SPEED     > 2
+        GROUP BY A.LINKID
+        ]]>
+    </select>
+
+</mapper>

src/main/resources/mybatis/mapper/its/collect/LinkRawDataUTIS02.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="mapper.its.collect.UTIS02">
+
+    <select id="selectLinkRawDataUTIS02" resultType="com.its.traf.dto.its.LinkRawDataDto" parameterType="java.util.Map">
+    <![CDATA[
+	    SELECT A.LINKID                                    AS LINK_ID,
+               ROUND(AVG(A.SPEED), 0)                      AS SPED,
+               0                                           AS TFVL,
+               0                                           AS OCPY_RATE,
+               ROUND(AVG(TRAVELTIME), 0)                   AS TRVL_HH,
+               TO_CHAR(MAX(A.REGDATE), 'YYYYMMDDHH24MISS') AS CLCT_DT,
+               COUNT(1)                                    AS CLCT_CNT
+          FROM TRAFFIC_CENTER A
+         INNER JOIN (SELECT TO_CHAR(LINK_ID) AS LINKID
+                       FROM TB_LINK) B
+            ON A.LINKID    = B.LINKID
+           AND A.LINKLEVEL = 1
+           AND A.REGDATE  >= SYSDATE - 9/1440
+           AND A.SPEED     > 2
+         GROUP BY A.LINKID
+    ]]>
+    </select>
+
+</mapper>