From 0e0f66d72ab4a8a06ea7f17f4e3852473b9d6d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Sat, 8 Mar 2025 15:35:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Bydlms/BydDeviceController.cs | 5 ++- DOAN.Model/Bydlms/BydDevice.cs | 2 +- DOAN.Model/Bydlms/DataUpload.cs | 2 +- DOAN.Model/Bydlms/Dto/BydDeviceDto.cs | 2 +- DOAN.Service/Bydlms/BydDeviceService.cs | 34 ++++++++----------- .../IBydlmsService/IBydDeviceService.cs | 2 +- 6 files changed, 21 insertions(+), 26 deletions(-) diff --git a/DOAN.Admin.WebApi/Controllers/Bydlms/BydDeviceController.cs b/DOAN.Admin.WebApi/Controllers/Bydlms/BydDeviceController.cs index ff0b80d..1d8d897 100644 --- a/DOAN.Admin.WebApi/Controllers/Bydlms/BydDeviceController.cs +++ b/DOAN.Admin.WebApi/Controllers/Bydlms/BydDeviceController.cs @@ -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().ToUpdate(HttpContext); - var response = _BydDeviceService.UploadAndUpdateDevice(modal); + var response = _BydDeviceService.UploadAndUpdateDevice(parm); return SUCCESS(response); } catch (Exception e) diff --git a/DOAN.Model/Bydlms/BydDevice.cs b/DOAN.Model/Bydlms/BydDevice.cs index c6abd35..7bbbfb0 100644 --- a/DOAN.Model/Bydlms/BydDevice.cs +++ b/DOAN.Model/Bydlms/BydDevice.cs @@ -66,7 +66,7 @@ namespace DOAN.Model.Bydlms /// /// 状态（0：开始；1：结束） /// - public int? StatusType { get; set; } + public string StatusType { get; set; } /// /// 系统类别 diff --git a/DOAN.Model/Bydlms/DataUpload.cs b/DOAN.Model/Bydlms/DataUpload.cs index a2ffe02..f468fdf 100644 --- a/DOAN.Model/Bydlms/DataUpload.cs +++ b/DOAN.Model/Bydlms/DataUpload.cs @@ -215,7 +215,7 @@ namespace DOAN.Model.Bydlms /// public class DeviceUploadData : BaseUploadServerData { - public BydDevice data { get; set; } + public BydDeviceDto data { get; set; } } } diff --git a/DOAN.Model/Bydlms/Dto/BydDeviceDto.cs b/DOAN.Model/Bydlms/Dto/BydDeviceDto.cs index 2aef4ea..0d81095 100644 --- a/DOAN.Model/Bydlms/Dto/BydDeviceDto.cs +++ b/DOAN.Model/Bydlms/Dto/BydDeviceDto.cs @@ -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; } diff --git a/DOAN.Service/Bydlms/BydDeviceService.cs b/DOAN.Service/Bydlms/BydDeviceService.cs index f66eb78..ec1d334 100644 --- a/DOAN.Service/Bydlms/BydDeviceService.cs +++ b/DOAN.Service/Bydlms/BydDeviceService.cs @@ -88,41 +88,36 @@ namespace DOAN.Service.Bydlms /// /// /// - public int UploadAndUpdateDevice(BydDevice parm) + public int UploadAndUpdateDevice(DeviceUploadData parm) { try { Context.Ado.BeginTran(); DateTime now = DateTime.Now; BydDevice device = Context.Queryable() - .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; } diff --git a/DOAN.Service/Bydlms/IBydlmsService/IBydDeviceService.cs b/DOAN.Service/Bydlms/IBydlmsService/IBydDeviceService.cs index f2b230c..015df10 100644 --- a/DOAN.Service/Bydlms/IBydlmsService/IBydDeviceService.cs +++ b/DOAN.Service/Bydlms/IBydlmsService/IBydDeviceService.cs @@ -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); } }