Jelajahi Sumber

fist install server

shjung 3 minggu lalu
induk
melakukan
68c7444ff2

+ 3 - 12
.idea/workspace.xml

@@ -5,21 +5,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="137ea174-7fc0-49e0-a3b0-3deac854d820" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/utic-traf-server/src/main/java/com/utic/center/utic/traf/server/dao/mapper/utic/DwdbTrafficMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/utic-traf-server/src/main/java/com/utic/center/utic/traf/server/dao/repository/utic/DwdbTrafficRepository.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/utic-traf-server/src/main/java/com/utic/center/utic/traf/server/service/LinkTrafSaveDwdbService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/utic-traf-server/src/main/resources/mybatis/mapper/utic/DwdbTrafficMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/conf/stat/utic-stat-server.yml" beforeDir="false" afterPath="$PROJECT_DIR$/conf/stat/utic-stat-server.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/conf/traf/utic-traf-server.yml" beforeDir="false" afterPath="$PROJECT_DIR$/conf/traf/utic-traf-server.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/utic-ptis-server/src/main/resources/mybatis/mapper/ProcessStateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/utic-ptis-server/src/main/resources/mybatis/mapper/ProcessStateMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/utic-stat-server/src/main/java/com/utic/center/utic/stat/server/config/ApplicationConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/utic-stat-server/src/main/java/com/utic/center/utic/stat/server/config/ApplicationConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/utic-ptis-server/src/main/resources/mybatis/mapper/UticPtisServerMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/utic-ptis-server/src/main/resources/mybatis/mapper/UticPtisServerMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/utic-stat-server/src/main/java/com/utic/center/utic/stat/server/controller/UticStatServerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/utic-stat-server/src/main/java/com/utic/center/utic/stat/server/controller/UticStatServerController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/utic-stat-server/src/main/java/com/utic/center/utic/stat/server/service/UticStat04MinEtlpService.java" beforeDir="false" afterPath="$PROJECT_DIR$/utic-stat-server/src/main/java/com/utic/center/utic/stat/server/service/UticStat04MinEtlpService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/utic-stat-server/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/utic-stat-server/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/utic-traf-server/src/main/java/com/utic/center/utic/traf/server/config/ApplicationConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/utic-traf-server/src/main/java/com/utic/center/utic/traf/server/config/ApplicationConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/utic-traf-server/src/main/java/com/utic/center/utic/traf/server/controller/UticTrafServerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/utic-traf-server/src/main/java/com/utic/center/utic/traf/server/controller/UticTrafServerController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/utic-traf-server/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/utic-traf-server/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/utic-traf-server/src/main/resources/mybatis/mapper/utic/DwdbTrafficMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/utic-traf-server/src/main/resources/mybatis/mapper/utic/DwdbTrafficMapper.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -656,7 +647,7 @@
       <workItem from="1760242883220" duration="6897000" />
       <workItem from="1760327252176" duration="2139000" />
       <workItem from="1760337299130" duration="612000" />
-      <workItem from="1760406508566" duration="11609000" />
+      <workItem from="1760406508566" duration="15820000" />
     </task>
     <servers />
   </component>

+ 3 - 3
utic-ptis-server/src/main/resources/mybatis/mapper/ProcessStateMapper.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.utic.center.utic.ptis.server.dao.mapper.ProcessStateMapper">
 
-    <update id="updateProcessState" parameterType="com.utic.center.common.dto.ProcessStateDto" timeout="10">
+    <update id="updateProcessState" parameterType="com.utic.center.common.dto.ProcessStateDto" timeout="20">
         <![CDATA[
         UPDATE PROCESS_STATE@UTISDB
         SET
@@ -18,7 +18,7 @@
         ]]>
     </update>
 
-    <update id="updateProcessStateStart" parameterType="com.utic.center.common.dto.ProcessStateDto" timeout="10">
+    <update id="updateProcessStateStart" parameterType="com.utic.center.common.dto.ProcessStateDto" timeout="20">
         <![CDATA[
         UPDATE PROCESS_STATE@UTISDB
         SET
@@ -34,7 +34,7 @@
         ]]>
     </update>
 
-    <update id="updateProcessStateStop" parameterType="com.utic.center.common.dto.ProcessStateDto" timeout="10">
+    <update id="updateProcessStateStop" parameterType="com.utic.center.common.dto.ProcessStateDto" timeout="20">
         <![CDATA[
         UPDATE PROCESS_STATE@UTISDB
         SET

+ 6 - 6
utic-ptis-server/src/main/resources/mybatis/mapper/UticPtisServerMapper.xml

@@ -96,8 +96,8 @@
                ST.LINKID,
                ST.SPEED,
                ST.TRAVELTIME
-        FROM TRAFFIC_CENTER@UTIS ST,
-             LINK@UTIS           LK
+        FROM TRAFFIC_CENTER@UTISDB ST,
+             LINK@UTISDB           LK
         WHERE ST.LINKLEVEL = '1'
           AND ST.LINKID = LK.LINKID
           AND ST.MISSVALUEYN IN ('R', 'K', 'H', 'L', 'Y', 'O')
@@ -152,7 +152,7 @@
                MAX(TO_CHAR(ST.END_DATE,   'YYYYMMDDHH24MISS'))  AS END_TIME,
                TRIM(ST.INCIDENT_TITLE)                          AS EVT_DESC,
                TRIM(ST.INCIDENT_DESC)                           AS EVT_INFO
-        FROM UTISINCI.TB_IMS_DATA@UTISDB ST, UTIADMIN.LINK@UTISDB L
+        FROM UTISINCI.TB_IMS_DATA@UTISDB ST, LINK@UTISDB L
         WHERE ST.INCIDENT_TYPE_CD <> '1'
           AND ST.LINK_ID      =  L.LINKID
           AND L.LINKLEVEL     =  1
@@ -174,7 +174,7 @@
                MAX(TO_CHAR(ST.END_DATE,   'YYYYMMDDHH24MISS'))  AS END_TIME,
                TRIM(ST.INCIDENT_TITLE)                          AS EVT_DESC,
                TRIM(ST.INCIDENT_DESC)                           AS EVT_INFO
-        FROM UTISINCI.TB_IMS_DATA@UTISDB ST, UTIADMIN.LINK@UTISDB L
+        FROM UTISINCI.TB_IMS_DATA@UTISDB ST, LINK@UTISDB L
         WHERE ST.INCIDENT_TYPE_CD <> '1'
           AND ST.LINK_ID      =  L.LINKID
           AND L.LINKLEVEL     =  1
@@ -205,7 +205,7 @@
                '2'                                          AS UPDATE_TYPE,
                TO_CHAR(ST.LOCATION_DATA_X, '000.000000000000')||TO_CHAR(ST.LOCATION_DATA_Y, '00.0000000000000') AS STATUS_DESC,
                TO_CHAR(ST.START_DATE, 'YYYYMMDDHH24MISS')||TO_CHAR(ST.END_DATE, 'YYYYMMDDHH24MISS')             AS UPDATE_DESC
-        FROM UTISINCI.TB_IMS_DATA@UTISDB ST, UTIADMIN.LINK@UTISDB L
+        FROM UTISINCI.TB_IMS_DATA@UTISDB ST, LINK@UTISDB L
         WHERE INCIDENT_TYPE_CD IN ('1', '2', '3', '4')
           AND ST.LINK_ID      = L.LINKID
           AND L.LINKLEVEL     = 1
@@ -226,7 +226,7 @@
                '2'                                          AS UPDATE_TYPE,
                TO_CHAR(ST.LOCATION_DATA_X, '000.000000000000')||TO_CHAR(ST.LOCATION_DATA_Y, '00.0000000000000') AS STATUS_DESC,
                TO_CHAR(ST.START_DATE, 'YYYYMMDDHH24MISS')||TO_CHAR(ST.END_DATE, 'YYYYMMDDHH24MISS')             AS UPDATE_DESC
-        FROM UTISINCI.TB_IMS_DATA@UTISDB ST, UTIADMIN.LINK@UTISDB L
+        FROM UTISINCI.TB_IMS_DATA@UTISDB ST, LINK@UTISDB L
         WHERE INCIDENT_TYPE_CD IN ('1', '2', '3', '4')
           AND ST.LINK_ID      = L.LINKID
           AND L.LINKLEVEL     = 1

+ 8 - 1
utic-stat-server/src/main/java/com/utic/center/utic/stat/server/controller/UticStatServerController.java

@@ -2,6 +2,7 @@ package com.utic.center.utic.stat.server.controller;
 
 import com.utic.center.common.utils.LogUtils;
 import com.utic.center.common.utils.TimeUtils;
+import com.utic.center.utic.stat.server.config.ApplicationConfig;
 import com.utic.center.utic.stat.server.dto.BatchJobInfoDto;
 import com.utic.center.utic.stat.server.repository.ApplicationRepository;
 import com.utic.center.utic.stat.server.service.*;
@@ -16,6 +17,7 @@ import java.time.LocalDateTime;
 @RequiredArgsConstructor
 public class UticStatServerController {
 
+    private final ApplicationConfig config;
     private final UticStatPrepareService prepareService;
     private final UticStat04MinEtlpService etlp04MinService;
     private final UticStat05MinFltrService fltr05MinService;
@@ -91,7 +93,12 @@ public class UticStatServerController {
             tmpStart = System.currentTimeMillis();
             this.isRunning = true;
             // 중앙소통정보 이관
-            if (this.etlp04MinService.processingTrafficCenter()) {
+            if (this.config.isTrafficCenterHist()) {
+                if (this.etlp04MinService.processingTrafficCenter()) {
+                    this.trafElapsed = System.currentTimeMillis() - tmpStart;
+                }
+            }
+            else {
                 this.trafElapsed = System.currentTimeMillis() - tmpStart;
             }
             this.isRunning = false;

+ 5 - 12
utic-stat-server/src/main/java/com/utic/center/utic/stat/server/service/UticStat04MinEtlpService.java

@@ -4,7 +4,6 @@ import com.utic.center.common.annotation.ProcessingElapsed;
 import com.utic.center.common.service.AbstractProcessService;
 import com.utic.center.common.utils.LogUtils;
 import com.utic.center.common.utils.TimeUtils;
-import com.utic.center.utic.stat.server.config.ApplicationConfig;
 import com.utic.center.utic.stat.server.dao.repository.UticStat04MinEtlpRepository;
 import com.utic.center.utic.stat.server.dto.TrafficCenterDto;
 import com.utic.center.utic.stat.server.repository.ApplicationRepository;
@@ -21,7 +20,6 @@ import java.time.LocalDateTime;
 @Service
 public class UticStat04MinEtlpService implements AbstractProcessService {
 
-    private final ApplicationConfig config;
     private final UticStat04MinEtlpRepository etlpRepo;
 
     private String trafficMaxRegDate = "";
@@ -67,21 +65,16 @@ public class UticStat04MinEtlpService implements AbstractProcessService {
         if (trafficCenterDto.getDataCount() > 0 && !trafficCenterDto.getMaxRegDate().equals(this.trafficMaxRegDate)) {
             this.trafficMaxRegDate = trafficCenterDto.getMaxRegDate();
 
-            int result = 0;
-            final boolean isEtlp = this.config.isTrafficCenterHist();
             final long start = System.currentTimeMillis();
             final String yyMm = this.trafficMaxRegDate.substring(2, 6);
-            if (isEtlp) {
-                // 중앙교통정보를 직접 이관하는 경우에만....
-                result = this.etlpRepo.insertTrafficCenterHist(yyMm);
-                if (result < 0) {
-                    ApplicationRepository.processState.setError("insertTrafficCenterHist failed.");
-                }
+            final int result = this.etlpRepo.insertTrafficCenterHist(yyMm);
+            if (result < 0) {
+                ApplicationRepository.processState.setError("insertTrafficCenterHist failed.");
             }
             ApplicationRepository.processState.setEtcCnt(result);
-            log.info("[INF] {}: {}, isEtlp[{}]",
+            log.info("[INF] {}: {}",
                     LogUtils.elapsedLog("TRAFFIC_CENTER_" + yyMm, result, System.currentTimeMillis()-start),
-                    this.trafficMaxRegDate, isEtlp);
+                    this.trafficMaxRegDate);
             return true;
         }
         return false;

+ 1 - 1
utic-traf-server/src/main/resources/mybatis/mapper/utic/DwdbTrafficMapper.xml

@@ -5,7 +5,7 @@
 
     <insert id="insertTrafficCenterHist" timeout="60">
         <![CDATA[
-        INSERT /*+ APPEND PARALLEL(TRAFFIC_CENTER_${yyMm}, 2) */ INTO TRAFFIC_CENTER_${yyMm}@DWDBNOLOGGING (
+        INSERT /*+ APPEND PARALLEL(TRAFFIC_CENTER_${yyMm}, 2) */ INTO TRAFFIC_CENTER_${yyMm}@DWDB NOLOGGING (
                         regdate        ,
                         linkid         ,
                         missvalueyn    ,