dev

conf/ggits-etlp-server.pid

@@ -0,0 +1 @@
+5892

src/main/java/com/ggits/etlp/server/GgitsEtlpServerApplication.java

@@ -24,7 +24,7 @@ import java.util.Date;
 @Slf4j
 @SpringBootApplication
 @EnableTransactionManagement
-@ComponentScan(basePackages = {"com.ggits.app.common", "com.ggits.etlp.server.config", "com.ggits.etlp.server"})
+@ComponentScan(basePackages = {"com.ggits.etlp.server.config", "com.ggits.etlp.server"})
 public class GgitsEtlpServerApplication implements CommandLineRunner, ApplicationListener<ContextClosedEvent>, InitializingBean, DisposableBean {
 
     private static final String APPLICATION_NAME = "ggits-etlp-server";

src/main/java/com/ggits/etlp/server/entity/ggits/TbScsTConIntWeek.java

@@ -38,8 +38,8 @@ public class TbScsTConIntWeek implements Serializable {
         HashMap<String, Object> param = new HashMap<>();
         param.put("REGION_CD",      regionCd);
         param.put("INT_NO",         this.intNo);
+        param.put("INT_PLAN_NO",    this.intWPlan);
         param.put("PLAN_DY",        this.weekNo+1);     // 계획 요일(1~7, 1:일요일,2:월요일...7:토요일)
-        param.put("INT_PLAN_DY",    this.intWPlan);
         return param;
     }
 }

src/main/java/com/ggits/etlp/server/service/GgitsEtlpService.java

@@ -65,29 +65,31 @@ public class GgitsEtlpService {
 
     public void run() {
         Elapsed elapsed = new Elapsed();
+        log.info("================================================================================================>");
         log.info("GGITS DBASE ETLP START.");
 
         initEtlp();
 
 //        //교차로구성_연계, SCS_T_CON_INTLC
-//        etlpIntLc();
+        etlpIntLc();
         //교차로이동류_연계, SCS_T_CON_INTFLOW
         etlpIntFlow();
         //교차로일계획_연계, SCS_T_CON_INTDPLAN
-//        etlpIntDPlan();
+        etlpIntDPlan();
 //        //교차로주간계획_연계, SCS_T_CON_INTWEEK
-//        etlpIntWeek();
+        etlpIntWeek();
 //        //교차로예약계획_연계, SCS_T_CON_INTFPLAN
-//        etlpIntFPlan();
+        etlpIntFPlan();
 //        //교차로시그널맵_연계, SCS_T_CON_INTSIGMAP
-//        etlpIntSigmap();
+        etlpIntSigmap();
         log.info("GGITS DBASE ETLP ..END: {}", elapsed.elapsedTimeStr());
+        log.info("<================================================================================================");
     }
 
     //교차로구성_연계, SCS_T_CON_INTLC
     private void etlpIntLc() {
         Elapsed elapsed = new Elapsed();
-        log.info("교차로구성_연계, SCS_T_CON_INTLC START.");
+        log.info("TB_INT, SCS_T_CON_INTLC START.");
         List<HashMap<String, Object>> lists = new ArrayList<>();
 
         for (String key : this.centerList) {
@@ -102,7 +104,8 @@ public class GgitsEtlpService {
             etlp.setStartTime(TimeUtils.now());
             try {
                 MDC.put("id", center.getLogKey());
-                log.info("교차로구성_연계, START. {}, {}, {}, {}",
+                log.info("================================================================================================>");
+                log.info("TB_INT, SCS_T_CON_INTLC START. {}, {}, {}, {}",
                         center.getRegionCd(), center.getRegionNm(), center.getMinNodeId(), center.getMaxNodeId());
 
                 this.sigMapper.initTbInt(center.getRegionCd());
@@ -114,7 +117,7 @@ public class GgitsEtlpService {
 
                 List<TbScsTConIntLc> jobLists = this.gitsMapper.selectScsTConIntLc(center);
 
-                log.info("교차로구성_연계, START. {}, {}, SIG: {} EA, GGITS: {} EA.",
+                log.info("TB_INT, SCS_T_CON_INTLC START. {}, {}, SIG: {} EA, GGITS: {} EA.",
                         center.getRegionCd(), center.getRegionNm(), intLists.size(), jobLists.size());
 
                 center.getEtlpIntLc().setReadCount(jobLists.size());
@@ -143,12 +146,13 @@ public class GgitsEtlpService {
                 }
                 etlp.setWriteCount(writeCount);
                 etlp.setSuccess(true);
-                log.info("교차로구성_연계, ..END. {}, {}, {} EA. {} ms.",
-                        center.getRegionCd(), center.getRegionNm(), jobLists.size(), job.milliSeconds());
+                log.info("TB_INT, SCS_T_CON_INTLC ..END. {}, {}, JOB: {}, WRITE: {} EA. {} ms.",
+                        center.getRegionCd(), center.getRegionNm(), jobLists.size(), writeCount, job.milliSeconds());
             }
             catch (Exception e) {
                 etlp.setSuccess(false);
-                log.error("교차로구성_연계, Exception: {}, {}, {}", center.getRegionCd(), center.getRegionNm(), e.getMessage());
+                log.error("{}", lists.get(0));
+                log.error("TB_INT, SCS_T_CON_INTLC: {}, {}, Exceptions: {}", center.getRegionCd(), center.getRegionNm(), e.getMessage());
             }
             finally {
                 center.setElapsed(center.getElapsed() + job.milliSeconds());
@@ -156,13 +160,13 @@ public class GgitsEtlpService {
                 MDC.clear();
             }
         }
-        log.info("교차로구성_연계, SCS_T_CON_INTLC ..END: {}", elapsed.elapsedTimeStr());
+        log.info("TB_INT, SCS_T_CON_INTLC ..END: {}", elapsed.elapsedTimeStr());
     }
 
     //교차로이동류_연계, SCS_T_CON_INTFLOW
     private void etlpIntFlow() {
         Elapsed elapsed = new Elapsed();
-        log.info("교차로이동류_연계, SCS_T_CON_INTFLOW START.");
+        log.info("TB_INT_FLOW, SCS_T_CON_INTFLOW START.");
         List<HashMap<String, Object>> lists = new ArrayList<>();
 
         for (String key : this.centerList) {
@@ -177,7 +181,7 @@ public class GgitsEtlpService {
             etlp.setStartTime(TimeUtils.now());
             try {
                 MDC.put("id", center.getLogKey());
-                log.info("교차로이동류_연계, SCS_T_CON_INTFLOW START. {}, {}, {}, {}",
+                log.info("TB_INT_FLOW, SCS_T_CON_INTFLOW START. {}, {}, {}, {}",
                         center.getRegionCd(), center.getRegionNm(), center.getMinNodeId(), center.getMaxNodeId());
                 List<TbScsTConIntFlow> result = this.gitsMapper.selectScsTConIntFlow(center);
                 etlp.setReadCount(result.size());
@@ -186,7 +190,6 @@ public class GgitsEtlpService {
                 for(TbScsTConIntFlow obj: result) {
                     HashMap<String, Object> param = obj.toSig(center.getRegionCd());
                     lists.add(param);
-                    log.info("{}", param);
                     if (lists.size() >= BatchDaoService.MAX_BATCH_SIZE) {
                         writeCount += this.dao.updateTbIntFlow(lists);
                         lists = new ArrayList<>();
@@ -197,12 +200,13 @@ public class GgitsEtlpService {
                 }
                 etlp.setWriteCount(writeCount);
                 etlp.setSuccess(true);
-                log.info("교차로이동류_연계, SCS_T_CON_INTFLOW ..END. {}, {}, {} EA. {} ms.",
-                        center.getRegionCd(), center.getRegionNm(), result.size(), job.milliSeconds());
+                log.info("TB_INT_FLOW, SCS_T_CON_INTFLOW ..END. {}, {}, JOB: {}, WRITE: {} EA. {} ms.",
+                        center.getRegionCd(), center.getRegionNm(), result.size(), writeCount, job.milliSeconds());
             }
             catch (Exception e) {
                 etlp.setSuccess(false);
-                log.error("교차로이동류_연계, SCS_T_CON_INTFLOW: {}, {}, Exceptions: {}", center.getRegionCd(), center.getRegionNm(), e.getMessage());
+                log.error("{}", lists.get(0));
+                log.error("TB_INT_FLOW, SCS_T_CON_INTFLOW: {}, {}, Exceptions: {}", center.getRegionCd(), center.getRegionNm(), e.getMessage());
             }
             finally {
                 center.setElapsed(center.getElapsed() + job.milliSeconds());
@@ -210,12 +214,12 @@ public class GgitsEtlpService {
                 MDC.clear();
             }
         }
-        log.info("교차로이동류_연계, SCS_T_CON_INTFLOW ..END: {}", elapsed.elapsedTimeStr());
+        log.info("TB_INT_FLOW, SCS_T_CON_INTFLOW ..END: {}", elapsed.elapsedTimeStr());
     }
     //교차로일계획_연계, SCS_T_CON_INTDPLAN
     private void etlpIntDPlan() {
         Elapsed elapsed = new Elapsed();
-        log.info("교차로일계획_연계, SCS_T_CON_INTDPLAN START.");
+        log.info("TB_INT_OPER_PLAN, SCS_T_CON_INTDPLAN START.");
         List<HashMap<String, Object>> lists = new ArrayList<>();
 
         for (String key : this.centerList) {
@@ -230,7 +234,7 @@ public class GgitsEtlpService {
             etlp.setStartTime(TimeUtils.now());
             try {
                 MDC.put("id", center.getLogKey());
-                log.info("교차로일계획_연계, SCS_T_CON_INTDPLAN START. {}, {}, {}, {}",
+                log.info("TB_INT_OPER_PLAN, SCS_T_CON_INTDPLAN START. {}, {}, {}, {}",
                         center.getRegionCd(), center.getRegionNm(), center.getMinNodeId(), center.getMaxNodeId());
                 List<TbScsTConIntDPlan> result = this.gitsMapper.selectScsTConIntDPlan(center);
                 etlp.setReadCount(result.size());
@@ -249,12 +253,13 @@ public class GgitsEtlpService {
                 }
                 etlp.setWriteCount(writeCount);
                 etlp.setSuccess(true);
-                log.info("교차로일계획_연계, SCS_T_CON_INTDPLAN ..END. {}, {}, {} EA. {} ms.",
-                        center.getRegionCd(), center.getRegionNm(), result.size(), job.milliSeconds());
+                log.info("TB_INT_OPER_PLAN, SCS_T_CON_INTDPLAN ..END. {}, {}, JOB: {}, WRITE: {} EA. {} ms.",
+                        center.getRegionCd(), center.getRegionNm(), result.size(), writeCount, job.milliSeconds());
             }
             catch (Exception e) {
                 etlp.setSuccess(false);
-                log.error("교차로일계획_연계, SCS_T_CON_INTDPLAN: {}, {}, Exceptions: {}", center.getRegionCd(), center.getRegionNm(), e.getMessage());
+                log.error("{}", lists.get(0));
+                log.error("TB_INT_OPER_PLAN, SCS_T_CON_INTDPLAN: {}, {}, Exceptions: {}", center.getRegionCd(), center.getRegionNm(), e.getMessage());
             }
             finally {
                 center.setElapsed(center.getElapsed() + job.milliSeconds());
@@ -262,12 +267,12 @@ public class GgitsEtlpService {
                 MDC.clear();
             }
         }
-        log.info("교차로일계획_연계, SCS_T_CON_INTDPLAN ..END: {}", elapsed.elapsedTimeStr());
+        log.info("TB_INT_OPER_PLAN, SCS_T_CON_INTDPLAN ..END: {}", elapsed.elapsedTimeStr());
     }
     //교차로주간계획_연계, SCS_T_CON_INTWEEK
     private void etlpIntWeek() {
         Elapsed elapsed = new Elapsed();
-        log.info("교차로주간계획_연계, SCS_T_CON_INTWEEK START.");
+        log.info("TB_INT_DY_PLAN, SCS_T_CON_INTWEEK START.");
         List<HashMap<String, Object>> lists = new ArrayList<>();
 
         for (String key : this.centerList) {
@@ -282,7 +287,7 @@ public class GgitsEtlpService {
             etlp.setStartTime(TimeUtils.now());
             try {
                 MDC.put("id", center.getLogKey());
-                log.info("교차로주간계획_연계, SCS_T_CON_INTWEEK START. {}, {}, {}, {}",
+                log.info("TB_INT_DY_PLAN, SCS_T_CON_INTWEEK START. {}, {}, {}, {}",
                         center.getRegionCd(), center.getRegionNm(), center.getMinNodeId(), center.getMaxNodeId());
                 List<TbScsTConIntWeek> result = this.gitsMapper.selectScsTConIntWeek(center);
                 etlp.setReadCount(result.size());
@@ -301,12 +306,13 @@ public class GgitsEtlpService {
                 }
                 etlp.setWriteCount(writeCount);
                 etlp.setSuccess(true);
-                log.info("교차로주간계획_연계, SCS_T_CON_INTWEEK ..END. {}, {}, {} EA. {} ms.",
-                        center.getRegionCd(), center.getRegionNm(), result.size(), job.milliSeconds());
+                log.info("TB_INT_DY_PLAN, SCS_T_CON_INTWEEK ..END. {}, {}, JOB: {}, WRITE: {} EA. {} ms.",
+                        center.getRegionCd(), center.getRegionNm(), result.size(), writeCount, job.milliSeconds());
             }
             catch (Exception e) {
                 etlp.setSuccess(false);
-                log.error("교차로주간계획_연계, SCS_T_CON_INTWEEK: {}, {}, Exceptions: {}", center.getRegionCd(), center.getRegionNm(), e.getMessage());
+                log.error("{}", lists.get(0));
+                log.error("TB_INT_DY_PLAN, SCS_T_CON_INTWEEK: {}, {}, Exceptions: {}", center.getRegionCd(), center.getRegionNm(), e.getMessage());
             }
             finally {
                 center.setElapsed(center.getElapsed() + job.milliSeconds());
@@ -314,12 +320,12 @@ public class GgitsEtlpService {
                 MDC.clear();
             }
         }
-        log.info("교차로주간계획_연계, SCS_T_CON_INTWEEK ..END: {}", elapsed.elapsedTimeStr());
+        log.info("TB_INT_DY_PLAN, SCS_T_CON_INTWEEK ..END: {}", elapsed.elapsedTimeStr());
     }
     //교차로예약계획_연계, SCS_T_CON_INTFPLAN
     private void etlpIntFPlan() {
         Elapsed elapsed = new Elapsed();
-        log.info("교차로예약계획_연계, SCS_T_CON_INTFPLAN START.");
+        log.info("TB_INT_RESRV_PLAN, SCS_T_CON_INTFPLAN START.");
         List<HashMap<String, Object>> lists = new ArrayList<>();
 
         for (String key : this.centerList) {
@@ -334,7 +340,7 @@ public class GgitsEtlpService {
             etlp.setStartTime(TimeUtils.now());
             try {
                 MDC.put("id", center.getLogKey());
-                log.info("교차로예약계획_연계, SCS_T_CON_INTFPLAN START. {}, {}, {}, {}",
+                log.info("TB_INT_RESRV_PLAN, SCS_T_CON_INTFPLAN START. {}, {}, {}, {}",
                         center.getRegionCd(), center.getRegionNm(), center.getMinNodeId(), center.getMaxNodeId());
                 List<TbScsTConIntFPlan> result = this.gitsMapper.selectScsTConIntFPlan(center);
                 etlp.setReadCount(result.size());
@@ -353,12 +359,13 @@ public class GgitsEtlpService {
                 }
                 etlp.setWriteCount(writeCount);
                 etlp.setSuccess(true);
-                log.info("교차로예약계획_연계, SCS_T_CON_INTFPLAN ..END. {}, {}, {} EA. {} ms.",
-                        center.getRegionCd(), center.getRegionNm(), result.size(), job.milliSeconds());
+                log.info("TB_INT_RESRV_PLAN, SCS_T_CON_INTFPLAN ..END. {}, {}, JOB: {}, WRITE: {} EA. {} ms.",
+                        center.getRegionCd(), center.getRegionNm(), result.size(), writeCount, job.milliSeconds());
             }
             catch (Exception e) {
                 etlp.setSuccess(false);
-                log.error("교차로예약계획_연계, SCS_T_CON_INTFPLAN: {}, {}, Exceptions: {}", center.getRegionCd(), center.getRegionNm(), e.getMessage());
+                log.error("{}", lists.get(0));
+                log.error("TB_INT_RESRV_PLAN, SCS_T_CON_INTFPLAN: {}, {}, Exceptions: {}", center.getRegionCd(), center.getRegionNm(), e.getMessage());
             }
             finally {
                 center.setElapsed(center.getElapsed() + job.milliSeconds());
@@ -366,12 +373,12 @@ public class GgitsEtlpService {
                 MDC.clear();
             }
         }
-        log.info("교차로예약계획_연계, SCS_T_CON_INTFPLAN ..END: {}", elapsed.elapsedTimeStr());
+        log.info("TB_INT_RESRV_PLAN, SCS_T_CON_INTFPLAN ..END: {}", elapsed.elapsedTimeStr());
     }
     //교차로시그널맵_연계, SCS_T_CON_INTSIGMAP
     private void etlpIntSigmap() {
         Elapsed elapsed = new Elapsed();
-        log.info("교차로시그널맵_연계, SCS_T_CON_INTSIGMAP START.");
+        log.info("TB_INT_SIGNALMAP, SCS_T_CON_INTSIGMAP START.");
         List<HashMap<String, Object>> lists = new ArrayList<>();
 
         for (String key : this.centerList) {
@@ -386,7 +393,7 @@ public class GgitsEtlpService {
             etlp.setStartTime(TimeUtils.now());
             try {
                 MDC.put("id", center.getLogKey());
-                log.info("교차로시그널맵_연계, SCS_T_CON_INTSIGMAP START. {}, {}, {}, {}",
+                log.info("TB_INT_SIGNALMAP, SCS_T_CON_INTSIGMAP START. {}, {}, {}, {}",
                         center.getRegionCd(), center.getRegionNm(), center.getMinNodeId(), center.getMaxNodeId());
                 List<TbScsTConIntSigmap> result = this.gitsMapper.selectScsTConIntSigmap(center);
                 etlp.setReadCount(result.size());
@@ -405,12 +412,14 @@ public class GgitsEtlpService {
                 }
                 etlp.setWriteCount(writeCount);
                 etlp.setSuccess(true);
-                log.info("교차로시그널맵_연계, SCS_T_CON_INTSIGMAP ..END. {}, {}, {} EA. {} ms.",
-                        center.getRegionCd(), center.getRegionNm(), result.size(), job.milliSeconds());
+                log.info("TB_INT_SIGNALMAP, SCS_T_CON_INTSIGMAP ..END. {}, {}, JOB: {}, WRITE: {} EA. {} ms.",
+                        center.getRegionCd(), center.getRegionNm(), result.size(), writeCount, job.milliSeconds());
+                log.info("<================================================================================================");
             }
             catch (Exception e) {
                 etlp.setSuccess(false);
-                log.error("교차로시그널맵_연계, SCS_T_CON_INTSIGMAP: {}, {}, Exceptions: {}", center.getRegionCd(), center.getRegionNm(), e.getMessage());
+                log.error("{}", lists.get(0));
+                log.error("TB_INT_SIGNALMAP, SCS_T_CON_INTSIGMAP: {}, {}, Exceptions: {}", center.getRegionCd(), center.getRegionNm(), e.getMessage());
             }
             finally {
                 center.setElapsed(center.getElapsed() + job.milliSeconds());
@@ -418,6 +427,6 @@ public class GgitsEtlpService {
                 MDC.clear();
             }
         }
-        log.info("교차로시그널맵_연계, SCS_T_CON_INTSIGMAP ..END: {}", elapsed.elapsedTimeStr());
+        log.info("TB_INT_SIGNALMAP, SCS_T_CON_INTSIGMAP ..END: {}", elapsed.elapsedTimeStr());
     }
 }

src/main/resources/logback-spring-appender.xml

@@ -14,14 +14,14 @@
         </discriminator>
         <sift>
             <appender name="FILE-${id}" class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>${LOG_PATH}packet/${id}.log</file>
+                <file>${LOG_PATH}etlp/${id}.log</file>
                 <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
                     <charset>${LOG_CHARSET}</charset>
                     <Pattern>${LOG_PATTERN_PACKET}</Pattern>
                 </encoder>
 
                 <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-                    <FileNamePattern>${LOG_BACKUP_PATH}packet/${id}.${LOG_FILE_NAME_PATTERN}</FileNamePattern>
+                    <FileNamePattern>${LOG_BACKUP_PATH}etlp/${id}.${LOG_FILE_NAME_PATTERN}</FileNamePattern>
                     <maxFileSize>${MAX_FILESIZE}</maxFileSize>
                     <maxHistory>${MAX_HISTORY}</maxHistory>
                 </rollingPolicy>
@@ -60,32 +60,6 @@
         </rollingPolicy>
     </appender>
 
-    <appender name="FILE_SESSION" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_PATH}${LOG_FILE_NAME_SESSION}</file>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <charset>${LOG_CHARSET}</charset>
-            <pattern>${LOG_PATTERN_FILE}</pattern>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_SESSION}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
-            <maxFileSize>${MAX_FILESIZE}</maxFileSize>
-            <maxHistory>${MAX_HISTORY}</maxHistory>
-        </rollingPolicy>
-    </appender>
-
-    <appender name="FILE_STATISTICS" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_PATH}${LOG_FILE_NAME_STATISTICS}</file>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <charset>${LOG_CHARSET}</charset>
-            <pattern>${LOG_PATTERN_STATISTICS}</pattern>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_STATISTICS}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
-            <maxFileSize>${MAX_FILESIZE}</maxFileSize>
-            <maxHistory>${MAX_HISTORY}</maxHistory>
-        </rollingPolicy>
-    </appender>
-
     <appender name="FILE_SCHEDULE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${LOG_PATH}${LOG_FILE_NAME_SCHEDULE}</file>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">

src/main/resources/logback-spring.xml

@@ -3,8 +3,8 @@
     <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
 
     <property name="APP_CLASS_PATH"  value="com.ggits.etlp.server"/>
-    <property name="PROJECT_PREFIX"  value="ggits"/>
-    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}-etlp-server"/>
+    <property name="PROJECT_PREFIX"  value="ggits-etlp"/>
+    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}-server"/>
     <property name="ROOT_LOG_LEVEL"  value="INFO"/>
     <property name="LOG_CHARSET"     value="UTF-8" />
     <property name="LOG_PATH"        value="${user.home}/logs/${PROJECT_NAME}/"/>
@@ -13,22 +13,17 @@
     <property name="LOG_FILE_NAME"             value="${PROJECT_NAME}.log"/>
     <property name="LOG_FILE_NAME_ERROR"       value="${PROJECT_NAME}.err.log"/>
     <property name="LOG_FILE_NAME_PATTERN"     value="%d{yyyyMMdd}_%i.log.gz"/>
-    <property name="LOG_FILE_NAME_PACKET"      value="${PROJECT_PREFIX}-packet"/>
-    <property name="LOG_FILE_NAME_SESSION"     value="${PROJECT_PREFIX}-session.log"/>
+    <property name="LOG_FILE_NAME_PACKET"      value="${PROJECT_PREFIX}-service"/>
     <property name="LOG_FILE_NAME_SQL"         value="${PROJECT_PREFIX}-sql.log"/>
     <property name="LOG_FILE_NAME_SCHEDULE"    value="${PROJECT_PREFIX}-schedule.log"/>
-    <property name="LOG_FILE_NAME_STATISTICS"  value="${PROJECT_PREFIX}-statistics.log"/>
 
     <property name="MAX_FILESIZE" value="10MB"/>
     <property name="MAX_HISTORY"  value="10"/>
     <property name="LOG_PATTERN_FILE"        value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_ERROR"       value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%30t] [%5level] %42logger{35}.%-20M ${PID:-} %n%msg%n"/>
     <property name="LOG_PATTERN_PACKET"      value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
-    <property name="LOG_PATTERN_SESSION"     value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_SQL"         value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_SCHEDULE"    value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
-    <property name="LOG_PATTERN_STATISTICS"  value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
-<!--    <property name="LOG_PATTERN_CONSOLE"     value="[%d{HH:mm:ss.SSS}] %highlight([%5level]) %highlight(${PID:-}): %cyan(%msg) %n"/>-->
     <property name="LOG_PATTERN_CONSOLE"     value="[%d{HH:mm:ss.SSS}] [%5level] %msg %n"/>
 
     <springProfile name="!xxx">
@@ -41,19 +36,10 @@
         <appender-ref ref="FILE_ERROR"/>
     </root>
 
-    <logger name="${APP_CLASS_PATH}.udp" level="INFO" additivity="false">
-        <appender-ref ref="FILE_PACKET"/>
-        <appender-ref ref="FILE_ERROR"/>
-    </logger>
-
-    <logger name="${APP_CLASS_PATH}.udp" level="INFO" additivity="true">
-        <appender-ref ref="FILE_SESSION"/>
-        <appender-ref ref="FILE_ERROR"/>
-    </logger>
-
     <logger name="${APP_CLASS_PATH}.service" level="INFO" additivity="false">
         <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="FILE_STATISTICS"/>
+        <appender-ref ref="FILE_PACKET"/>
+        <appender-ref ref="FILE_LOG"/>
         <appender-ref ref="FILE_ERROR"/>
     </logger>
 

src/main/resources/mybatis/mapper/ggits/ggtisMapper.xml

@@ -98,7 +98,7 @@
                A.int_rsrvwkd          as intRsrvWkd,
                A.int_cntlstarthour    as intCntlStartHour,
                A.int_cntlstartmin     as intCntlStartMin,
-               A.int_cntlendhour      as intCntlEndHout,
+               A.int_cntlendhour      as intCntlEndHour,
                A.int_cntlendmin       as intCntlEndMin,
                A.int_cntltype         as intCntlType,
                A.int_cntlspcno        as intCntlSpcNo

src/main/resources/mybatis/mapper/sig/SigMapper.xml

@@ -287,27 +287,27 @@
             USING (SELECT
                        #{REGION_CD}     AS REGION_CD,
                        #{INT_NO}        AS INT_NO,
+                       #{INT_PLAN_NO}   AS INT_PLAN_NO,
                        #{PLAN_DY}       AS PLAN_DY,
-                       #{INT_PLAN_DY}   AS INT_PLAN_DY,
                        SYSDATE          AS COLLCT_DTIME
                    FROM DUAL) M
             ON (L.REGION_CD = M.REGION_CD AND L.INT_NO = M.INT_NO AND L.PLAN_DY = M.PLAN_DY)
             WHEN MATCHED THEN
                 UPDATE SET
-                    L.INT_PLAN_DY   = M.INT_PLAN_DY,
+                    L.INT_PLAN_NO   = M.INT_PLAN_NO,
                     L.COLLCT_DTIME  = M.COLLCT_DTIME
             WHEN NOT MATCHED THEN
                 INSERT (
                         REGION_CD,
                         INT_NO,
+                        INT_PLAN_NO,
                         PLAN_DY,
-                        INT_PLAN_DY,
                         COLLCT_DTIME )
                     VALUES (
                                M.REGION_CD,
                                M.INT_NO,
+                               M.INT_PLAN_NO,
                                M.PLAN_DY,
-                               M.INT_PLAN_DY,
                                M.COLLCT_DTIME )
         ]]>
     </update>