shjung 2 years ago
parent
commit
91360da58d

+ 10 - 1
pom.xml

@@ -149,7 +149,16 @@
             <scope>system</scope>
             <systemPath>${webapp.lib}/ojdbc7-12.1.0.2.jar</systemPath>
         </dependency>
-
+<!--        <dependency>-->
+<!--            <groupId>com.oracle.database.jdbc</groupId>-->
+<!--            <artifactId>ojdbc8</artifactId>-->
+<!--            <scope>runtime</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>oracle</groupId>-->
+<!--            <artifactId>ojdbc8</artifactId>-->
+<!--            <version>12.2.0.1</version>-->
+<!--        </dependency>-->
 <!--        <dependency>-->
 <!--            <groupId>com.oracle.database.jdbc</groupId>-->
 <!--            <artifactId>ojdbc8</artifactId>-->

+ 4 - 4
src/main/java/com/its/traf/controller/its/TrafPrcsDDController.java

@@ -45,7 +45,7 @@ public class TrafPrcsDDController implements AbstractTrafPrcsController {
          */
         initialize();
 
-        boolean isHoliday = this.hldyInfrService.isHoliday(this.statTime);
+        //boolean isHoliday = this.hldyInfrService.isHoliday(this.statTime);
         Date statDt = TimeUtils.stringToDate(this.statTime);
         String weekCd = ITS.getDayWeekCd(ITS.getDayWeek(statDt));
 
@@ -56,13 +56,13 @@ public class TrafPrcsDDController implements AbstractTrafPrcsController {
         voStat.setDAY_TYPE_CD(weekCd);
 
         AppRepository.getInstance().startJob(TrafJobType.STAT_LINK_DD);
-        this.dbmsDataProcess.add(new DbmsData(DbmsDataType.TB_LINK_STAT_MN_CREATE, false, voStat, 1));
+        this.dbmsDataProcess.add(new DbmsData(DbmsDataType.TB_LINK_STAT_DD_CREATE, false, voStat, 1));
 
         AppRepository.getInstance().startJob(TrafJobType.STAT_IFSC_DD);
-        this.dbmsDataProcess.add(new DbmsData(DbmsDataType.TB_IFSC_STAT_MN_CREATE, false, voStat, 1));
+        this.dbmsDataProcess.add(new DbmsData(DbmsDataType.TB_IFSC_STAT_DD_CREATE, false, voStat, 1));
 
         AppRepository.getInstance().startJob(TrafJobType.STAT_ROAD_DD);
-        this.dbmsDataProcess.add(new DbmsData(DbmsDataType.TB_ROAD_STAT_MN_CREATE, false, voStat, 1));
+        this.dbmsDataProcess.add(new DbmsData(DbmsDataType.TB_ROAD_STAT_DD_CREATE, false, voStat, 1));
 
         // 돌발 구간별 일 통계
         this.dbmsDataProcess.add(new DbmsData(DbmsDataType.TB_INCD_SECT_STAT_DD_CREATE, false, voStat, 1));

+ 1 - 1
src/main/java/com/its/traf/service/its/TbLinkService.java

@@ -194,7 +194,7 @@ public class TbLinkService extends AbstractDataService<Long, TbLinkDto> implemen
             for (LinkRawDataDto rawTraffic: rawTrafficResult.getLists()) {
                 TbLinkDto link = get(rawTraffic.getLinkId());
                 if (link == null) {
-                    log.warn("TbTbLinkService..........filtering: Not Found LINK: [{}], [{}]", rawTraffic.getLinkId(), rawTrafficResult.getCLCT_SYST_CD());
+                    log.warn("TbLinkService..........filtering: Not Found LINK: [{}], [{}]", rawTraffic.getLinkId(), rawTrafficResult.getCLCT_SYST_CD());
                     continue;
                 }
 

+ 20 - 10
src/main/resources/application-dev.yml

@@ -1,11 +1,17 @@
 spring:
   devtools:
     livereload:
-      enabled: true
+      enabled: false
   freemarker:
     cache: false
+#  main:
+#    lazy-initialization: true
   datasource:
     hikari:
+      connection-timeout: 30000
+      idle-timeout: 600000
+      max-lifetime: 1800000
+      maximum-pool-size: 10
       driver-class-name: oracle.jdbc.OracleDriver
       jdbc-url: jdbc:oracle:thin:@115.91.94.42:1522:HANTE19C
       username: ptatms
@@ -17,21 +23,22 @@ spring:
       idleTimeout: 30000
       connectTimeout: 10000
   jpa:
-#    ddl-auto: none
-    database-platform: org.hibernate.dialect.Oracle10gDialect
+    database-platform: org.hibernate.dialect.Oracle12cDialect
     open-in-view: false
     show-sql: false
     hibernate:
       ddl-auto: none
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
+#        dialect: org.hibernate.dialect.Oracle10gDialect
         default_batch_fetch_size: 1000
         format_sql: true
         use_sql_columns: true
         hbm2ddl.auto: validate
         implicit_naming_strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
         physical_naming_strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
+#        temp:
+#          use_jdbc_metadata_defaults: false
     output:
       ansi:
         enabled: always
@@ -49,15 +56,18 @@ spring:
       idleTimeout: 30000
       connectTimeout: 10000
   utis-jpa:
-#    ddl-auto: none
-    database-platform: org.hibernate.dialect.Oracle10gDialect
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
+    database-platform: org.hibernate.dialect.Oracle12cDialect
+    open-in-view: false
+    show-sql: false
+    hibernate:
+      ddl-auto: none
+#    properties:
+#      hibernate:
+#        dialect: org.hibernate.dialect.Oracle10gDialect
 
 logging:
   level:
-    org.hibernate.SQL: INFO
+    org.hibernate.SQL: DEBUG
     org:
       springframework:
         #security: DEBUG

+ 2 - 17
src/main/resources/application.yml

@@ -38,29 +38,14 @@ server:
     static-locations: file:src/main/resources/static/
 
 spring:
-  output:
-    ansi:
-      enabled: always
-
-  servlet:
-    context-path: /
-    session:
-      tracking-mode: cookie
-      timeout: 600
-#    multipart:
-#      enabled: true
-#      file-size-threshold: 2KB
-#      max-file-size: 200MB
-#      max-request-size: 215MB
-
+  application:
+    name: traf-prcs-server
   profiles:
     active: dev
   main:
     web-application-type: none
     log-startup-info: true
     banner-mode: off
-  application:
-    name: traf-prcs-server
   jackson:
     property-naming-strategy: LOWER_CASE
   datasource: