shjung пре 9 месеци
родитељ
комит
2d570a360e

+ 0 - 1
evps-comm-server/src/main/java/com/evps/comm/server/EvpsCommServerApplication.java

@@ -19,7 +19,6 @@ import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.event.ContextClosedEvent;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-import sun.misc.Signal;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

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

@@ -23,6 +23,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 
 @Slf4j
+@SuppressWarnings("unchecked")
 @RequiredArgsConstructor
 @Service
 public class DbmsDataProcess {
@@ -89,54 +90,95 @@ public class DbmsDataProcess {
                 case DbmsData.DBMS_DATA_INS_SERVICE:
                     typeDesc = "DBMS_DATA_INS_SERVICE";
                     KafkaEvpsServiceDto newService = (KafkaEvpsServiceDto)data.getData();
-                    log.info("{}, {}", typeDesc, newService);
-                    result = this.serviceMapper.insertEvpService(newService);
+                    try {
+                        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());
+                    }
                     break;
                 case DbmsData.DBMS_DATA_UPD_SERVICE:
                     typeDesc = "DBMS_DATA_UPD_SERVICE";
                     KafkaEvpsServiceDto updService = (KafkaEvpsServiceDto)data.getData();
-                    log.info("{}, {}", typeDesc, updService);
-                    result = this.serviceMapper.updateEvpService(updService);
+                    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());
+                    }
                     break;
 
                 case DbmsData.DBMS_DATA_INS_EVENT:
                     typeDesc = "DBMS_DATA_INS_EVENT";
                     KafkaEvpsEventDto event = (KafkaEvpsEventDto)data.getData();
-                    log.info("{}, {}", typeDesc, event);
-                    result = this.serviceMapper.insertEvpEvent(event);
+                    try {
+                        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());
+                    }
                     break;
                 case DbmsData.DBMS_DATA_INS_ROUTE:
                     typeDesc = "DBMS_DATA_INS_ROUTE";
                     List<HashMap<String, Object>> routeList = (List<HashMap<String, Object>>) data.getData();
-                    log.info("{}, {}", typeDesc, routeList);
-                    result = this.evpCommServerDao.insertEvpRoute(routeList);
+                    try {
+                        result = this.evpCommServerDao.insertEvpRoute(routeList);
+                    }
+                    catch (Exception e) {
+                        log.error("DBMS_DATA_INS_ROUTE: [{}]. {}", center.getLogKey(), routeList);
+                        log.error("DBMS_DATA_INS_ROUTE: [{}]. Exception: {}\r\n", center.getLogKey(), e.toString());
+                    }
                     break;
                 case DbmsData.DBMS_DATA_INS_NODE:
                     typeDesc = "DBMS_DATA_INS_NODE";
                     List<HashMap<String, Object>> nodeList = (List<HashMap<String, Object>>)data.getData();
-                    log.info("{}, {}", typeDesc, nodeList);
-                    result = this.evpCommServerDao.insertEvpNode(nodeList);
+                    try {
+                        result = this.evpCommServerDao.insertEvpNode(nodeList);
+                    }
+                    catch (Exception e) {
+                        log.error("DBMS_DATA_INS_NODE: [{}]. {}", center.getLogKey(), nodeList);
+                        log.error("DBMS_DATA_INS_NODE: [{}]. Exception: {}\r\n", center.getLogKey(), e.toString());
+                    }
                     break;
 
                 case DbmsData.DBMS_DATA_INS_PHASE:
                     typeDesc = "DBMS_DATA_INS_PHASE";
                     List<HashMap<String, Object>> phaseList = (List<HashMap<String, Object>>)data.getData();
-                    log.info("{}, {}", typeDesc, phaseList);
-                    result = this.evpCommServerDao.insertEvpPhase(phaseList);
+                    try {
+                        result = this.evpCommServerDao.insertEvpPhase(phaseList);
+                    }
+                    catch (Exception e) {
+                        log.error("DBMS_DATA_INS_PHASE: [{}]. {}", center.getLogKey(), phaseList);
+                        log.error("DBMS_DATA_INS_PHASE: [{}]. Exception: {}\r\n", center.getLogKey(), e.toString());
+                    }
                     break;
 
                 case DbmsData.DBMS_DATA_INS_SIGNAL:
                     typeDesc = "DBMS_DATA_INS_SIGNAL";
                     List<HashMap<String, Object>> signalList = (List<HashMap<String, Object>>)data.getData();
                     log.info("{}, {}", typeDesc, signalList);
-                    result = this.evpCommServerDao.insertEvpSignalCurr(signalList);
-                    result = this.evpCommServerDao.insertEvpSignal(signalList);
+                    try {
+                        result = this.evpCommServerDao.insertEvpSignalCurr(signalList);
+                    }
+                    catch (Exception e) {
+                        log.error("insertEvpSignalCurr: [{}]. {}", center.getLogKey(), signalList);
+                        log.error("insertEvpSignalCurr: [{}]. Exception: {}\r\n", center.getLogKey(), e.toString());
+                    }
+                    try {
+                        result = this.evpCommServerDao.insertEvpSignal(signalList);
+                    }
+                    catch (Exception e) {
+                        log.error("insertEvpSignal: [{}]. {}", center.getLogKey(), signalList);
+                        log.error("insertEvpSignal: [{}]. Exception: {}\r\n", center.getLogKey(), e.toString());
+                    }
                     break;
 
-
                 case DbmsData.DBMS_DATA_CENTER_STTS_UPDATE:
                     typeDesc = "DBMS_DATA_CENTER_STTS_UPDATE";
-                    TbRegionCenterComm updStts = (TbRegionCenterComm) data.getData();
+//                    TbRegionCenterComm updStts = (TbRegionCenterComm) data.getData();
 //                    log.info("{}, {}", typeDesc, updStts);
 //                    this.centerMapper.updateCommState(updStts);
                     break;
@@ -144,33 +186,37 @@ public class DbmsDataProcess {
                 case DbmsData.DBMS_DATA_CENTER_STTS:
                     typeDesc = "DBMS_DATA_CENTER_STTS";
                     TbRegionCenterComm stts = (TbRegionCenterComm) data.getData();
-                    //log.info("{}, {}", typeDesc, stts);
-                    switch(stts.getCommState()) {
-                        case TbRegionCenterComm.CENTER_COMM_START:
-                            typeDesc = "CENTER_COMM_START";
-                            result = this.evpsCenterMapper.updateCommStateConnect(stts.getCenterId());
-                            break;
-                        case TbRegionCenterComm.CENTER_COMM_STOP:
-                            typeDesc = "CENTER_COMM_STOP";
-                            result = this.evpsCenterMapper.updateCommStateDisconnect(stts.getCenterId());
-                            break;
-                        case TbRegionCenterComm.CENTER_COMM_LAST:
-                            typeDesc = "CENTER_COMM_LAST";
-                            result = this.evpsCenterMapper.updateCommLastComm(stts.getCenterId());
-                            break;
+                    try {
+                        switch (stts.getCommState()) {
+                            case TbRegionCenterComm.CENTER_COMM_START:
+                                typeDesc = "CENTER_COMM_START";
+                                result = this.evpsCenterMapper.updateCommStateConnect(stts.getCenterId());
+                                break;
+                            case TbRegionCenterComm.CENTER_COMM_STOP:
+                                typeDesc = "CENTER_COMM_STOP";
+                                result = this.evpsCenterMapper.updateCommStateDisconnect(stts.getCenterId());
+                                break;
+                            case TbRegionCenterComm.CENTER_COMM_LAST:
+                                typeDesc = "CENTER_COMM_LAST";
+                                result = this.evpsCenterMapper.updateCommLastComm(stts.getCenterId());
+                                break;
+                            default:
+                                typeDesc = "UNKNOWN DBMS_DATA_CENTER_STTS";
+                                break;
+                        }
+                    }
+                    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());
                     }
                     break;
                 default:
-                    log.error("DbmsJobProcess.process: Unknown Request {}.", type);
+                    log.error("DbmsJobProcess.process: Unknown Request {}.\r\n", type);
                     break;
             }
             log.info("DbmsDataProcess.run: [{}]. {}, {} EA. {}",
                     center.getLogKey(), typeDesc, result, Elapsed.elapsedTimeStr(elapsed1.nanoSeconds()));
         }
-        catch (Exception e) {
-            log.error("DbmsJobProcess.process: [{}]. {}, Exception: {}", center.getLogKey(), typeDesc, e.toString());
-            log.error("DbmsJobProcess.process: [{}]. {}, {}", center.getLogKey(), typeDesc, data.getData());
-        }
         finally {
             MDC.remove(center.getLogKey());
             MDC.clear();