insert comm hist configuration setting

evps-comm-server/src/main/java/com/evps/comm/server/config/ApplicationConfig.java

@@ -25,6 +25,7 @@ public class ApplicationConfig extends NettyServerConfig {
     private double cpuLimits = 75;
     private int autoEndMinutes = 20;
     private int lastCommTimeoutSeconds = 60;
+    private boolean insertCommHist = false;
 
     private int maxConnection = 0;
     private int packetWorkers = 0;

evps-comm-server/src/main/java/com/evps/comm/server/process/dbms/DbmsDataProcess.java

@@ -1,5 +1,6 @@
 package com.evps.comm.server.process.dbms;
 
+import com.evps.comm.server.config.ApplicationConfig;
 import com.evps.comm.server.config.ThreadPoolInitializer;
 import com.evps.comm.server.dao.mapper.EvpsCenterMapper;
 import com.evps.comm.server.dao.mapper.EvpsServiceMapper;
@@ -30,6 +31,7 @@ public class DbmsDataProcess {
     private final LinkedBlockingQueue<DbmsData> dbmsDataBlockingQueue = new LinkedBlockingQueue<>(1000);
     private final ThreadPoolExecutor taskExecutor = (ThreadPoolExecutor) Executors.newFixedThreadPool(1);
 
+    private final ApplicationConfig config;
     private final DbmsDataAsyncTask asyncTask;
     private final ProcessMapper processMapper;
     private final EvpsServiceMapper serviceMapper;
@@ -88,8 +90,8 @@ public class DbmsDataProcess {
                         result = this.serviceMapper.insertEvpService(newService);
                     }
                     catch (Exception e) {
-                        log.error("[{}]. DBMS_DATA_INS_SERVICE: {}", center.getLogKey(), newService);
-                        log.error("[{}]. DBMS_DATA_INS_SERVICE: Exception: {}\r\n", center.getLogKey(), e.toString());
+                        log.error("[{}]. insertEvpService: {}", center.getLogKey(), newService);
+                        log.error("[{}]. insertEvpService: Exception: {}", center.getLogKey(), e.toString());
                     }
                     break;
                 case DbmsData.DBMS_DATA_UPD_SERVICE:
@@ -98,8 +100,8 @@ public class DbmsDataProcess {
                     try {
                         result = this.serviceMapper.updateEvpService(updService);
                     } catch (Exception e) {
-                        log.error("[{}]. DBMS_DATA_UPD_SERVICE: {}", center.getLogKey(), updService);
-                        log.error("[{}]. DBMS_DATA_UPD_SERVICE: Exception: {}\r\n", center.getLogKey(), e.toString());
+                        log.error("[{}]. updateEvpService: {}", center.getLogKey(), updService);
+                        log.error("[{}]. updateEvpService: Exception: {}", center.getLogKey(), e.toString());
                     }
                     break;
 
@@ -125,8 +127,8 @@ public class DbmsDataProcess {
                             result = this.serviceMapper.insertEvpEventCurr(event);
                         }
                         catch (Exception e) {
-                            log.error("[{}]. DBMS_DATA_INS_EVENT_CURR: {}", center.getLogKey(), event);
-                            log.error("[{}]. DBMS_DATA_INS_EVENT_CURR: Exception: {}\r\n", center.getLogKey(), e.toString());
+                            log.error("[{}]. insertEvpEventCurr: {}", center.getLogKey(), event);
+                            log.error("[{}]. insertEvpEventCurr: Exception: {}", center.getLogKey(), e.toString());
                         }
                     }
                     try {
@@ -134,8 +136,8 @@ public class DbmsDataProcess {
                         result = this.serviceMapper.insertEvpEvent(event);
                     }
                     catch (Exception e) {
-                        log.error("[{}]. DBMS_DATA_INS_EVENT: {}", center.getLogKey(), event);
-                        log.error("[{}]. DBMS_DATA_INS_EVENT: Exception: {}\r\n", center.getLogKey(), e.toString());
+                        log.error("[{}]. insertEvpEvent: {}", center.getLogKey(), event);
+                        log.error("[{}]. insertEvpEvent: Exception: {}", center.getLogKey(), e.toString());
                     }
                     break;
                 case DbmsData.DBMS_DATA_INS_ROUTE:
@@ -145,8 +147,8 @@ public class DbmsDataProcess {
                         result = this.evpCommServerDao.insertEvpRouteBatch(service);
                     }
                     catch (Exception e) {
-                        log.error("[{}]. DBMS_DATA_INS_ROUTE: {}", center.getLogKey(), service);
-                        log.error("[{}]. DBMS_DATA_INS_ROUTE: Exception: {}\r\n", center.getLogKey(), e.toString());
+                        log.error("[{}]. insertEvpRouteBatch: {}", center.getLogKey(), service);
+                        log.error("[{}]. insertEvpRouteBatch: Exception: {}", center.getLogKey(), e.toString());
                     }
                     break;
                 case DbmsData.DBMS_DATA_INS_NODE:
@@ -156,8 +158,8 @@ public class DbmsDataProcess {
                         result = this.evpCommServerDao.insertEvpNodeBatch(nodeDto);
                     }
                     catch (Exception e) {
-                        log.error("[{}]. DBMS_DATA_INS_NODE: {}", center.getLogKey(), nodeDto);
-                        log.error("[{}]. DBMS_DATA_INS_NODE: Exception: {}\r\n", center.getLogKey(), e.toString());
+                        log.error("[{}]. insertEvpNodeBatch: {}", center.getLogKey(), nodeDto);
+                        log.error("[{}]. insertEvpNodeBatch: Exception: {}", center.getLogKey(), e.toString());
                     }
                     break;
 
@@ -168,8 +170,8 @@ public class DbmsDataProcess {
                         result = this.evpCommServerDao.insertEvpPhaseBatch(phaseDto);
                     }
                     catch (Exception e) {
-                        log.error("[{}]. DBMS_DATA_INS_PHASE: {}", center.getLogKey(), phaseDto);
-                        log.error("[{}]. DBMS_DATA_INS_PHASE: Exception: {}\r\n", center.getLogKey(), e.toString());
+                        log.error("[{}]. insertEvpPhaseBatch: {}", center.getLogKey(), phaseDto);
+                        log.error("[{}]. insertEvpPhaseBatch: Exception: {}", center.getLogKey(), e.toString());
                     }
                     break;
 
@@ -180,15 +182,15 @@ public class DbmsDataProcess {
                         result = this.evpCommServerDao.insertEvpSignalCurrBatch(signalDto);
                     }
                     catch (Exception e) {
-                        log.error("[{}]. insertEvpSignalCurr: {}", center.getLogKey(), signalDto);
-                        log.error("[{}]. insertEvpSignalCurr: Exception: {}\r\n", center.getLogKey(), e.toString());
+                        log.error("[{}]. insertEvpSignalCurrBatch: {}", center.getLogKey(), signalDto);
+                        log.error("[{}]. insertEvpSignalCurrBatch: Exception: {}", center.getLogKey(), e.toString());
                     }
                     try {
                         result = this.evpCommServerDao.insertEvpSignalBatch(signalDto);
                     }
                     catch (Exception e) {
-                        log.error("[{}]. insertEvpSignal: {}", center.getLogKey(), signalDto);
-                        log.error("[{}]. insertEvpSignal: Exception: {}\r\n", center.getLogKey(), e.toString());
+                        log.error("[{}]. insertEvpSignalBatch: {}", center.getLogKey(), signalDto);
+                        log.error("[{}]. insertEvpSignalBatch: Exception: {}", center.getLogKey(), e.toString());
                     }
                     break;
 
@@ -210,7 +212,8 @@ public class DbmsDataProcess {
                             case TbRegionCenterComm.CENTER_COMM_LAST:
                                 typeDesc = "CENTER_COMM_LAST";
                                 result = this.evpsCenterMapper.updateCommLastComm(stts.getCenterId());
-                                if (stts.getOpCode() != eEvpsOpCode.EVPS_NET_PING.getValue()) {
+                                if (this.config.isInsertCommHist() && stts.getOpCode() != eEvpsOpCode.EVPS_NET_PING.getValue()) {
+                                    // 경상남도 센터의 무자비한 데이터로 인해 로깅 여부를 플래그로 처리하도록 함
                                     result = this.evpsCenterMapper.insertEvpCommHs(stts.getCenterId(), "0", stts.getOpCodeDesc());
                                 }
                                 break;
@@ -221,11 +224,11 @@ public class DbmsDataProcess {
                     }
                     catch (Exception e) {
                         log.error("[{}]. DBMS_DATA_CENTER_STTS: {}, {}", center.getLogKey(), typeDesc, stts);
-                        log.error("[{}]. DBMS_DATA_CENTER_STTS: Exception: {}\r\n", center.getLogKey(), e.toString());
+                        log.error("[{}]. DBMS_DATA_CENTER_STTS: Exception: {}", center.getLogKey(), e.toString());
                     }
                     break;
                 default:
-                    log.error("[{}]. DbmsJobProcess.process: Unknown Request {}.\r\n", center.getLogKey(), type);
+                    log.error("[{}]. DbmsJobProcess.process: Unknown Request {}.", center.getLogKey(), type);
                     break;
             }
             log.info("[{}]. DbmsDataProcess.run: Job: {}, {} EA. {}",

evps-comm-server/src/main/resources/application.yml

@@ -51,6 +51,7 @@ application:
   binding-port: 7800
   auto-end-minutes: 20
   last-comm-timeout-seconds: 60
+  insert-comm-hist: false
   backlog: 0
   worker-threads: 0
   rcv-buf: 0