From a770206c91e495b802b3e9371e06834586ad7715 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 30 十月 2025 20:17:30 +0800
Subject: [PATCH] 1
---
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/ContainerService.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/ContainerService.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/ContainerService.cs"
index 2490157..50f771e 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/ContainerService.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/ContainerService.cs"
@@ -8,6 +8,7 @@
using System.Security.Claims;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -22,8 +23,10 @@
{
public class ContainerService : ServiceBase<Dt_Container, IRepository<Dt_Container>>, IContainerService
{
- public ContainerService(IRepository<Dt_Container> BaseDal) : base(BaseDal)
+ private readonly IMessageInfoService _messageInfoService;
+ public ContainerService(IRepository<Dt_Container> BaseDal, IMessageInfoService messageInfoService) : base(BaseDal)
{
+ _messageInfoService = messageInfoService;
}
public IRepository<Dt_Container> Repository => BaseDal;
@@ -36,7 +39,7 @@
var result = HttpHelper.Get(url);
var response = JsonConvert.DeserializeObject<CollResponse<CoolDto>>(result);
- if (response?.code != "000" || response.data == null)
+ if (response.code != "000" || response.data == null)
{
return new WebResponseContent { Status = false, Message = "鎺ュ彛杩斿洖鏁版嵁鎶ラ敊" };
}
@@ -59,9 +62,13 @@
cool.CurrentTemperature = item.temperature;
cool.Humidity = item.humidity;
cool.Alarm = item.alarm;
- cool.AlarmInformation = item.message ?? "杩愯姝ｅ父";
+ cool.AlarmInformation = item.message;
cool.ModifyDate = currentTime;
updateList.Add(cool);
+ if (cool.Alarm!="姝ｅ父")
+ {
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, $"鍐锋煖{item.alarm}", item.message, MessageStatusEnum.Undisposed);
+ }
}
else
{
@@ -72,13 +79,17 @@
CurrentTemperature = item.temperature,
Humidity = item.humidity,
Alarm = item.alarm,
- AlarmInformation = item.message ?? "杩愯姝ｅ父",
+ AlarmInformation = item.message,
CreateDate = currentTime,
Creater = "System",
ModifyDate = currentTime,
Modifier = "System"
};
addList.Add(dto);
+ if (item.alarm != "姝ｅ父")
+ {
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, $"鍐锋煖{item.alarm}", item.message, MessageStatusEnum.Undisposed);
+ }
}
}
--
Gitblit v1.9.3