From c54e0666bdd34fbe133fe521bf9d46dd6c0fe53e Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 12 六月 2025 10:33:28 +0800
Subject: [PATCH] 代码提交
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DeviceProtocolController.cs | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DeviceProtocolController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DeviceProtocolController.cs"
index d71814d..1883b0e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DeviceProtocolController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DeviceProtocolController.cs"
@@ -4,6 +4,7 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseController;
using WIDESEAWCS_QuartzJob.Models;
+using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
namespace WIDESEAWCS_Server.Controllers.QuartzJob
@@ -14,6 +15,7 @@
{
public DeviceProtocolController(IDeviceProtocolService service) : base(service)
{
+
}
[HttpPost, Route("GetImportData"), AllowAnonymous]
public WebResponseContent GetImportData(List<IFormFile> fileInput)
@@ -171,8 +173,6 @@
dt_Devices.Add(dt_DeviceProtoco9);
#endregion
}
-
-
foreach (var deviceProtocol in dt_Devices)
{
base.AddData(deviceProtocol);
@@ -183,8 +183,42 @@
throw;
}
+ }
+ [HttpPost, HttpPost,Route("AddCommonConveyorLineProtocol"), AllowAnonymous]
+ public WebResponseContent AddCommonConveyorLineProtocol(int DeviceId, string DeviceChildCode, decimal DeviceProOffset)
+ {
+ WebResponseContent content = new WebResponseContent();
+ var protocols = new List<Dt_DeviceProtocol>
+ {
+ CreateDeviceProtocol(DeviceId, DeviceChildCode, DeviceProOffset, "DeviceCommand"),
+ CreateDeviceProtocol(DeviceId, DeviceChildCode, DeviceProOffset+8, "ReadDeviceCommand"),
+ };
+ foreach (var deviceProtocol in protocols)
+ {
+ base.AddData(deviceProtocol);
+ }
+ return content.OK();
+ }
+
+ private Dt_DeviceProtocol CreateDeviceProtocol(int DeviceID, string DeviceChildCode, decimal DeviceProOffset, string DeviceProParamType)
+ {
+ return new Dt_DeviceProtocol
+ {
+ DeviceId = DeviceID,
+ DeviceChildCode = DeviceChildCode,
+ DeviceProDataBlock = "DB50",
+ DeviceProOffset = DeviceProOffset,
+ DeviceProDataLength = 1,
+ DeviceProDataType = "int",
+ DeviceProParamName = "InteractiveSignal",
+ DeviceProParamType = DeviceProParamType,
+ DeviceProParamDes = "1",
+ DeviceProRemark = "",
+ Creater = "admin",
+ CreateDate = DateTime.Now,
+ };
}
}
}
--
Gitblit v1.9.3