From e70dfa4d8068d0ffba5bc88acedf71b3b353f60f Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期五, 23 二月 2024 15:48:42 +0800
Subject: [PATCH] 修复bug

---
 iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java b/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java
index 980b252..435846e 100644
--- a/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java
+++ b/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java
@@ -80,11 +80,11 @@
 	        		m_Association = m_ClientSap.associate(InetAddress.getByName(param.target_ip), param.target_port, null, null);
 	        		
 	        	} catch (Exception e) {
-	        		logger.error("BTS_IEC61850_Client Unable to connect to device IP:" + param.target_ip);
 	        		logger.error(e.toString(), e);
 	        		m_App_IsConnect = false;
 	        		param.setFail_reasion(IEDScout_Param.FAILREASION_PARAMERROR);
 	            	param.setConn_st(IEDScout_Param.CONN_STATE_FAIL);
+	            	logger.info("BTS_IEC61850_Client Unable to connect to device IP:" + param.target_ip);
 	        		break;
 	        	}        	
 	        	logger.info("Start Load ICD File '" + param.target_icd + "'");
@@ -92,6 +92,7 @@
 	        	if(!file.exists()) {
 	        		param.setFail_reasion(IEDScout_Param.FAILREASION_FILENOTFOUND);
 	            	param.setConn_st(IEDScout_Param.CONN_STATE_FAIL);
+	            	logger.info("ICD File '" + param.target_icd + "' Not EXISTS ");
 	        		break;
 	        	}
 	        	
@@ -104,7 +105,7 @@
 	            	param.setFail_reasion(IEDScout_Param.FAILREASION_FILEERROR);
 	            	param.setConn_st(IEDScout_Param.CONN_STATE_FAIL);
 	            	
-	            	logger.error("Error Parsing ICD File: " + e1.getMessage());
+	            	logger.info("Error Parsing ICD File: " + e1.getMessage());
 	            	break;
 	            }
 	            logger.info("Successfully Read Model ");
@@ -131,7 +132,6 @@
 	            if(m_App_IsConnect) {
 	            	new Thread(mySQL_Task).start();
 	            	is_clear_data = true;
-	            	param.setConn_st(IEDScout_Param.CONN_STATE_SUCCESS);
 	            }
 	            BTS61850_IEDScout_Task_Thread_SQL.updateConnect_Inf_Table(pool, param);	            	
 	        	while(m_App_IsConnect) {
@@ -171,9 +171,12 @@
         									}
         									data.setNode_name(zh_name);
         								}
-        								
         								data.setNode_path(modelNode.toString1());
         								data.setNode_value(getBasicDataAttributeData(modelNode));
+        								if(data.node_path.equals("ZJDYCPSS/btgGGIO1.AnIn1.mag.f")) {
+        									System.out.println(data.getNode_name()+getBasicDataAttributeData(modelNode));
+        								}
+        								BTS61850_IEDScout_Task_Thread_SQL.updateupdateIed_NodeState_Table(pool, data);
         							}        						
         						}
         						param.addCommNum();
@@ -181,7 +184,7 @@
         				}else {
         					param.addErrorNum();
         				}
-        				
+        				param.setConn_st(IEDScout_Param.CONN_STATE_SUCCESS);
         				BTS61850_IEDScout_Task_Thread_SQL.updateConnect_Inf_Table(pool, param);
         				
         				ds = null;        				
@@ -224,6 +227,10 @@
         }
 	}
 	
+	public void setAppIsConnect(boolean state) {
+		this.m_App_IsConnect = state;
+	}
+	
 	
 	public String readUnicodeStringNodeData(String reference, Fc fc) {
     	FcModelNode fcModelNode = (FcModelNode)m_ServerModel.findModelNode(reference, fc);

--
Gitblit v1.9.1