|
|
|
@ -10,6 +10,7 @@ using VOL.WebApi.Utils;
|
|
|
|
|
using VOL.Entity.DomainModels;
|
|
|
|
|
using System.Collections.Generic;
|
|
|
|
|
using Microsoft.Extensions.Primitives;
|
|
|
|
|
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
// 尼可尼数据采集
|
|
|
|
@ -51,6 +52,7 @@ namespace VOL.WebApi.Controllers.Data
|
|
|
|
|
{
|
|
|
|
|
var headers = _httpContextAccessor.HttpContext.Request.Headers;
|
|
|
|
|
headers.TryGetValue("USER-DEVICE-ID", out StringValues deviceIdStr);
|
|
|
|
|
if (1 == 1) {
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
_service = new ModbusTcpService("192.168.1.99", 502);
|
|
|
|
@ -66,6 +68,7 @@ namespace VOL.WebApi.Controllers.Data
|
|
|
|
|
Console.WriteLine("siemens modbus tcp disconnect!");
|
|
|
|
|
return Content("siemens modbus tcp disconnect!");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 切削倍率 17136 1
|
|
|
|
|
//_service.readData(1, 6435, "int16"); // 运行时长 分钟
|
|
|
|
|
//_service.readData(1, 6436, "int16"); // 工单1产量 件
|
|
|
|
@ -95,7 +98,15 @@ namespace VOL.WebApi.Controllers.Data
|
|
|
|
|
{
|
|
|
|
|
if (success)
|
|
|
|
|
{
|
|
|
|
|
Dictionary<string, Dictionary<string, object>> dataMap = _dataService.readSiemensData(_service);
|
|
|
|
|
Dictionary<string, Dictionary<string, object>> dataMap = new();
|
|
|
|
|
if (1 == 1)
|
|
|
|
|
{
|
|
|
|
|
dataMap = _dataService.readSiemensData(_service);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
dataMap.Add("produce", new Dictionary<string, object>());
|
|
|
|
|
dataMap.Add("machine", new Dictionary<string, object>());
|
|
|
|
|
}
|
|
|
|
|
message = saveSourceData(dataMap, deviceId);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
@ -110,9 +121,12 @@ namespace VOL.WebApi.Controllers.Data
|
|
|
|
|
message = "read data error: " + ex.Message;
|
|
|
|
|
}
|
|
|
|
|
finally
|
|
|
|
|
{
|
|
|
|
|
if (_service != null)
|
|
|
|
|
{
|
|
|
|
|
_service.disConnent();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return Content(message);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -127,6 +141,8 @@ namespace VOL.WebApi.Controllers.Data
|
|
|
|
|
{
|
|
|
|
|
var headers = _httpContextAccessor.HttpContext.Request.Headers;
|
|
|
|
|
headers.TryGetValue("USER-DEVICE-ID", out StringValues deviceIdStr);
|
|
|
|
|
if (1 == 1)
|
|
|
|
|
{
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
_service = new ModbusTcpService("192.168.1.100", 502);
|
|
|
|
@ -142,6 +158,7 @@ namespace VOL.WebApi.Controllers.Data
|
|
|
|
|
Console.WriteLine("GSK modbus tcp disconnect!");
|
|
|
|
|
return Content("GSK modbus tcp disconnect!");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//_service.readData(1, 6429, "int16"); // 程序编号
|
|
|
|
|
//_service.readData(1, 6435, "int16"); // 通讯状态 5:通讯正常 15:通讯断线
|
|
|
|
@ -178,7 +195,16 @@ namespace VOL.WebApi.Controllers.Data
|
|
|
|
|
{
|
|
|
|
|
if (success)
|
|
|
|
|
{
|
|
|
|
|
Dictionary<string, Dictionary<string, object>> dataMap = _dataService.readGSKData(_service);
|
|
|
|
|
Dictionary<string, Dictionary<string, object>> dataMap = new();
|
|
|
|
|
if (1 == 1)
|
|
|
|
|
{
|
|
|
|
|
dataMap = _dataService.readGSKData(_service);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
dataMap.Add("produce", new Dictionary<string, object>());
|
|
|
|
|
dataMap.Add("machine", new Dictionary<string, object>());
|
|
|
|
|
}
|
|
|
|
|
message = saveSourceData(dataMap, deviceId);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
@ -192,9 +218,12 @@ namespace VOL.WebApi.Controllers.Data
|
|
|
|
|
message = "read data error: " + ex.Message;
|
|
|
|
|
}
|
|
|
|
|
finally
|
|
|
|
|
{
|
|
|
|
|
if (_service != null)
|
|
|
|
|
{
|
|
|
|
|
_service.disConnent();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return Content(message);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|