修改接口部分传参

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

+40 -42
View File
@@ -5,83 +5,81 @@ using System.Reflection;
using System.Security.Claims;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
using WindowsFormsApp1.mod;
using WindowsFormsApp1.mod.server;
namespace WindowsFormsApp1.server
{
public class ApiClient
{
public BllResult SN_CheckIN()
public ApiFormResult SN_CheckIN(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
}
public BllResult Carrier_Check()
public ApiFormResult Carrier_Check(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
}
public BllResult SN_FeedingCheck()
public ApiFormResult SN_FeedingCheck(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
}
public BllResult Link_Comp()
public ApiFormResult Link_Comp(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
}
public BllResult SN_Release()
public ApiFormResult SN_Release(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
}
public BllResult Glue_CheckOut()
public ApiFormResult Glue_CheckOut(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
}
public BllResult Get_Para()
public ApiFormResult Get_Para(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
}
public BllResult DispatchPara()
public ApiFormResult DispatchPara(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
}
public BllResult Data_Collection()
public ApiFormResult Data_Collection(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
}
public BllResult Status()
public ApiFormResult Status(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
}
public BllResult Alarm()
public ApiFormResult Alarm(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
}
public BllResult OEEDataCollection()
public ApiFormResult OEEDataCollection(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass, false, "", PlcData);
}
public BllResult SN_FileUpload()
public ApiFormResult SN_FileUpload(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass, false, "", PlcData);
}
public BllResult Test()
public ApiFormResult Test(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass, false, "", PlcData);
}
public BllResult SN_Checkout()
public ApiFormResult SN_Checkout(plcdata PlcData, otherdata OtherData)
{
return BllResult.Sucess();
return ApiFormResult.Sucess(mesresult.pass, false, "", PlcData);
}
public BllResult Initialization()
public ApiFormResult Initialization(plcdata PlcData, otherdata OtherData)
{
//1.获取PLC参数,扫码器参数
//2、调用接口
//3.给PLC的 writeaddress赋值
return BllResult.Sucess("Initialization");
PlcData.Write_Status = 3;
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
}
public BllResult CallFunctionByName(string functionName)
public ApiFormResult CallFunctionByName(string functionName, plcdata plcdata,otherdata otherdata)
{
// 获取当前类的类型
Type type = this.GetType();
@@ -92,12 +90,12 @@ namespace WindowsFormsApp1.server
if (methodInfo != null)
{
// 调用该方法
return (BllResult)methodInfo.Invoke(this, null);
return (ApiFormResult)methodInfo.Invoke(this, new object[] { plcdata, otherdata });
}
else
{
Console.WriteLine($"Method '{functionName}' not found.");
return BllResult.Error();
LogExecute.logNet.WriteError($"未找到对应的函数{functionName}");
return ApiFormResult.Error(mesresult.none, false, $"未找到对应的函数{functionName}", null);
}
}
}
+43
View File
@@ -0,0 +1,43 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
using WindowsFormsApp1.mod;
using WindowsFormsApp1.mod.server;
namespace WindowsFormsApp1.server
{
public class ApiFormResult
{
private ApiFormResult(bool success, mesresult mesresult, bool isShow, string msg, plcdata data)
{
Success = success;
Msg = msg;
Data = data;
Mesresult = mesresult;
IsShow = isShow;
}
public bool Success { get; set; }
public string Msg { get; set; }
public plcdata Data { get; set; }
public mesresult Mesresult { get; set; }
public bool IsShow { get; set; }
public static ApiFormResult Sucess(mesresult mesresult, bool isShow, string msg, plcdata data)
{
return new ApiFormResult(true, mesresult, isShow, msg, data);
}
public static ApiFormResult Error(mesresult mesresult, bool isShow, string msg, plcdata data)
{
return new ApiFormResult(false, mesresult, isShow, msg, data);
}
}
}
+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)
{