From 16dd4aa8fa061fc008d6b2886e3353f13a957221 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 03 一月 2024 12:05:32 +0800
Subject: [PATCH] 接口升级
---
IStation.Entry.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/dto/StationEnginePumpMobileDto.cs | 53 +++++
IStation.Service.SZJT/IStation.Service.SZJT.csproj | 2
IStation.Application.SZJT/99-logic/10-mobile/06-run-analy/dto/RunAnalySpanMobileDto.cs | 28 +++
IStation.Application.SZJT/99-logic/10-mobile/03-station-monitor-list/dto/StationMonitorListItemMobileDto.cs | 6
IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/dto/StationEnginePumpDetailMobileDto.cs | 80 ++++++++
IStation.Application.SZJT/99-logic/10-mobile/06-run-analy/RunAnaly_MobileController.cs | 94 ++++++++++
IStation.Application.SZJT/IStation.Application.SZJT.csproj | 4
IStation.Application.SZJT/00-core/3-dto/stationid/StationIDOfDayInput.cs | 14 +
IStation.Application.SZJT/99-logic/10-mobile/04-meter-monitor-list/dto/MeterMonitorListItemMobileDto.cs | 6
IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/StationAssets_MobileController.cs | 102 +++++++++++
IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/2-flow-meter/FlowMeterMapMonitorKpiLastRecordMobileDto.cs | 6
IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/1-station/StationMapMonitorKpiLastRecordMobileDto.cs | 6
IStation.Entry.SZJT/IStation.Entry.SZJT.csproj | 6
IStation.Server.SZJT/IStation.Server.SZJT.csproj | 2
IStation.Application.SZJT/99-logic/06-run-analy/RunAnaly_LogicController.cs | 1
IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/3-press-meter/PressMeterMapMonitorKpiLastRecordMobileDto.cs | 6
IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/dto/StationEnginePumpDetailLastRecordMobileDto.cs | 64 +++++++
IStation.Application.SZJT/99-logic/10-mobile/06-run-analy/dto/RunAnalySpanChunkMobileDto.cs | 45 +++++
19 files changed, 519 insertions(+), 8 deletions(-)
diff --git a/IStation.Application.SZJT/00-core/3-dto/stationid/StationIDOfDayInput.cs b/IStation.Application.SZJT/00-core/3-dto/stationid/StationIDOfDayInput.cs
new file mode 100644
index 0000000..da1aa9d
--- /dev/null
+++ b/IStation.Application.SZJT/00-core/3-dto/stationid/StationIDOfDayInput.cs
@@ -0,0 +1,14 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class StationIDOfDayInput : StationIDInput
+ {
+ /// <summary>
+ /// 鏃ユ湡
+ /// </summary>
+ [Required]
+ public DateTime Day { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/06-run-analy/RunAnaly_LogicController.cs b/IStation.Application.SZJT/99-logic/06-run-analy/RunAnaly_LogicController.cs
index 17628ac..7463fa2 100644
--- a/IStation.Application.SZJT/99-logic/06-run-analy/RunAnaly_LogicController.cs
+++ b/IStation.Application.SZJT/99-logic/06-run-analy/RunAnaly_LogicController.cs
@@ -37,6 +37,7 @@
}
var all_equipment_list = new Yw.Service.Equipment().GetByBelongTypeAndBelongID(input.BelongType, input.BelongID);
+ all_equipment_list = all_equipment_list?.Where(x => x.Flags.Contains(Flags.鏈虹粍)).ToList();
all_equipment_list = all_equipment_list?.Where(x => x.ParentIds.Count < 1).ToList();
if (all_equipment_list == null || all_equipment_list.Count < 1)
{
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/03-station-monitor-list/dto/StationMonitorListItemMobileDto.cs b/IStation.Application.SZJT/99-logic/10-mobile/03-station-monitor-list/dto/StationMonitorListItemMobileDto.cs
index 45396f5..4dcb779 100644
--- a/IStation.Application.SZJT/99-logic/10-mobile/03-station-monitor-list/dto/StationMonitorListItemMobileDto.cs
+++ b/IStation.Application.SZJT/99-logic/10-mobile/03-station-monitor-list/dto/StationMonitorListItemMobileDto.cs
@@ -14,6 +14,7 @@
this.Name = monitor.Name;
this.Code = signal.SignalType.Code;
this.SignalID = signal.ID;
+ this.FormatType = signal.SignalType.FormatType;
this.DataValue = signal.GetDisplayValue(record?.DataValue);
this.UnitName = signal.GetDisplayUnitName();
this.DataStatus = Yw.Monitor.eDataStatus.Normal;
@@ -44,6 +45,11 @@
public long SignalID { get; set; }
/// <summary>
+ /// 鏍煎紡绫诲瀷
+ /// </summary>
+ public Yw.Monitor.eFormatType FormatType { get; set; }
+
+ /// <summary>
/// 鏁版嵁鍊�
/// </summary>
public string DataValue { get; set; }
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/04-meter-monitor-list/dto/MeterMonitorListItemMobileDto.cs b/IStation.Application.SZJT/99-logic/10-mobile/04-meter-monitor-list/dto/MeterMonitorListItemMobileDto.cs
index c62b6b2..64d2216 100644
--- a/IStation.Application.SZJT/99-logic/10-mobile/04-meter-monitor-list/dto/MeterMonitorListItemMobileDto.cs
+++ b/IStation.Application.SZJT/99-logic/10-mobile/04-meter-monitor-list/dto/MeterMonitorListItemMobileDto.cs
@@ -14,6 +14,7 @@
this.Name = monitor.Name;
this.Code = signal.SignalType.Code;
this.SignalID = signal.ID;
+ this.FormatType = signal.SignalType.FormatType;
this.DataValue = signal.GetDisplayValue(record?.DataValue);
this.UnitName = signal.GetDisplayUnitName();
this.DataStatus = Yw.Monitor.eDataStatus.Normal;
@@ -44,6 +45,11 @@
public long SignalID { get; set; }
/// <summary>
+ /// 鏍煎紡绫诲瀷
+ /// </summary>
+ public Yw.Monitor.eFormatType FormatType { get; set; }
+
+ /// <summary>
/// 鏁版嵁鍊�
/// </summary>
public string DataValue { get; set; }
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/1-station/StationMapMonitorKpiLastRecordMobileDto.cs b/IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/1-station/StationMapMonitorKpiLastRecordMobileDto.cs
index da8bdc6..2dd198f 100644
--- a/IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/1-station/StationMapMonitorKpiLastRecordMobileDto.cs
+++ b/IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/1-station/StationMapMonitorKpiLastRecordMobileDto.cs
@@ -12,6 +12,7 @@
public StationMapMonitorKpiLastRecordMobileDto(Yw.Model.MonitorPoint_Signal_SignalType monitor, Yw.Model.MonitorRealRecord record)
{
this.SignalID = monitor.SignalList.First().ID;
+ this.FormatType = monitor.SignalList.First().SignalType.FormatType;
this.Name = monitor.Name;
this.Code = monitor.SignalList.First().SignalType.Code;
this.DataTime = record?.DataTime;
@@ -36,6 +37,11 @@
public string Code { get; set; }
/// <summary>
+ /// 鏍煎紡绫诲瀷
+ /// </summary>
+ public Yw.Monitor.eFormatType FormatType { get; set; }
+
+ /// <summary>
/// 鏁版嵁鏃堕棿
/// </summary>
public DateTime? DataTime { get; set; }
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/2-flow-meter/FlowMeterMapMonitorKpiLastRecordMobileDto.cs b/IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/2-flow-meter/FlowMeterMapMonitorKpiLastRecordMobileDto.cs
index 2a36383..b74c2e0 100644
--- a/IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/2-flow-meter/FlowMeterMapMonitorKpiLastRecordMobileDto.cs
+++ b/IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/2-flow-meter/FlowMeterMapMonitorKpiLastRecordMobileDto.cs
@@ -12,6 +12,7 @@
public FlowMeterMapMonitorKpiLastRecordMobileDto(Yw.Model.MonitorPoint_Signal_SignalType monitor, Yw.Model.MonitorRealRecord record)
{
this.SignalID = monitor.SignalList.First().ID;
+ this.FormatType = monitor.SignalList.First().SignalType.FormatType;
this.Name = monitor.Name;
this.Code = monitor.SignalList.First().SignalType.Code;
this.DataTime = record?.DataTime;
@@ -26,6 +27,11 @@
public long SignalID { get; set; }
/// <summary>
+ /// 鏍煎紡绫诲瀷
+ /// </summary>
+ public Yw.Monitor.eFormatType FormatType { get; set; }
+
+ /// <summary>
/// 鍚嶇О
/// </summary>
public string Name { get; set; }
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/3-press-meter/PressMeterMapMonitorKpiLastRecordMobileDto.cs b/IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/3-press-meter/PressMeterMapMonitorKpiLastRecordMobileDto.cs
index 826b920..680b48c 100644
--- a/IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/3-press-meter/PressMeterMapMonitorKpiLastRecordMobileDto.cs
+++ b/IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/3-press-meter/PressMeterMapMonitorKpiLastRecordMobileDto.cs
@@ -12,6 +12,7 @@
public PressMeterMapMonitorKpiLastRecordMobileDto(Yw.Model.MonitorPoint_Signal_SignalType monitor, Yw.Model.MonitorRealRecord record)
{
this.SignalID = monitor.SignalList.First().ID;
+ this.FormatType = monitor.SignalList.First().SignalType.FormatType;
this.Name = monitor.Name;
this.Code = monitor.SignalList.First().SignalType.Code;
this.DataTime = record?.DataTime;
@@ -26,6 +27,11 @@
public long SignalID { get; set; }
/// <summary>
+ /// 鏍煎紡绫诲瀷
+ /// </summary>
+ public Yw.Monitor.eFormatType FormatType { get; set; }
+
+ /// <summary>
/// 鍚嶇О
/// </summary>
public string Name { get; set; }
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/06-run-analy/RunAnaly_MobileController.cs b/IStation.Application.SZJT/99-logic/10-mobile/06-run-analy/RunAnaly_MobileController.cs
new file mode 100644
index 0000000..66b8dcd
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/10-mobile/06-run-analy/RunAnaly_MobileController.cs
@@ -0,0 +1,94 @@
+锘縩amespace IStation.Application
+{
+ /// <summary>
+ /// RunAnaly
+ /// </summary>
+ [Route("SZJT/Run/Analy/Mobile")]
+ [ApiDescriptionSettings("SZJT", Name = "杩愯鍒嗘瀽(鎵嬫満)", Order = 1500)]
+ public class RunAnaly_MobileController : IDynamicApiController
+ {
+
+ /// <summary>
+ /// 閫氳繃 StationID 鑾峰彇鏌愭棩鐨勫尯鍧楀垪琛�
+ /// </summary>
+ [Route("GetSpanListByStationIDOfDay@V1.0")]
+ [HttpGet]
+ public List<RunAnalySpanMobileDto> GetSpanListByStationIDOfDay([FromQuery][Required] StationIDOfDayInput input)
+ {
+ var all_equipment_list = new Yw.Service.Equipment().GetByBelongTypeAndBelongID(IStation.DataType.LogicSite, input.StationID);
+ all_equipment_list = all_equipment_list?.Where(x => x.ParentIds.Count < 1).ToList();
+ if (all_equipment_list == null || all_equipment_list.Count < 1)
+ {
+ return default;
+ }
+ var vmList = new List<RunAnalySpanMobileDto>();
+ var service_run_record = new Yw.Service.RunRealRecord();
+ foreach (var equipment in all_equipment_list)
+ {
+ var record_list = service_run_record.GetByObjectTypeAndObjectIDOfDay(Yw.Assets.DataType.Equipment, equipment.ID, input.Day);
+ var vm = new RunAnalySpanMobileDto(equipment);
+ vmList.Add(vm);
+ if (record_list == null || record_list.Count < 1)
+ {
+ var vm_span_chunk = new RunAnalySpanChunkDto();
+ vm_span_chunk.RunStatus = Yw.Run.RunStatus.Stop;
+ vm_span_chunk.StartTime = input.Day.Date;
+ vm_span_chunk.EndTime = input.Day.Date.AddDays(1);
+ if (vm_span_chunk.EndTime > DateTime.Now)
+ {
+ vm_span_chunk.EndTime = DateTime.Now;
+ }
+ vm_span_chunk.Duration = (vm_span_chunk.EndTime - vm_span_chunk.StartTime).TotalSeconds;
+ vm.ChunkList.Add(vm_span_chunk);
+ continue;
+ }
+
+ foreach (var record in record_list)
+ {
+ var vm_span_chunk = vm.ChunkList.LastOrDefault();
+ if (vm_span_chunk == null)
+ {
+ vm_span_chunk = new RunAnalySpanChunkDto();
+ vm_span_chunk.RunStatus = record.RSa;
+ vm_span_chunk.StartTime = record.DataTime;
+ vm.ChunkList.Add(vm_span_chunk);
+ }
+ if (record.RSa == vm_span_chunk.RunStatus)
+ {
+ vm_span_chunk.EndTime = record.DataTime;
+ if (vm_span_chunk.EndTime > input.Day.Date.AddDays(1))
+ {
+ vm_span_chunk.EndTime = input.Day.Date.AddDays(1);
+ }
+ vm_span_chunk.Duration = (vm_span_chunk.EndTime - vm_span_chunk.StartTime).TotalSeconds;
+ }
+ else
+ {
+ vm_span_chunk.EndTime = record.DataTime;
+ var vm_span_chunk_next = new RunAnalySpanChunkDto();
+ vm_span_chunk_next.RunStatus = record.RSa;
+ vm_span_chunk_next.StartTime = record.DataTime;
+ vm_span_chunk_next.EndTime = record.DataTime;
+ if (vm_span_chunk_next.EndTime > input.Day.Date.AddDays(1))
+ {
+ vm_span_chunk_next.EndTime = input.Day.Date.AddDays(1);
+ }
+ vm_span_chunk_next.Duration += (vm_span_chunk_next.EndTime - vm_span_chunk_next.StartTime).TotalSeconds;
+ vm.ChunkList.Add(vm_span_chunk_next);
+ }
+ }
+ }
+
+ return vmList;
+ }
+
+
+
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/06-run-analy/dto/RunAnalySpanChunkMobileDto.cs b/IStation.Application.SZJT/99-logic/10-mobile/06-run-analy/dto/RunAnalySpanChunkMobileDto.cs
new file mode 100644
index 0000000..25f752e
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/10-mobile/06-run-analy/dto/RunAnalySpanChunkMobileDto.cs
@@ -0,0 +1,45 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class RunAnalySpanChunkMobileDto
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public RunAnalySpanChunkMobileDto() { }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public RunAnalySpanChunkMobileDto(int runStatus, DateTime startTime, DateTime endTime, double duration)
+ {
+ this.RunStatus = runStatus;
+ this.StartTime = startTime;
+ this.EndTime = endTime;
+ this.Duration = Math.Round(duration, 0);
+ }
+
+ /// <summary>
+ /// 杩愯鐘舵��
+ /// </summary>
+ public int RunStatus { get; set; }
+
+ /// <summary>
+ /// 寮�濮嬫椂闂�
+ /// </summary>
+ public DateTime StartTime { get; set; }
+
+ /// <summary>
+ /// 缁撴潫鏃堕棿
+ /// </summary>
+ public DateTime EndTime { get; set; }
+
+ /// <summary>
+ /// 鎸佺画鏃堕棿锛堢锛�
+ /// </summary>
+ public double Duration { get; set; }
+
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/06-run-analy/dto/RunAnalySpanMobileDto.cs b/IStation.Application.SZJT/99-logic/10-mobile/06-run-analy/dto/RunAnalySpanMobileDto.cs
new file mode 100644
index 0000000..871d833
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/10-mobile/06-run-analy/dto/RunAnalySpanMobileDto.cs
@@ -0,0 +1,28 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class RunAnalySpanMobileDto
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public RunAnalySpanMobileDto(Yw.Model.Equipment rhs)
+ {
+ this.Name = rhs.Name;
+ this.ChunkList = new List<RunAnalySpanChunkDto>();
+ }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鍖哄潡鍒楄〃
+ /// </summary>
+ public List<RunAnalySpanChunkDto> ChunkList { get; set; }
+
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/StationAssets_MobileController.cs b/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/StationAssets_MobileController.cs
new file mode 100644
index 0000000..ff56f46
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/StationAssets_MobileController.cs
@@ -0,0 +1,102 @@
+锘縩amespace IStation.Application
+{
+ /// <summary>
+ /// StationAssets
+ /// </summary>
+ [Route("SZJT/Station/Assets/Mobile")]
+ [ApiDescriptionSettings("SZJT", Name = "娉电珯璧勪骇(鎵嬫満)", Order = 1400)]
+ public class StationAssets_MobileController : IDynamicApiController
+ {
+
+ /// <summary>
+ /// 鑾峰彇鏈虹粍鍒楄〃
+ /// </summary>
+ [Route("GetEnginePumpList@V1.0")]
+ [HttpGet]
+ public List<StationEnginePumpMobileDto> GetEnginePumpList([FromQuery][Required] StationIDInput input)
+ {
+ var keyContent = $"SZJT_Station_Assets_Mobile_GetEnginePumpList_{input.StationID}";
+ var cacheKey = MemoryCacheKeyHelper.GetKey(MemoryCacheKey.WebApiLevel, MemoryCacheKey.Module, keyContent);
+
+ var vm_list = MemoryCacheHelper.GetSet(cacheKey, () =>
+ {
+ var allEquipmentList = new Yw.Service.Equipment().GetByBelongTypeAndBelongID(IStation.DataType.LogicSite, input.StationID);
+ Yw.Service.Equipment.PublishCache(cacheKey);
+ allEquipmentList = allEquipmentList?.Where(x => x.UseStatus == Yw.Model.eUseStatus.Enable).ToList();
+ allEquipmentList = allEquipmentList?.Where(x => x.Flags.Contains(IStation.Flags.鏈虹粍)).ToList();
+ if (allEquipmentList == null || allEquipmentList.Count < 1)
+ {
+ return default;
+ }
+ var vmList = new List<StationEnginePumpMobileDto>();
+ foreach (var equipment in allEquipmentList)
+ {
+ var vm = new StationEnginePumpMobileDto(equipment);
+ vmList.Add(vm);
+ }
+ return vmList;
+ }, CacheHelper.CacheLevel3);
+
+ if (vm_list != null && vm_list.Count > 0)
+ {
+ var service_run = new Yw.Service.RunRealRecord();
+ foreach (var vm in vm_list)
+ {
+ var record = service_run.GetLastRecord(Yw.Assets.DataType.Equipment, vm.ID);
+ if (record != null)
+ {
+ vm.RunStatus = record.RSa;
+ }
+ }
+ }
+ return vm_list;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏈虹粍璇︾粏
+ /// </summary>
+ [Route("GetEnginePumpDetail@V1.0")]
+ [HttpGet]
+ public StationEnginePumpDetailMobileDto GetEnginePumpDetail([FromQuery][Required] IDInput input)
+ {
+ var service_equipment = new Yw.Service.Equipment();
+ var equipment = service_equipment.GetByID(input.ID);
+ if (equipment == null)
+ {
+ throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ }
+ var supplier = new Yw.Service.Supplier().GetByID(equipment.SupplierID);
+
+ var vm = new StationEnginePumpDetailMobileDto(equipment, supplier);
+
+ var equipmentList = service_equipment.GetChildAndSelfByID(equipment.ID);
+ var equipmentIds = equipmentList.Select(x => x.ID).Distinct().ToList();
+
+ var mappingList = new Yw.Service.EquipmentMonitorMapping().GetByEquipmentIds(equipmentIds);
+ if (mappingList != null && mappingList.Count > 0)
+ {
+ var monitorIds = mappingList.Select(x => x.MonitorPointID).Distinct().ToList();
+ var monitorList = new Yw.Service.MonitorPoint().GetExSignalWithSignalTypeByIds(monitorIds);
+ monitorList = monitorList?.Where(x => x.UseStatus == Yw.Model.eUseStatus.Enable).ToList();
+ monitorList = monitorList?.Where(x => x.CronType == Yw.Monitor.eCronType.Real).ToList();
+ if (monitorList != null && monitorList.Count > 0)
+ {
+ vm.LastRecordList = new List<StationEnginePumpDetailLastRecordMobileDto>();
+ var service_monitor_record = new Yw.Service.MonitorRealRecord();
+ foreach (var monitor in monitorList)
+ {
+ var signal = monitor.SignalList.First();
+ var record = service_monitor_record.GetLastRecord(signal.ID);
+ vm.LastRecordList.Add(new StationEnginePumpDetailLastRecordMobileDto(monitor, record));
+ }
+ }
+ }
+
+ return vm;
+
+ }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/dto/StationEnginePumpDetailLastRecordMobileDto.cs b/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/dto/StationEnginePumpDetailLastRecordMobileDto.cs
new file mode 100644
index 0000000..2503b33
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/dto/StationEnginePumpDetailLastRecordMobileDto.cs
@@ -0,0 +1,64 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class StationEnginePumpDetailLastRecordMobileDto
+ {
+ /// <summary>
+ ///
+ /// </summary>
+
+ public StationEnginePumpDetailLastRecordMobileDto(Yw.Model.MonitorPoint_Signal_SignalType monitor, Yw.Model.MonitorRealRecord record)
+ {
+ this.SignalID = monitor.SignalList.First().ID;
+ this.FormatType = monitor.SignalList.First().SignalType.FormatType;
+ this.Name = monitor.Name;
+ this.Code = monitor.SignalList.First().SignalType.Code;
+ this.DataTime = record?.DataTime;
+ this.DataValue = monitor.SignalList.First().GetDisplayValue(record?.DataValue);
+ this.UnitName = monitor.SignalList.First().GetDisplayUnitName();
+ this.DataStatus = record?.DataStatus;
+ }
+
+ /// <summary>
+ /// 淇″彿id
+ /// </summary>
+ public long SignalID { get; set; }
+
+ /// <summary>
+ /// 鏍煎紡绫诲瀷
+ /// </summary>
+ public Yw.Monitor.eFormatType FormatType { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 缂栫爜
+ /// </summary>
+ public string Code { get; set; }
+
+ /// <summary>
+ /// 鏁版嵁鏃堕棿
+ /// </summary>
+ public DateTime? DataTime { get; set; }
+
+ /// <summary>
+ /// 鏁版嵁鍊�
+ /// </summary>
+ public string DataValue { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ public string UnitName { get; set; }
+
+ /// <summary>
+ /// 鏁版嵁鐘舵��
+ /// </summary>
+ public List<string> DataStatus { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/dto/StationEnginePumpDetailMobileDto.cs b/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/dto/StationEnginePumpDetailMobileDto.cs
new file mode 100644
index 0000000..56c2d82
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/dto/StationEnginePumpDetailMobileDto.cs
@@ -0,0 +1,80 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class StationEnginePumpDetailMobileDto
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public StationEnginePumpDetailMobileDto(Yw.Model.Equipment rhs, Yw.Model.Supplier supplier = null)
+ {
+ this.ID = rhs.ID;
+ this.Name = rhs.Name;
+ this.NO = rhs.NO;
+ this.ModelType = rhs.ModelType;
+ this.Specification = rhs.Specification;
+ this.SupplierName = supplier?.Name;
+ this.Paras = rhs.Paras;
+ this.Flags = rhs.Flags;
+ this.TagName = rhs.TagName;
+ this.Description = rhs.Description;
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public long ID { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public string NO { get; set; }
+
+ /// <summary>
+ /// 鍨嬪彿
+ /// </summary>
+ public string ModelType { get; set; }
+
+ /// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ public string Specification { get; set; }
+
+ /// <summary>
+ /// 鍘傚晢
+ /// </summary>
+ public string SupplierName { get; set; }
+
+ /// <summary>
+ /// 鍙傛暟
+ /// </summary>
+ public Dictionary<string, string> Paras { get; set; }
+
+ /// <summary>
+ /// 鏍囩
+ /// </summary>
+ public List<string> Flags { get; set; }
+
+ /// <summary>
+ /// 鏍囧織
+ /// </summary>
+ public string TagName { get; set; }
+
+ /// <summary>
+ /// 璇存槑
+ /// </summary>
+ public string Description { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public List<StationEnginePumpDetailLastRecordMobileDto> LastRecordList { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/dto/StationEnginePumpMobileDto.cs b/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/dto/StationEnginePumpMobileDto.cs
new file mode 100644
index 0000000..3436e7b
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/dto/StationEnginePumpMobileDto.cs
@@ -0,0 +1,53 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class StationEnginePumpMobileDto
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public StationEnginePumpMobileDto(Yw.Model.Equipment rhs)
+ {
+ this.ID = rhs.ID;
+ this.Name = rhs.Name;
+ this.ModelType = rhs.ModelType;
+ this.Specification = rhs.Specification;
+
+ }
+
+ /// <summary>
+ /// 鏈虹粍id
+ /// </summary>
+ public long ID { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鍨嬪彿
+ /// </summary>
+ public string ModelType { get; set; }
+
+ /// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ public string Specification { get; set; }
+
+ /// <summary>
+ /// 鍦板潃
+ /// </summary>
+ public string Address { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public int? RunStatus { get; set; }
+
+
+
+ }
+}
diff --git a/IStation.Application.SZJT/IStation.Application.SZJT.csproj b/IStation.Application.SZJT/IStation.Application.SZJT.csproj
index 2613797..40182ca 100644
--- a/IStation.Application.SZJT/IStation.Application.SZJT.csproj
+++ b/IStation.Application.SZJT/IStation.Application.SZJT.csproj
@@ -32,10 +32,10 @@
<ItemGroup>
<PackageReference Include="Yw.Application.Core" Version="1.3.0" />
- <PackageReference Include="Yw.Service.Assets.Core" Version="1.1.5" />
+ <PackageReference Include="Yw.Service.Assets.Core" Version="1.2.1" />
<PackageReference Include="Yw.Service.DMA.Core" Version="1.0.4" />
<PackageReference Include="Yw.Service.Map.Core" Version="1.0.3" />
- <PackageReference Include="Yw.Service.Monitor.Core" Version="1.3.9" />
+ <PackageReference Include="Yw.Service.Monitor.Core" Version="1.4.3" />
<PackageReference Include="Yw.Service.Repair.Core" Version="1.0.1" />
<PackageReference Include="Yw.Service.Run.Core" Version="1.0.2" />
</ItemGroup>
diff --git a/IStation.Entry.SZJT/IStation.Entry.SZJT.csproj b/IStation.Entry.SZJT/IStation.Entry.SZJT.csproj
index 7b152da..cedda4f 100644
--- a/IStation.Entry.SZJT/IStation.Entry.SZJT.csproj
+++ b/IStation.Entry.SZJT/IStation.Entry.SZJT.csproj
@@ -14,14 +14,14 @@
<ItemGroup>
<PackageReference Include="Yw.Application.ArtImage.Core" Version="1.1.2" />
- <PackageReference Include="Yw.Application.Assets.Core" Version="1.2.3" />
- <PackageReference Include="Yw.Application.Basic.Core" Version="1.2.0" />
+ <PackageReference Include="Yw.Application.Assets.Core" Version="1.2.5" />
+ <PackageReference Include="Yw.Application.Basic.Core" Version="1.2.1" />
<PackageReference Include="Yw.Application.Bimface.Core" Version="1.0.3" />
<PackageReference Include="Yw.Application.Dict.Core" Version="1.1.0" />
<PackageReference Include="Yw.Application.DMA.Core" Version="1.0.4" />
<PackageReference Include="Yw.Application.DOCS.Core" Version="1.0.1" />
<PackageReference Include="Yw.Application.Map.Core" Version="1.0.4" />
- <PackageReference Include="Yw.Application.Monitor.Core" Version="1.6.0" />
+ <PackageReference Include="Yw.Application.Monitor.Core" Version="1.6.4" />
<PackageReference Include="Yw.Application.Repair.Core" Version="1.0.2" />
<PackageReference Include="Yw.Application.Unit.Core" Version="1.1.1" />
</ItemGroup>
diff --git a/IStation.Entry.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user b/IStation.Entry.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user
index aab2fda..c95aa81 100644
--- a/IStation.Entry.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/IStation.Entry.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,6 +5,6 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\WorkData\git\istation\szjt\IStation.Entry.SZJT\bin\Release\net6.0\publish\</_PublishTargetUrl>
- <History>True|2023-12-26T02:49:59.5124896Z;True|2023-12-26T10:10:53.5396234+08:00;True|2023-12-25T15:30:59.3409132+08:00;True|2023-12-25T15:26:43.1943347+08:00;True|2023-12-25T10:08:29.7964560+08:00;True|2023-12-21T10:30:55.0589855+08:00;True|2023-12-19T21:25:45.9098277+08:00;True|2023-12-16T12:52:46.7024463+08:00;True|2023-12-14T16:16:02.6188884+08:00;True|2023-12-14T16:03:53.1458158+08:00;True|2023-12-14T15:59:33.3947428+08:00;True|2023-12-14T15:53:09.8869780+08:00;True|2023-12-14T14:17:07.2707485+08:00;True|2023-12-14T11:49:15.9699053+08:00;False|2023-12-14T11:48:41.4121185+08:00;True|2023-12-13T17:28:38.2180193+08:00;True|2023-12-13T14:47:22.2493536+08:00;True|2023-12-13T14:31:45.6098784+08:00;True|2023-12-13T14:05:08.5014675+08:00;True|2023-12-13T14:01:37.7165974+08:00;True|2023-12-13T13:50:57.4832531+08:00;True|2023-12-13T13:20:55.2902900+08:00;True|2023-12-13T12:01:09.6397101+08:00;True|2023-12-13T11:53:51.3171154+08:00;True|2023-12-13T11:18:29.2505125+08:00;True|2023-12-13T09:48:22.2436154+08:00;True|2023-12-12T11:49:25.2723311+08:00;True|2023-12-11T14:05:58.1086840+08:00;True|2023-12-11T09:31:35.0365077+08:00;True|2023-12-05T18:00:29.7005601+08:00;True|2023-12-05T17:35:46.7846869+08:00;True|2023-12-05T17:29:36.5936716+08:00;True|2023-12-04T19:50:38.7216121+08:00;True|2023-12-02T14:06:28.8643257+08:00;True|2023-11-30T16:54:56.0879009+08:00;True|2023-11-30T15:49:27.5213126+08:00;True|2023-11-30T13:42:14.9061099+08:00;False|2023-11-30T13:41:50.2796105+08:00;False|2023-11-30T13:41:42.4700953+08:00;True|2023-11-30T10:23:50.6226599+08:00;True|2023-11-30T09:22:54.2133326+08:00;True|2023-11-29T16:32:53.3651373+08:00;True|2023-11-29T09:19:39.1127566+08:00;True|2023-11-28T17:25:14.9642204+08:00;True|2023-11-28T16:53:30.7550754+08:00;True|2023-11-28T09:57:02.3264015+08:00;True|2023-11-27T14:26:33.6153027+08:00;True|2023-11-27T13:33:46.1964012+08:00;True|2023-11-27T13:21:38.2133314+08:00;True|2023-11-24T14:12:06.2053905+08:00;True|2023-11-23T15:38:30.0872291+08:00;True|2023-11-15T19:27:36.4861114+08:00;True|2023-11-15T14:16:33.6004541+08:00;True|2023-11-15T14:02:06.1224051+08:00;True|2023-11-15T09:35:35.1770813+08:00;True|2023-11-10T14:06:46.1528992+08:00;True|2023-11-08T14:07:13.3792249+08:00;True|2023-11-08T13:58:21.2455396+08:00;True|2023-11-08T13:34:05.8131818+08:00;True|2023-11-08T11:58:01.9187650+08:00;True|2023-11-07T14:11:15.6278203+08:00;True|2023-11-07T14:05:43.3330586+08:00;True|2023-10-27T08:30:17.2959726+08:00;True|2023-10-27T08:23:59.8360129+08:00;True|2023-10-25T20:36:54.7517897+08:00;True|2023-10-24T23:27:01.1980187+08:00;True|2023-10-24T22:57:21.3872591+08:00;True|2023-10-17T09:26:15.4157626+08:00;True|2023-10-16T16:44:05.1411215+08:00;True|2023-10-10T14:24:00.3649304+08:00;True|2023-10-10T14:12:16.4050462+08:00;True|2023-10-10T13:43:17.4397783+08:00;True|2023-10-08T16:16:16.4721892+08:00;True|2023-10-08T14:27:40.6092129+08:00;True|2023-10-08T13:36:44.2969175+08:00;True|2023-10-08T13:21:21.1105671+08:00;True|2023-10-08T11:41:25.6876188+08:00;True|2023-10-08T09:39:46.1146411+08:00;True|2023-09-26T14:26:57.6168193+08:00;True|2023-09-21T13:54:19.1780900+08:00;True|2023-09-21T13:16:00.2957740+08:00;True|2023-09-21T11:28:36.3091944+08:00;True|2023-09-21T11:18:20.1060798+08:00;True|2023-09-13T16:00:49.4080881+08:00;True|2023-09-11T13:53:38.8582724+08:00;True|2023-09-01T10:32:37.4923361+08:00;True|2023-08-30T16:52:43.1952609+08:00;True|2023-08-30T13:41:35.0430741+08:00;True|2023-08-28T14:53:24.2454140+08:00;True|2023-08-28T13:50:55.9362462+08:00;True|2023-08-28T10:00:17.0366755+08:00;True|2023-08-25T15:41:23.8727088+08:00;True|2023-08-24T16:47:54.1391198+08:00;True|2023-08-24T16:40:29.0473991+08:00;True|2023-08-22T15:02:27.5312918+08:00;True|2023-08-22T11:18:43.6918732+08:00;True|2023-08-21T15:10:42.9223597+08:00;True|2023-08-21T14:21:08.1887373+08:00;True|2023-08-21T11:56:07.5304445+08:00;True|2023-08-18T16:57:57.0506312+08:00;True|2023-08-18T13:51:54.9145260+08:00;True|2023-08-17T14:52:44.6557301+08:00;True|2023-08-17T14:15:19.8255432+08:00;True|2023-08-17T14:03:01.1586247+08:00;True|2023-08-17T11:46:51.6685579+08:00;True|2023-08-16T11:12:27.1684542+08:00;True|2023-08-15T16:59:09.4901359+08:00;True|2023-08-10T14:08:04.8032876+08:00;True|2023-08-10T13:55:01.9698355+08:00;True|2023-08-10T10:43:44.0440039+08:00;True|2023-08-10T10:12:03.9359243+08:00;True|2023-08-09T15:07:46.6906781+08:00;True|2023-08-09T13:12:06.7912004+08:00;True|2023-08-09T10:23:24.5864225+08:00;True|2023-08-08T17:38:10.4753030+08:00;True|2023-08-08T12:56:08.9783211+08:00;True|2023-08-06T09:18:33.3703637+08:00;True|2023-08-03T11:01:58.9814864+08:00;True|2023-08-03T10:26:08.4681748+08:00;True|2023-08-02T20:33:35.0425049+08:00;True|2023-08-02T17:31:18.4675932+08:00;True|2023-08-02T16:04:16.8761862+08:00;True|2023-08-02T13:48:38.9129192+08:00;True|2023-08-02T13:45:00.6546267+08:00;True|2023-08-01T15:26:25.0389689+08:00;True|2023-08-01T14:08:10.9121758+08:00;True|2023-07-31T13:35:10.1220213+08:00;True|2023-07-31T09:20:11.2607880+08:00;True|2023-07-28T13:44:35.4317136+08:00;True|2023-07-27T10:40:46.5453757+08:00;True|2023-07-27T09:16:57.7421426+08:00;True|2023-07-26T17:10:56.0976913+08:00;True|2023-07-26T12:01:33.5766311+08:00;True|2023-07-25T18:07:38.5726960+08:00;True|2023-07-25T17:42:39.3625959+08:00;True|2023-07-25T17:04:09.8723273+08:00;True|2023-07-25T16:28:14.1819137+08:00;True|2023-07-24T14:11:28.2113907+08:00;True|2023-07-24T12:05:09.0376032+08:00;True|2023-07-24T09:36:39.6541522+08:00;True|2023-07-19T12:25:56.9887829+08:00;True|2023-07-17T13:00:04.0123733+08:00;True|2023-07-13T12:13:14.7927242+08:00;True|2023-07-13T11:46:24.1368807+08:00;True|2023-07-13T10:24:33.1684712+08:00;True|2023-06-26T11:38:29.6648988+08:00;True|2023-06-21T16:17:40.6226554+08:00;True|2023-06-21T13:30:18.8163322+08:00;True|2023-06-21T13:19:43.9290154+08:00;True|2023-06-21T11:35:28.3376504+08:00;</History>
+ <History>True|2024-01-03T04:04:02.7753609Z;True|2024-01-03T11:08:38.0680764+08:00;True|2024-01-03T10:52:12.8371853+08:00;True|2024-01-03T10:03:29.0482464+08:00;True|2023-12-28T09:09:43.7988141+08:00;True|2023-12-26T11:51:52.4664582+08:00;True|2023-12-26T10:49:59.5124896+08:00;True|2023-12-26T10:10:53.5396234+08:00;True|2023-12-25T15:30:59.3409132+08:00;True|2023-12-25T15:26:43.1943347+08:00;True|2023-12-25T10:08:29.7964560+08:00;True|2023-12-21T10:30:55.0589855+08:00;True|2023-12-19T21:25:45.9098277+08:00;True|2023-12-16T12:52:46.7024463+08:00;True|2023-12-14T16:16:02.6188884+08:00;True|2023-12-14T16:03:53.1458158+08:00;True|2023-12-14T15:59:33.3947428+08:00;True|2023-12-14T15:53:09.8869780+08:00;True|2023-12-14T14:17:07.2707485+08:00;True|2023-12-14T11:49:15.9699053+08:00;False|2023-12-14T11:48:41.4121185+08:00;True|2023-12-13T17:28:38.2180193+08:00;True|2023-12-13T14:47:22.2493536+08:00;True|2023-12-13T14:31:45.6098784+08:00;True|2023-12-13T14:05:08.5014675+08:00;True|2023-12-13T14:01:37.7165974+08:00;True|2023-12-13T13:50:57.4832531+08:00;True|2023-12-13T13:20:55.2902900+08:00;True|2023-12-13T12:01:09.6397101+08:00;True|2023-12-13T11:53:51.3171154+08:00;True|2023-12-13T11:18:29.2505125+08:00;True|2023-12-13T09:48:22.2436154+08:00;True|2023-12-12T11:49:25.2723311+08:00;True|2023-12-11T14:05:58.1086840+08:00;True|2023-12-11T09:31:35.0365077+08:00;True|2023-12-05T18:00:29.7005601+08:00;True|2023-12-05T17:35:46.7846869+08:00;True|2023-12-05T17:29:36.5936716+08:00;True|2023-12-04T19:50:38.7216121+08:00;True|2023-12-02T14:06:28.8643257+08:00;True|2023-11-30T16:54:56.0879009+08:00;True|2023-11-30T15:49:27.5213126+08:00;True|2023-11-30T13:42:14.9061099+08:00;False|2023-11-30T13:41:50.2796105+08:00;False|2023-11-30T13:41:42.4700953+08:00;True|2023-11-30T10:23:50.6226599+08:00;True|2023-11-30T09:22:54.2133326+08:00;True|2023-11-29T16:32:53.3651373+08:00;True|2023-11-29T09:19:39.1127566+08:00;True|2023-11-28T17:25:14.9642204+08:00;True|2023-11-28T16:53:30.7550754+08:00;True|2023-11-28T09:57:02.3264015+08:00;True|2023-11-27T14:26:33.6153027+08:00;True|2023-11-27T13:33:46.1964012+08:00;True|2023-11-27T13:21:38.2133314+08:00;True|2023-11-24T14:12:06.2053905+08:00;True|2023-11-23T15:38:30.0872291+08:00;True|2023-11-15T19:27:36.4861114+08:00;True|2023-11-15T14:16:33.6004541+08:00;True|2023-11-15T14:02:06.1224051+08:00;True|2023-11-15T09:35:35.1770813+08:00;True|2023-11-10T14:06:46.1528992+08:00;True|2023-11-08T14:07:13.3792249+08:00;True|2023-11-08T13:58:21.2455396+08:00;True|2023-11-08T13:34:05.8131818+08:00;True|2023-11-08T11:58:01.9187650+08:00;True|2023-11-07T14:11:15.6278203+08:00;True|2023-11-07T14:05:43.3330586+08:00;True|2023-10-27T08:30:17.2959726+08:00;True|2023-10-27T08:23:59.8360129+08:00;True|2023-10-25T20:36:54.7517897+08:00;True|2023-10-24T23:27:01.1980187+08:00;True|2023-10-24T22:57:21.3872591+08:00;True|2023-10-17T09:26:15.4157626+08:00;True|2023-10-16T16:44:05.1411215+08:00;True|2023-10-10T14:24:00.3649304+08:00;True|2023-10-10T14:12:16.4050462+08:00;True|2023-10-10T13:43:17.4397783+08:00;True|2023-10-08T16:16:16.4721892+08:00;True|2023-10-08T14:27:40.6092129+08:00;True|2023-10-08T13:36:44.2969175+08:00;True|2023-10-08T13:21:21.1105671+08:00;True|2023-10-08T11:41:25.6876188+08:00;True|2023-10-08T09:39:46.1146411+08:00;True|2023-09-26T14:26:57.6168193+08:00;True|2023-09-21T13:54:19.1780900+08:00;True|2023-09-21T13:16:00.2957740+08:00;True|2023-09-21T11:28:36.3091944+08:00;True|2023-09-21T11:18:20.1060798+08:00;True|2023-09-13T16:00:49.4080881+08:00;True|2023-09-11T13:53:38.8582724+08:00;True|2023-09-01T10:32:37.4923361+08:00;True|2023-08-30T16:52:43.1952609+08:00;True|2023-08-30T13:41:35.0430741+08:00;True|2023-08-28T14:53:24.2454140+08:00;True|2023-08-28T13:50:55.9362462+08:00;True|2023-08-28T10:00:17.0366755+08:00;True|2023-08-25T15:41:23.8727088+08:00;True|2023-08-24T16:47:54.1391198+08:00;True|2023-08-24T16:40:29.0473991+08:00;True|2023-08-22T15:02:27.5312918+08:00;True|2023-08-22T11:18:43.6918732+08:00;True|2023-08-21T15:10:42.9223597+08:00;True|2023-08-21T14:21:08.1887373+08:00;True|2023-08-21T11:56:07.5304445+08:00;True|2023-08-18T16:57:57.0506312+08:00;True|2023-08-18T13:51:54.9145260+08:00;True|2023-08-17T14:52:44.6557301+08:00;True|2023-08-17T14:15:19.8255432+08:00;True|2023-08-17T14:03:01.1586247+08:00;True|2023-08-17T11:46:51.6685579+08:00;True|2023-08-16T11:12:27.1684542+08:00;True|2023-08-15T16:59:09.4901359+08:00;True|2023-08-10T14:08:04.8032876+08:00;True|2023-08-10T13:55:01.9698355+08:00;True|2023-08-10T10:43:44.0440039+08:00;True|2023-08-10T10:12:03.9359243+08:00;True|2023-08-09T15:07:46.6906781+08:00;True|2023-08-09T13:12:06.7912004+08:00;True|2023-08-09T10:23:24.5864225+08:00;True|2023-08-08T17:38:10.4753030+08:00;True|2023-08-08T12:56:08.9783211+08:00;True|2023-08-06T09:18:33.3703637+08:00;True|2023-08-03T11:01:58.9814864+08:00;True|2023-08-03T10:26:08.4681748+08:00;True|2023-08-02T20:33:35.0425049+08:00;True|2023-08-02T17:31:18.4675932+08:00;True|2023-08-02T16:04:16.8761862+08:00;True|2023-08-02T13:48:38.9129192+08:00;True|2023-08-02T13:45:00.6546267+08:00;True|2023-08-01T15:26:25.0389689+08:00;True|2023-08-01T14:08:10.9121758+08:00;True|2023-07-31T13:35:10.1220213+08:00;True|2023-07-31T09:20:11.2607880+08:00;True|2023-07-28T13:44:35.4317136+08:00;True|2023-07-27T10:40:46.5453757+08:00;True|2023-07-27T09:16:57.7421426+08:00;True|2023-07-26T17:10:56.0976913+08:00;True|2023-07-26T12:01:33.5766311+08:00;True|2023-07-25T18:07:38.5726960+08:00;True|2023-07-25T17:42:39.3625959+08:00;True|2023-07-25T17:04:09.8723273+08:00;True|2023-07-25T16:28:14.1819137+08:00;True|2023-07-24T14:11:28.2113907+08:00;True|2023-07-24T12:05:09.0376032+08:00;True|2023-07-24T09:36:39.6541522+08:00;True|2023-07-19T12:25:56.9887829+08:00;True|2023-07-17T13:00:04.0123733+08:00;True|2023-07-13T12:13:14.7927242+08:00;True|2023-07-13T11:46:24.1368807+08:00;True|2023-07-13T10:24:33.1684712+08:00;True|2023-06-26T11:38:29.6648988+08:00;True|2023-06-21T16:17:40.6226554+08:00;True|2023-06-21T13:30:18.8163322+08:00;True|2023-06-21T13:19:43.9290154+08:00;True|2023-06-21T11:35:28.3376504+08:00;</History>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/IStation.Server.SZJT/IStation.Server.SZJT.csproj b/IStation.Server.SZJT/IStation.Server.SZJT.csproj
index e28e09e..0cae0fd 100644
--- a/IStation.Server.SZJT/IStation.Server.SZJT.csproj
+++ b/IStation.Server.SZJT/IStation.Server.SZJT.csproj
@@ -11,7 +11,7 @@
<PackageReference Include="Yw.Log4Net.Core" Version="1.0.0" />
<PackageReference Include="Yw.Quartz.Core" Version="1.0.0" />
<PackageReference Include="Yw.Service.Assets.Core" Version="1.1.5" />
- <PackageReference Include="Yw.Service.Monitor.Core" Version="1.3.9" />
+ <PackageReference Include="Yw.Service.Monitor.Core" Version="1.4.0" />
<PackageReference Include="Yw.Service.Run.Core" Version="1.0.2" />
</ItemGroup>
diff --git a/IStation.Service.SZJT/IStation.Service.SZJT.csproj b/IStation.Service.SZJT/IStation.Service.SZJT.csproj
index 9219781..e199e1d 100644
--- a/IStation.Service.SZJT/IStation.Service.SZJT.csproj
+++ b/IStation.Service.SZJT/IStation.Service.SZJT.csproj
@@ -38,7 +38,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Yw.Service.Basic.Core" Version="1.2.0" />
+ <PackageReference Include="Yw.Service.Basic.Core" Version="1.2.1" />
</ItemGroup>
</Project>
--
Gitblit v1.9.3