xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

将所有的VariableData改为Variable,将DataVariables改为Variables,修复了变量添加MQTT服务器后，服务器列表不更新的问题

Browse Source
This commit is contained in:
David P.G
2025-07-17 20:13:21 +08:00
parent 6b21c387d5
commit 018fe7c9d0
44 changed files with 410 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Helper/ExcelHelper.cs
View File

@@ -161,7 +161,7 @@ namespace PMSWPF.Helper
/// <param name="excelFilePath"></param>
/// <returns></returns>
/// <exception cref="AggregateException"></exception>
public static List<VariableData> ImprotFromTiaVariableTable(string excelFilePath)
public static List<Variable> ImprotFromTiaVariableTable(string excelFilePath)
{
// Act
// _testFilePath = "C:\\Users\\Administrator\\Desktop\\浓度变量.xlsx";
@@ -173,22 +173,22 @@ namespace PMSWPF.Helper
"Excel表格式不正确：第一列的名字是：Name,第三列的名字是：Data Type,Data Type,第四列的名字是：Logical Address,请检查");
List<VariableData> variableDatas = new List<VariableData>();
List<Variable> variableDatas = new List<Variable>();
foreach (DataRow dataRow in dataTable.Rows)
{
VariableData variableData = new VariableData();
variableData.Name=dataRow["Name"].ToString();
variableData.DataType=SiemensHelper.S7ToCSharpTypeString(dataRow["Data Type"].ToString()) ;
Variable variable = new Variable();
variable.Name=dataRow["Name"].ToString();
variable.DataType=SiemensHelper.S7ToCSharpTypeString(dataRow["Data Type"].ToString()) ;
var exS7Addr=dataRow["Logical Address"].ToString();
if (exS7Addr.StartsWith("%"))
{
variableData.S7Address = exS7Addr.Substring(1);
variable.S7Address = exS7Addr.Substring(1);
}
variableData.NodeId = "";
variableData.ProtocolType = ProtocolType.S7;
variableData.SignalType = SignalType.OtherASignal;
variableDatas.Add(variableData);
variable.NodeId = "";
variable.ProtocolType = ProtocolType.S7;
variable.SignalType = SignalType.OtherASignal;
variableDatas.Add(variable);
}
return variableDatas;