From f32b4c189595afd4aec7e6f991ac998a2b058c04 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期五, 06 九月 2024 14:01:38 +0800
Subject: [PATCH] V6.108 edit by lijun 	@  2024-09-06 	1.修复通信线程,MSQL抛出异常导致线程异常结束bug

---
 iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
index 6919bae..b341419 100644
--- a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
+++ b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
@@ -36,6 +36,7 @@
 import com.battdata_rt.BattData_RT;
 import com.battdata_rt.BattData_RT_Array;
 import com.dec.fbs9100.FBS9100_TestTime;
+import com.mysql.jdbc.exceptions.MySQLTimeoutException;
 
 /****************************************************************************************************/
 public class BTS_61850_SocketClient extends Thread {
@@ -246,6 +247,7 @@
 							FBS9100_Task_Thread_SQL.queryFBS9100SysParamBydev_id(m_ConnPool, m_StatAndParam); // 鏌ヨ绯荤粺鍙傛暟
 						
 							FBS9100_Task_Thread_SQL.queryDev6185AlmParamBydev_id(m_ConnPool, m_StatAndParam); // 鏌ヨ鍛婅鍙傛暟
+							
 						}
 					}
 					
@@ -520,11 +522,11 @@
 						break;
 					}
 					// ---------------------------------------------------------------------------------//
-				} catch (InterruptedException e) {
-					logger.error(e.toString(), e);
-					
+				} catch (Exception e) {
 					try {
+						logger.error("IP:" + FBSDeviceIp + " " + this.getName() + " - BTS_IEC61850_ClientThread Connect Break Now By " + e.toString(), e);
 						sleep(1000);
+						break;
 					} catch (InterruptedException e1) {
 						// TODO Auto-generated catch block
 						logger.error(e1.toString(), e1);
@@ -540,9 +542,9 @@
 			//m_ServerModel = null;
 		} catch (Exception e) {
 			logger.error(e.toString(), e);
+		} finally {
+			logger.error("IP:" + FBSDeviceIp + " " + this.getName() + " - BTS_IEC61850_ClientThread Connect Stopped ...");
 		}
-		
-		logger.debug("IP:" + FBSDeviceIp + " " + this.getName() + " - BTS_IEC61850_ClientThread Stopped ...");
 	}
 
 	// 绂荤嚎鍏绘姢璁″垝

--
Gitblit v1.9.1