From 17e4c7e3e7b3ef60d9da6de3b2a39a14a53c38a0 Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期三, 12 三月 2025 14:11:33 +0800
Subject: [PATCH] 1

---
 WIDESEAWCS_Server/WIDESEAWCS_Communicator/Inovance/InovanceTcpCommunicator.cs |  137 ++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 122 insertions(+), 15 deletions(-)

diff --git a/WIDESEAWCS_Server/WIDESEAWCS_Communicator/Inovance/InovanceTcpCommunicator.cs b/WIDESEAWCS_Server/WIDESEAWCS_Communicator/Inovance/InovanceTcpCommunicator.cs
index 9b37ae6..ca116fa 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_Communicator/Inovance/InovanceTcpCommunicator.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_Communicator/Inovance/InovanceTcpCommunicator.cs
@@ -39,11 +39,25 @@
         #endregion
 
         #region PublicMember
+        /// <summary>
+        /// 鏃ュ織璁板綍瀹炰緥瀵硅薄
+        /// </summary>
         public override ILogNet LogNet => _logNet;
 
+        /// <summary>
+        /// 璁惧鍚嶇О
+        /// </summary>
         public override string Name => _name;
 
+        /// <summary>  
+        /// 鑾峰彇褰撳墠閫氳鍣ㄦ槸鍚﹀凡杩炴帴鍒癙LC銆�  
+        /// </summary>
         public override bool IsConnected => _connected;
+
+        /// <summary>
+        /// 鏄惁鍦ㄥ啓鍏ユ暟鎹悗璇诲彇鏁版嵁纭銆�
+        /// </summary>
+        public override bool IsReadAfterWrite { get; set; } = true;
         #endregion
 
         #region Constructor Function
@@ -117,24 +131,31 @@
                 }
                 else
                 {
-                    object? obj = null;
-                    for (int i = 0; i < 5; i++)
+                    if (IsReadAfterWrite)
                     {
-                        T readValue = Read<T>(address);
-                        stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteAfterRead, readValue, value));
-                        obj = readValue;
-                        if (readValue.Equals(value))
+                        object? obj = null;
+                        for (int i = 0; i < 5; i++)
                         {
-                            stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteAndReadCheckSuccess, address, value, readValue));
-                            return true;
+                            T readValue = Read<T>(address);
+                            stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteAfterRead, readValue, value));
+                            obj = readValue;
+                            if (readValue.Equals(value))
+                            {
+                                stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteAndReadCheckSuccess, address, value, readValue));
+                                return true;
+                            }
+                            else if (i < 4)
+                            {
+                                Write(address, value);
+                            }
                         }
-                        else if (i < 4)
-                        {
-                            Write(address, value);
-                        }
+                        stringBuilder.AppendLine(string.Format(CommunicationExceptionMessage.WriteAndReadCheckFaild, address, value, obj));
+                        throw new CommunicationException(stringBuilder.ToString(), CommunicationErrorType.WriteFailed);
                     }
-                    stringBuilder.AppendLine(string.Format(CommunicationExceptionMessage.WriteAndReadCheckFaild, address, value, obj));
-                    throw new CommunicationException(stringBuilder.ToString(), CommunicationErrorType.WriteFailed);
+                    else
+                    {
+                        return true;
+                    }
                 }
             }
             catch (Exception ex)
@@ -316,6 +337,10 @@
         #endregion
 
         #region PublicMethod
+        /// <summary>  
+        /// 杩炴帴鍒癙LC銆�
+        /// </summary>  
+        /// <returns>濡傛灉杩炴帴鎴愬姛鍒欒繑鍥瀟rue锛屽惁鍒欒繑鍥瀎alse銆�</returns>  
         public override bool Connect()
         {
             try
@@ -340,6 +365,10 @@
             }
         }
 
+        /// <summary>  
+        /// 鏂紑涓庡伐涓氳澶囩殑杩炴帴銆�  
+        /// </summary>  
+        /// <returns>濡傛灉鎴愬姛鏂紑杩炴帴鍒欒繑鍥瀟rue锛屽鏋滃凡缁忔槸鏂紑鐘舵�佸垯杩斿洖false銆�</returns>  
         public override bool Disconnect()
         {
             try
@@ -362,6 +391,9 @@
             }
         }
 
+        /// <summary>
+        /// 閲婃斁瀵硅薄璧勬簮鐨勬帴鍙c��
+        /// </summary>
         public override void Dispose()
         {
             _isPing = false;
@@ -370,27 +402,59 @@
             GC.SuppressFinalize(this);
         }
 
+        /// <summary>  
+        /// 浠嶱LC璇诲彇鏁版嵁銆�  
+        /// </summary>  
+        /// <param name="address">婧愬湴鍧�锛屽叿浣撴牸寮忓彇鍐充簬浣跨敤鐨勫伐涓氬崗璁��</param>  
+        /// <param name="length">瑕佽鍙栫殑鏁版嵁闀垮害銆�</param>  
+        /// <returns>璇诲彇鍒扮殑鏁版嵁锛屽鏋滆鍙栧け璐ュ垯鍙兘杩斿洖null鎴栫┖鏁扮粍銆�</returns>  
         public override byte[] Read(string address, int length)
         {
             return (byte[])GetContent(plc.Read(address, (ushort)length), address);
         }
 
+        /// <summary>
+        /// 浠嶱LC璇诲彇鏁版嵁銆�
+        /// </summary>
+        /// <typeparam name="T">璇诲彇鏁版嵁鐨勭被鍨嬫硾鍨嬨��</typeparam>
+        /// <param name="address">婧愬湴鍧�锛屽叿浣撴牸寮忓彇鍐充簬浣跨敤鐨勫伐涓氬崗璁��</param>
+        /// <returns>璇诲彇鍒扮殑鏁版嵁锛屽鏋滆鍙栧け璐ュ垯鍙兘杩斿洖null鎴栨姏鍑哄紓甯搞��</returns>
         public override T Read<T>(string address)
         {
             Type type = typeof(T);
             return (T)Read(address, Type.GetTypeCode(type));
         }
+
+        /// <summary>
+        /// 浠嶱LC璇诲彇鏁版嵁銆�
+        /// </summary>
+        /// <typeparam name="T">璇诲彇鏁版嵁鐨勭被鍨嬫硾鍨嬨��</typeparam>
+        /// <param name="address">婧愬湴鍧�锛屽叿浣撴牸寮忓彇鍐充簬浣跨敤鐨勫伐涓氬崗璁��</param>
+        /// <param name="length">璇诲彇鐨勯暱搴︺��</param>
+        /// <returns></returns>
         public override T[] Read<T>(string address, ushort length)
         {
             Type type = typeof(T);
             return (T[])Read(address, Type.GetTypeCode(type), length);
         }
 
+        /// <summary>
+        /// 浠嶱LC璇诲彇鏁版嵁銆�
+        /// </summary>
+        /// <param name="address">婧愬湴鍧�锛屽叿浣撴牸寮忓彇鍐充簬浣跨敤鐨勫伐涓氬崗璁��</param>
+        /// <param name="dataType">鏁版嵁绫诲瀷銆�</param>
+        /// <returns>璇诲彇鍒扮殑鏁版嵁锛屽鏋滆鍙栧け璐ュ垯鍙兘杩斿洖null鎴栨姏鍑哄紓甯搞��</returns>
         public override object ReadAsObj(string address, string dataType)
         {
             return Read(address, SiemensDBDataType.GetTypeCode(dataType));
         }
 
+        /// <summary>
+        /// 璇诲彇鑷畾涔夌殑鏁版嵁绫诲瀷锛岄渶瑕佺户鎵胯嚜IDataTransfer鎺ュ彛锛岃繑鍥炰竴涓柊鐨勭被鍨嬬殑瀹炰緥瀵硅薄銆�
+        /// </summary>
+        /// <typeparam name="T">鑷畾涔夌殑鏁版嵁绫诲瀷娉涘瀷銆�</typeparam>
+        /// <param name="address">婧愬湴鍧�锛屽叿浣撴牸寮忓彇鍐充簬浣跨敤鐨勫伐涓氬崗璁��</param>
+        /// <returns>鎴愬姛杩斿洖鑷畾涔夌被鍨嬫暟鎹紝澶辫触鎶涘嚭寮傚父銆�</returns>
         public override T ReadCustomer<T>(string address)
         {
             throw new Exception("璇ユ柟娉曟殏涓嶅彲鐢�");
@@ -405,6 +469,15 @@
             //}
         }
 
+        /// <summary>
+        /// 绛夊緟鎸囧畾鍦板潃鐨勬硾鍨嬬被鍨嬪�间负鎸囧畾鐨勫��
+        /// </summary>
+        /// <typeparam name="T">鎸囧畾鐨勫�肩殑绫诲瀷娉涘瀷銆�</typeparam>
+        /// <param name="address">婧愬湴鍧�锛屽叿浣撴牸寮忓彇鍐充簬浣跨敤鐨勫伐涓氬崗璁��</param>
+        /// <param name="readInterval">璇诲彇鐨勯鐜囥��</param>
+        /// <param name="waitTimeout">绛夊緟鐨勮秴鏃舵椂闂达紝濡傛灉瓒呮椂鏃堕棿涓�-1鐨勮瘽锛屽垯鏄棤鏈熼檺绛夊緟銆�</param>
+        /// <param name="value">绛夊緟妫�娴嬬殑鍊�</param>
+        /// <returns>鏄惁绛夊緟鎴愬姛鐨勭粨鏋滃璞★紝涓�鏃﹂�氫俊澶辫触锛屾垨鏄瓑寰呰秴鏃跺氨杩斿洖澶辫触銆傚惁鍒欒繑鍥炴垚鍔燂紝骞跺憡鐭ヨ皟鐢ㄦ柟绛夊緟浜嗗涔呫��</returns>
         public override OperateResult<TimeSpan> Wait<T>(string address, int readInterval, int waitTimeout, T value)
         {
             TypeCode typeCode = Type.GetTypeCode(typeof(T));
@@ -441,6 +514,12 @@
             }
         }
 
+        /// <summary>  
+        /// 鍚慞LC鍐欏叆鏁版嵁銆�  
+        /// </summary>  
+        /// <param name="address">婧愬湴鍧�锛屽叿浣撴牸寮忓彇鍐充簬浣跨敤鐨勫伐涓氬崗璁��</param>  
+        /// <param name="data">瑕佸啓鍏ョ殑鏁版嵁銆�</param>  
+        /// <returns>濡傛灉鍐欏叆鎴愬姛鍒欒繑鍥瀟rue锛屽惁鍒欐姏鍑哄紓甯搞��</returns>  
         public override bool Write(string address, byte[] data)
         {
             try
@@ -463,17 +542,37 @@
             }
         }
 
+        /// <summary>
+        /// 鍚慞LC鍐欏叆鏁版嵁銆�  
+        /// </summary>
+        /// <typeparam name="T">鍐欏叆鏁版嵁鐨勭被鍨嬫硾鍨嬨��</typeparam>
+        /// <param name="address">婧愬湴鍧�锛屽叿浣撴牸寮忓彇鍐充簬浣跨敤鐨勫伐涓氬崗璁��</param>
+        /// <param name="value">瑕佸啓鍏ョ殑鏁版嵁銆�</param>
+        /// <returns>濡傛灉鍐欏叆鎴愬姛鍒欒繑鍥瀟rue锛屽惁鍒欐姏鍑哄紓甯搞��</returns>
         public override bool Write<T>(string address, T value)
         {
             return GetResult(Write(address, value), address, value);
         }
 
+        /// <summary>
+        /// 鍚慞LC鍐欏叆鏁版嵁銆�  
+        /// </summary>
+        /// <typeparam name="T">鍐欏叆鏁版嵁鐨勭被鍨嬫硾鍨嬨��</typeparam>
+        /// <param name="address">婧愬湴鍧�锛屽叿浣撴牸寮忓彇鍐充簬浣跨敤鐨勫伐涓氬崗璁��</param>
+        /// <param name="values">瑕佸啓鍏ョ殑鏁版嵁銆�</param>
+        /// <returns>濡傛灉鍐欏叆鎴愬姛鍒欒繑鍥瀟rue锛屽惁鍒欐姏鍑哄紓甯搞��</returns>
         public override bool Write<T>(string address, T[] values)
         {
             return GetResult(Write(address, values), address, values);
         }
 
-
+        /// <summary>
+        /// 鍐欏叆鑷畾涔夌被鍨嬬殑鏁版嵁锛岃绫诲瀷蹇呴』缁ф壙鑷狪DataTransfer鎺ュ彛銆�
+        /// </summary>
+        /// <typeparam name="T">鑷畾涔夌殑鏁版嵁绫诲瀷娉涘瀷銆�</typeparam>
+        /// <param name="address">婧愬湴鍧�锛屽叿浣撴牸寮忓彇鍐充簬浣跨敤鐨勫伐涓氬崗璁��</param>
+        /// <param name="value">瑕佸啓鍏ユ暟鎹��</param>
+        /// <returns>濡傛灉鍐欏叆鎴愬姛鍒欒繑鍥瀟rue锛屽け璐ュ垯鎶涘嚭寮傚父銆�</returns>
         public override bool WriteCustomer<T>(string address, [NotNull] T value)
         {
             throw new Exception("璇ユ柟娉曟殏涓嶅彲鐢�");
@@ -528,6 +627,14 @@
             //}
         }
 
+        /// <summary>
+        /// 鍚慞LC鍐欏叆鏁版嵁銆�
+        /// </summary>
+        /// <param name="address">婧愬湴鍧�锛屽叿浣撴牸寮忓彇鍐充簬浣跨敤鐨勫伐涓氬崗璁��</param>
+        /// <param name="dataType">瑕佸啓鍏ョ殑鏁版嵁绫诲瀷銆�</param>
+        /// <param name="value">瑕佸啓鍏ョ殑鏁版嵁銆�</param>
+        /// <returns>濡傛灉鍐欏叆鎴愬姛鍒欒繑鍥瀟rue锛屽け璐ュ垯鎶涘嚭寮傚父銆�</returns>
+        /// <exception cref="CommunicationException"></exception>
         public override bool WriteObj(string address, string dataType, object value)
         {
             bool obj = false;

--
Gitblit v1.9.3