RIZO/zhengzhou-byd-lms
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备状态信息上传

Browse Source
This commit is contained in:
赵正易 2025-03-08 15:35:29 +08:00
parent ff21fe9a64
commit 0e0f66d72a
6 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DOAN.Admin.WebApi/Controllers/Bydlms/BydDeviceController.cs
View File

@ -110,12 +110,11 @@ namespace DOAN.Admin.WebApi.Controllers.Bydlms
[HttpPost("UploadAndUpdateDevice")]
[Log(Title = "修改与上传设备状态", BusinessType = BusinessType.UPDATE)]
[AllowAnonymous]
public IActionResult UploadAndUpdateDevice([FromBody] BydDeviceDto parm)
public IActionResult UploadAndUpdateDevice([FromBody] DeviceUploadData parm)
{
try
{
var modal = parm.Adapt<BydDevice>().ToUpdate(HttpContext);
var response = _BydDeviceService.UploadAndUpdateDevice(modal);
var response = _BydDeviceService.UploadAndUpdateDevice(parm);
return SUCCESS(response);
}
catch (Exception e)

2
DOAN.Model/Bydlms/BydDevice.cs
View File

@ -66,7 +66,7 @@ namespace DOAN.Model.Bydlms
/// <summary>
/// 状态（0：开始；1：结束）
/// </summary>
public int? StatusType { get; set; }
public string StatusType { get; set; }
/// <summary>
/// 系统类别

2
DOAN.Model/Bydlms/DataUpload.cs
View File

@ -215,7 +215,7 @@ namespace DOAN.Model.Bydlms
/// </summary>
public class DeviceUploadData : BaseUploadServerData
{
public BydDevice data { get; set; }
public BydDeviceDto data { get; set; }
}
}

2
DOAN.Model/Bydlms/Dto/BydDeviceDto.cs
View File

@ -35,7 +35,7 @@ namespace DOAN.Model.Bydlms.Dto
public DateTime? EditTime { get; set; }
public int? StatusType { get; set; }
public string StatusType { get; set; }
public string Type { get; set; }

34
DOAN.Service/Bydlms/BydDeviceService.cs
View File

@ -88,41 +88,36 @@ namespace DOAN.Service.Bydlms
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public int UploadAndUpdateDevice(BydDevice parm)
public int UploadAndUpdateDevice(DeviceUploadData parm)
{
try
{
Context.Ado.BeginTran();
DateTime now = DateTime.Now;
BydDevice device = Context.Queryable<BydDevice>()
.Where(it => it.FactoryCode == parm.FactoryCode)
.Where(it => it.LineCode == parm.LineCode)
.Where(it => it.MachineCode == parm.MachineCode)
.Where(it => it.AcquisitCode == parm.AcquisitCode)
.Where(it => it.FactoryCode == parm.factoryCode)
.Where(it => it.LineCode == parm.data.LineCode)
.Where(it => it.MachineCode == parm.data.MachineCode)
.Where(it => it.AcquisitCode == parm.data.AcquisitCode)
.First();
if (device == null)
{
throw new Exception("设备未找到");
}
device.MachineStatusCode = parm.MachineStatusCode;
device.MachineStatusBegin = now;
device.MachineStatusEnd = now;
device.EditTime = now;
device.StatusType = 1;
int res = Context.Updateable(device).UpdateColumns(it => new { it.MachineStatusCode, it.EditTime }).ExecuteCommand();
device.MachineStatusCode = parm.data.MachineStatusCode;
device.EditTime = parm.data.EditTime;
device.MachineStatusBegin = parm.data.MachineStatusBegin;
device.MachineStatusEnd = parm.data.MachineStatusEnd;
device.StatusType = parm.data.StatusType;
int res = Context.Updateable(device)
.UpdateColumns(it => new { it.MachineStatusCode, it.EditTime,it.MachineStatusBegin,it.MachineStatusEnd,it.StatusType })
.ExecuteCommand();
if (res == 0)
{
throw new Exception("设备状态变化修改数据库失败");
}
string url = "http://10.17.2.198:3000/mock/24/api/product/Product_Information?serviceId=Product005_EquipmentStatus";
DeviceUploadData uploadData = new()
{
serviceId = "Product005_EquipmentStatus",
factoryCode = "ZZG4",
userName = parm.UserName,
data = device
};
var jsonData = JsonConvert.SerializeObject(uploadData);
var jsonData = JsonConvert.SerializeObject(device);
var content = new StringContent(jsonData, Encoding.UTF8, "application/json");
// 创建HTTP请求消息
@ -140,6 +135,7 @@ namespace DOAN.Service.Bydlms
{
throw new Exception($"设备状态变化上传失败: {response.StatusCode}");
}
Console.WriteLine("设备状态上传成功！" + response.Content);
Context.Ado.CommitTran();
return 1;
}

2
DOAN.Service/Bydlms/IBydlmsService/IBydDeviceService.cs
View File

@ -16,6 +16,6 @@ namespace DOAN.Service.Bydlms.IBydlmsService
BydDevice AddBydDevice(BydDevice parm);
int UpdateBydDevice(BydDevice parm);
int UploadAndUpdateDevice(BydDevice parm);
int UploadAndUpdateDevice(DeviceUploadData parm);
}
}