修改接口部分传参

This commit is contained in:
bnala committed 2025-02-18 14:05:27 +08:00
1 parent 4c4b6df9ba
commit c322de2dd7
11 files changed
+560 -198

No files matched your search

+58 -13
View File
@@ -6,6 +6,9 @@ using System.Threading.Tasks;
using HslCommunication.Profinet.Siemens;
using HslCommunication;
using WindowsFormsApp1.mod;
using WindowsFormsApp1.mod.server;
using System.Collections;
using System.Xml.Linq;
namespace WindowsFormsApp1.server
{
@@ -121,7 +124,7 @@ namespace WindowsFormsApp1.server
}
}
public BllResult ReadAddress(List<t_plcaddress> address)
public BllResult ReadAddress(List<t_plcaddress> address,plcdata PlcData)
{
var ulist = address.GroupBy(a => a.dbaddress).ToList();
foreach (var u in ulist)
@@ -132,6 +135,17 @@ namespace WindowsFormsApp1.server
return BllResult.Error(readresult.Msg);
}
}
foreach (var p in PlcData.GetType().GetProperties())
{
var vlaue = address.FirstOrDefault(a => a.code == p.Name);
if (vlaue != null)
{
var per = PlcData.GetType().GetProperty(p.Name);
per.SetValue(PlcData, Convert.ChangeType(vlaue.value, per.PropertyType), null);
}
}
PlcData.Read_Time = DateTime.Now;
return BllResult.Sucess(address, "成功");
}
@@ -158,9 +172,23 @@ namespace WindowsFormsApp1.server
}
}
public BllResult WriteAddress(List<t_plcaddress> address)
public BllResult WriteAddress(List<t_plcaddress> address, plcdata PlcData)
{
var ulist = address.FindAll(a=>a.remark != "心跳").GroupBy(a => a.dbaddress).ToList();
List<t_plcaddress> writeaddress = new List<t_plcaddress>();
//address = address.FindAll(a => a.code != "Write_Heartbeat");
foreach (var add in address)
{
foreach (var p in PlcData.GetType().GetProperties())
{
if (add.code == p.Name)
{
add.value = PlcData.GetType().GetProperty(p.Name).GetValue(PlcData).ToString();
writeaddress.Add(add);
}
}
}
var ulist = writeaddress.GroupBy(a => a.dbaddress).ToList();
foreach (var u in ulist)
{
var readresult = WriteOneDB(u.ToList());
@@ -172,16 +200,33 @@ namespace WindowsFormsApp1.server
return BllResult.Sucess(address, "成功");
}
public BllResult WriteHaert(List<t_plcaddress> address)
{
var ulist = address.FindAll(a => a.remark == "心跳");
var readresult = WriteOneDB(ulist);
if (!readresult.Success)
{
return BllResult.Error(readresult.Msg);
}
return BllResult.Sucess(address, "成功");
}
//public BllResult WriteHaert(List<t_plcaddress> address, plcdata PlcData)
//{
// List<t_plcaddress> writeaddress = new List<t_plcaddress>();
// address = address.FindAll(a=>a.code == "Write_Heartbeat");
// foreach (var add in address)
// {
// foreach (var p in PlcData.GetType().GetProperties())
// {
// if(add.code == p.Name)
// {
// add.value = PlcData.GetType().GetProperty(p.Name).GetValue(PlcData).ToString();
// writeaddress.Add(add);
// }
// }
// }
// var ulist = writeaddress.GroupBy(a => a.dbaddress).ToList();
// foreach (var u in ulist)
// {
// var readresult = WriteOneDB(u.ToList());
// if (!readresult.Success)
// {
// return BllResult.Error(readresult.Msg);
// }
// }
// return BllResult.Sucess(address, "成功");
//}
private BllResult TransforWCSDataToAddressData(List<t_plcaddress> address, OperateResult<byte[]> read)
{