From 8c6fd742db249ad4cc819cf041eb98d880a3ef73 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 02 一月 2025 15:09:07 +0800
Subject: [PATCH] 1
---
WIDESEAWCS_Server/WIDESEAWCS_Communicator/Siemens/SiemensS7Communicator.cs | 111 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 99 insertions(+), 12 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_Communicator/Siemens/SiemensS7Communicator.cs b/WIDESEAWCS_Server/WIDESEAWCS_Communicator/Siemens/SiemensS7Communicator.cs
index de6f6db..bfb5a47 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_Communicator/Siemens/SiemensS7Communicator.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_Communicator/Siemens/SiemensS7Communicator.cs
@@ -20,6 +20,7 @@
using HslCommunication.LogNet;
using HslCommunication.Profinet.Siemens;
using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -83,6 +84,9 @@
/// </summary>
public override string Name => _name;
+ /// <summary>
+ /// PLC璇诲啓鏃ュ織璁板綍
+ /// </summary>
public override ILogNet LogNet => _logNet;
#endregion Public Member
@@ -147,6 +151,10 @@
/// <exception cref="CommunicationException"></exception>
private bool GetResult<T>(OperateResult operateResult, string address, T value) where T : notnull
{
+ if (value is Array)
+ {
+ return operateResult.IsSuccess;
+ }
StringBuilder stringBuilder = new StringBuilder();
try
{
@@ -161,7 +169,7 @@
for (int i = 0; i < 5; i++)
{
T readValue = Read<T>(address);
- stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteAfterRead, readValue, value));
+ stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteAfterRead, address, value));
obj = readValue;
if (readValue.Equals(value))
{
@@ -186,7 +194,6 @@
{
LogNet.WriteInfo(Name, stringBuilder.ToString());
}
-
}
/// <summary>
@@ -223,6 +230,38 @@
case TypeCode.Char:
return plc.Write(address, Convert.ToChar(value));
default:
+ if (value is int[])
+ {
+ return plc.Write(address, value as int[]);
+ }
+ else if (value is uint[])
+ {
+ return plc.Write(address, value as uint[]);
+ }
+ else if (value is short[])
+ {
+ return plc.Write(address, value as short[]);
+ }
+ else if (value is ushort[])
+ {
+ return plc.Write(address, value as ushort[]);
+ }
+ else if (value is bool[])
+ {
+ return plc.Write(address, value as bool[]);
+ }
+ else if (value is float[])
+ {
+ return plc.Write(address, value as float[]);
+ }
+ else if (value is double[])
+ {
+ return plc.Write(address, value as double[]);
+ }
+ else if (value is byte[])
+ {
+ return plc.Write(address, value as byte[]);
+ }
throw new CommunicationException(string.Format(CommunicationExceptionMessage.DataTypeErrorException, type.Name, address), CommunicationErrorType.TypeError);
}
}
@@ -237,29 +276,54 @@
}
}
- private object Read(string address, TypeCode typeCode)
+ private object Read(string address, TypeCode typeCode, ushort length = 1)
{
try
{
switch (typeCode)
{
case TypeCode.Int32:
- return (int)GetContent(plc.ReadInt32(address), address);
+ if (length > 1)
+ return (int[])GetContent(plc.ReadInt32(address, length), address);
+ else
+ return (int)GetContent(plc.ReadInt32(address), address);
case TypeCode.UInt32:
- return (uint)GetContent(plc.ReadUInt32(address), address);
+ if (length > 1)
+ return (uint[])GetContent(plc.ReadUInt32(address, length), address);
+ else
+ return (uint)GetContent(plc.ReadUInt32(address), address);
case TypeCode.Int16:
- return (short)GetContent(plc.ReadInt16(address), address);
+ if (length > 1)
+ return (short[])GetContent(plc.ReadInt16(address, length), address);
+ else
+ return (short)GetContent(plc.ReadInt16(address), address);
case TypeCode.UInt16:
- return (ushort)GetContent(plc.ReadUInt16(address), address);
+ if (length > 1)
+ return (ushort[])GetContent(plc.ReadUInt16(address, length), address);
+ else
+ return (ushort)GetContent(plc.ReadUInt16(address), address);
case TypeCode.Single:
- return (float)GetContent(plc.ReadFloat(address), address);
+ if (length > 1)
+ return (float[])GetContent(plc.ReadFloat(address, length), address);
+ else
+ return (float)GetContent(plc.ReadFloat(address), address);
case TypeCode.Boolean:
- return (bool)GetContent(plc.ReadBool(address), address);
+ if (length > 1)
+ return (bool[])GetContent(plc.ReadBool(address, length), address);
+ else
+ return (bool)GetContent(plc.ReadBool(address), address);
case TypeCode.Byte:
+ if (length > 1)
+ return (byte)GetContent(plc.Read(address, length), address);
return (byte)GetContent(plc.ReadByte(address), address);
case TypeCode.String:
- return (string)GetContent(plc.ReadString(address), address);
+ if (length > 1)
+ return (string)GetContent(plc.ReadString(address, length), address);
+ else
+ return (string)GetContent(plc.ReadString(address), address);
case TypeCode.Char:
+ if (length > 1)
+ return (char)GetContent(plc.Read(address, length), address);
return (char)GetContent(plc.ReadByte(address), address);
default:
throw new CommunicationException(string.Format(CommunicationExceptionMessage.DataTypeErrorException, typeCode.ToString(), address), CommunicationErrorType.TypeError);
@@ -387,6 +451,12 @@
return (T)Read(address, Type.GetTypeCode(type));
}
+ public override T[] Read<T>(string address, ushort length)
+ {
+ Type type = typeof(T);
+ return (T[])Read(address, Type.GetTypeCode(type), length);
+ }
+
/// <summary>
/// 浠嶱LC璇诲彇鏁版嵁杩斿洖object銆�
/// </summary>
@@ -426,7 +496,7 @@
catch (Exception ex)
{
//鍐欏叆寮傚父鏃舵姏鍑鸿嚜瀹氫箟閫氳寮傚父绫�
- throw new CommunicationException($"鍐欏叆鏁版嵁寮傚父,鍦板潃:銆恵address}銆�,閿欒淇℃伅: {ex.Message}", CommunicationErrorType.ReadFailed, innerException: ex);
+ throw new CommunicationException($"鍐欏叆鏁版嵁寮傚父,鍦板潃:銆恵address}銆�,閿欒淇℃伅: {ex.Message}", CommunicationErrorType.WriteFailed, innerException: ex);
}
}
@@ -441,6 +511,12 @@
public override bool Write<T>(string address, T value)
{
return GetResult(Write(address, value), address, value);
+ }
+
+
+ public override bool Write<T>(string address, T[] values)
+ {
+ return GetResult(Write(address, values), address, values);
}
/// <summary>
@@ -649,7 +725,9 @@
}
#endregion
- // 鏄惧紡瀹炵幇IDisposable鎺ュ彛浠ユ彁渚涘瀮鍦惧洖鏀舵椂鐨勬竻鐞�
+ /// <summary>
+ /// 鏄惧紡瀹炵幇IDisposable鎺ュ彛浠ユ彁渚涘瀮鍦惧洖鏀舵椂鐨勬竻鐞�
+ /// </summary>
public override void Dispose()
{
_isPing = false;
@@ -658,6 +736,15 @@
GC.SuppressFinalize(this);
}
+ /// <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));
--
Gitblit v1.9.3