优化部分接口

lixiaojun

2024-05-15 e45eab5980c08520aee01a72224ccdfd12600543

优化部分接口

 IStation.Application.SZJT/99-logic/03-station-panel/dto/StationPanelMonitorKpiLastStatusDto.cs

@@ -13,7 +13,7 @@
            this.EquipmentID = equipment.ID;
            this.Name = equipment.Name;
            this.DataTime = record?.DataTime;
            this.RunStatus = record == null ? Yw.Run.RunStatus.Stop : record.RSa;
            this.RunStatus = record == null ? Yw.Run.RunStatus.Shut : record.RSa;
        }

        /// <summary>

 IStation.Application.SZJT/99-logic/04-station-list/dto/StationListMonitorKpiLastStatusDto.cs

@@ -13,7 +13,7 @@
            this.EquipmentID = equipment.ID;
            this.Name = equipment.Name;
            this.DataTime = record?.DataTime;
            this.RunStatus = record == null ? Yw.Run.RunStatus.Stop : record.RSa;
            this.RunStatus = record == null ? Yw.Run.RunStatus.Shut : record.RSa;
        }

        /// <summary>

 IStation.Application.SZJT/99-logic/05-station-map/dto/StationMapMonitorKpiLastStatusDto.cs

@@ -13,7 +13,7 @@
            this.EquipmentID = equipment.ID;
            this.Name = equipment.Name;
            this.DataTime = record?.DataTime;
            this.RunStatus = record == null ? Yw.Run.RunStatus.Stop : record.RSa;
            this.RunStatus = record == null ? Yw.Run.RunStatus.Shut : record.RSa;
        }

        /// <summary>

 IStation.Application.SZJT/99-logic/06-run-analy/RunAnaly_LogicController.cs

@@ -52,7 +52,7 @@
                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.RunStatus = Yw.Run.RunStatus.Shut;
                    vm_span_chunk.StartTime = input.Day.Date;
                    vm_span_chunk.EndTime = input.Day.Date.AddDays(1);
                    if (vm_span_chunk.EndTime > DateTime.Now)

 IStation.Application.SZJT/99-logic/10-mobile/01-station-list/StationList_MobileController.cs

 IStation.Application.SZJT/99-logic/10-mobile/05-map/dto/1-station/StationMapMonitorKpiLastStatusMobileDto.cs

@@ -13,7 +13,7 @@
            this.EquipmentID = equipment.ID;
            this.Name = equipment.Name;
            this.DataTime = record?.DataTime;
            this.RunStatus = record == null ? Yw.Run.RunStatus.Stop : record.RSa;
            this.RunStatus = record == null ? Yw.Run.RunStatus.Shut : record.RSa;
        }

        /// <summary>

 IStation.Application.SZJT/99-logic/10-mobile/06-run-analy/RunAnaly_MobileController.cs

@@ -31,7 +31,7 @@
                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.RunStatus = Yw.Run.RunStatus.Shut;
                    vm_span_chunk.StartTime = input.Day.Date;
                    vm_span_chunk.EndTime = input.Day.Date.AddDays(1);
                    if (vm_span_chunk.EndTime > DateTime.Now)

 IStation.Application.SZJT/99-logic/10-mobile/08-station-statistics/dto/StationStatisticsDayParasMobileDto.cs

@@ -6,17 +6,17 @@
    public class StationStatisticsDayParasMobileDto
    {
        /// <summary>
        /// 
        /// æ˜¯å¦å‰ä¸€å¤©
        /// </summary>
        public bool Pre { get; set; } = false;

        /// <summary>
        /// 
        /// å¼€å§‹æ—¶
        /// </summary>
        public int Start { get; set; } = 0;

        /// <summary>
        /// 
        /// ç»“束时
        /// </summary>
        public int End { get; set; } = 24;
    }

 IStation.Application.SZJT/99-logic/10-mobile/08-station-statistics/dto/StationStatisticsDayRecordMobileDto.cs

@@ -11,12 +11,12 @@
        public DateTime Day { get; set; }

        /// <summary>
        /// 
        /// ä¾›æ°´é‡
        /// </summary>
        public double? Ws { get; set; }

        /// <summary>
        /// 
        /// ç”¨ç”µé‡
        /// </summary>
        public double? Ed { get; set; }
    }

 IStation.Application.SZJT/99-logic/11-big-screen/BigScreen_LogicController.cs

@@ -1,4 +1,6 @@
namespace IStation.Application
using Microsoft.VisualBasic;

namespace IStation.Application
{
    /// <summary>
    /// BigScreen
@@ -11,7 +13,7 @@
        #region æ‰€æœ‰

        /// <summary>
        /// èŽ·å–所有泵站kpi信息
        /// èŽ·å–所有泵站kpi信息(待完善)
        /// </summary>
        [Route("GetAllStationKpiInfo@V1.0")]
        [HttpGet]
@@ -370,19 +372,43 @@

            var dtEnd = DateTime.Now.Date;
            var dtStart = dtEnd.AddMonths(-1);
            List<Yw.Model.MonitorDayRecord> allWsRecordList = null;//所有供水量
            List<Yw.Model.MonitorDayRecord> allPsRecordList = null;//所有用电量
            Yw.Model.Signal_SignalType signalWs = null;//用水量信号
            Yw.Model.Signal_SignalType signalPs = null;//用电量信号
            var service_day_record = new Lazy<Yw.Service.MonitorDayRecord>(() => new Yw.Service.MonitorDayRecord());
            var allMonitorList = new Yw.Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(IStation.DataType.LogicSite, input.StationID, Yw.Monitor.eCronType.EachDay);
            if (allMonitorList != null && allMonitorList.Count > 0)
            {
                var monitorWs = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.累积流量));
                if (monitorWs != null)
                {
                    signalWs = monitorWs.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.累积流量);
                    allWsRecordList = service_day_record.Value.GetBySignalIDOfDayRange(signalWs.ID, dtStart, dtEnd);
                }
                var monitorPs = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.有功电度));
                if (monitorPs != null)
                {
                    signalPs = monitorPs.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.有功电度);
                    allPsRecordList = service_day_record.Value.GetBySignalIDOfDayRange(signalPs.ID, dtStart, dtEnd);
                }
            }

            for (DateTime dt = dtStart; dt <= dtEnd; dt = dt.AddDays(1))
            {
                var ws = allWsRecordList?.Find(x => x.DataDay.Date == dt.Date);
                vm.Ws.Add(new BigScreenSingleStationQuotaItemDto()
                {
                    Day = dt,
                    Value = RandomHelper.Random(1000, 10000).ToString(),
                    UnitName = "m³"
                    Value = ws == null ? "0" : signalWs.GetDisplayValue(ws.DataValue),
                    UnitName = signalWs?.GetDisplayUnitNames()
                });
                var ps = allPsRecordList.Find(x => x.DataDay.Date == dt.Date);
                vm.Ps.Add(new BigScreenSingleStationQuotaItemDto()
                {
                    Day = dt,
                    Value = RandomHelper.Random(2000, 3000).ToString(),
                    UnitName = "kW‧h"
                    Value = ps == null ? "0" : signalPs.GetDisplayValue(ps.DataValue),
                    UnitName = signalPs?.GetDisplayUnitNames()
                });
            }
            return vm;
@@ -486,7 +512,7 @@
        }

        /// <summary>
        /// èŽ·å–单泵站工单Kpi信息
        /// èŽ·å–单泵站工单Kpi信息(待完善)
        /// </summary>
        [Route("GetSingleStationRepairKpiInfo@V1.0")]
        [HttpGet]
@@ -578,42 +604,45 @@
        public List<BigScreenSingleStationAlarmItemDto> GetSingleStationAlarmInfo([FromQuery][Required] StationIDInput input)
        {
            var vmList = new List<BigScreenSingleStationAlarmItemDto>();
            vmList.Add(new BigScreenSingleStationAlarmItemDto()
            var allEquipmentList = new Yw.Service.Equipment().GetByBelongTypeAndBelongID(IStation.DataType.LogicSite, input.StationID);
            if (allEquipmentList == null || allEquipmentList.Count < 1)
            {
                ID = 1,
                Name = "1#机组",
                Content = "出口压力过低，请关注状态变化"
            });
            vmList.Add(new BigScreenSingleStationAlarmItemDto()
                return vmList;
            }
            var allEnginePumpList = allEquipmentList.Where(x => x.Flags.Contains(IStation.Flags.机组)).ToList();
            if (allEnginePumpList.Count < 1)
            {
                ID = 2,
                Name = "2#机组",
                Content = "瞬时流量数据异常，请检修"
            });
            vmList.Add(new BigScreenSingleStationAlarmItemDto()
                return vmList;
            }
            var service_monitor_maping = new Yw.Service.EquipmentMonitorMapping();
            var service_monitor = new Lazy<Yw.Service.MonitorPoint>(() => new Yw.Service.MonitorPoint());
            var servie_alarm_record = new Lazy<Yw.Service.MonitorValueAlarmRecord>(() => new Yw.Service.MonitorValueAlarmRecord());
            foreach (var enginePump in allEnginePumpList)
            {
                ID = 3,
                Name = "2#机组",
                Content = "瞬时流量数据异常，请检修"
            });
            vmList.Add(new BigScreenSingleStationAlarmItemDto()
            {
                ID = 4,
                Name = "2#机组",
                Content = "瞬时流量数据异常，请检修"
            });
            vmList.Add(new BigScreenSingleStationAlarmItemDto()
            {
                ID = 5,
                Name = "2#机组",
                Content = "瞬时流量数据异常，请检修"
            });
            vmList.Add(new BigScreenSingleStationAlarmItemDto()
            {
                ID = 6,
                Name = "2#机组",
                Content = "瞬时流量数据异常，请检修"
            });
                var allMonitorMappingList = service_monitor_maping.GetByEquipmentIDContainsChildren(enginePump.ID);
                if (allMonitorMappingList != null && allMonitorMappingList.Count > 0)
                {
                    var allMonitorIds = allMonitorMappingList.Select(x => x.MonitorPointID).Distinct().ToList();
                    var allMonitorList = service_monitor.Value.GetExSignalWithSignalTypeByIds(allMonitorIds);
                    var allSignalList = allMonitorList.SelectMany(x => x.SignalList).ToList();
                    var allSignalIds = allSignalList.Select(x => x.ID).Distinct().ToList();
                    var allAlarmList = servie_alarm_record.Value.GetLastListBySignalIds(allSignalIds, 3);
                    if (allAlarmList != null && allAlarmList.Count > 0)
                    {
                        foreach (var alarm in allAlarmList)
                        {
                            var vm = new BigScreenSingleStationAlarmItemDto()
                            {
                                ID = alarm.ID,
                                Name = enginePump.Name,
                                Content = alarm.AlarmName
                            };
                            vmList.Add(vm);
                        }
                    }
                }
            }

            return vmList;
        }


 IStation.Application.SZJT/IStation.Application.SZJT.csproj

@@ -31,11 +31,15 @@
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Application.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Service.DMA.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Service.Map.Core" Version="3.0.3" />
    <PackageReference Include="Yw.Service.Repair.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Service.Run.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Application.Core" Version="3.0.7" />
    <PackageReference Include="Yw.Dto.Assets.Core" Version="3.1.5" />
    <PackageReference Include="Yw.Dto.Basic.Core" Version="3.0.9" />
    <PackageReference Include="Yw.Dto.DMA.Core" Version="3.0.3" />
    <PackageReference Include="Yw.Dto.Map.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Dto.Monitor.Core" Version="3.3.1" />
    <PackageReference Include="Yw.Dto.MonitorRelation.Core" Version="3.1.1" />
    <PackageReference Include="Yw.Dto.Repair.Core" Version="3.0.3" />
    <PackageReference Include="Yw.Dto.Run.Core" Version="3.0.9" />
  </ItemGroup>

  <ItemGroup>

 IStation.Entry.SZJT/IStation.Entry.SZJT.csproj

@@ -13,17 +13,18 @@
  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>

  <ItemGroup>
    <PackageReference Include="Yw.Application.ArtImage.Core" Version="3.0.2" />
    <PackageReference Include="Yw.Application.Assets.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Application.Basic.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Application.Bimface.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Application.Dict.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Application.DMA.Core" Version="3.0.2" />
    <PackageReference Include="Yw.Application.DOCS.Core" Version="3.0.2" />
    <PackageReference Include="Yw.Application.Map.Core" Version="3.0.3" />
    <PackageReference Include="Yw.Application.Monitor.Core" Version="3.0.6" />
    <PackageReference Include="Yw.Application.Repair.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Application.Unit.Core" Version="3.0.2" />
    <PackageReference Include="Yw.Application.Assets.Core" Version="3.1.5" />
    <PackageReference Include="Yw.Application.Basic.Core" Version="3.1.0" />
    <PackageReference Include="Yw.Application.Bimface.Core" Version="3.0.2" />
    <PackageReference Include="Yw.Application.Dict.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Application.DMA.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Application.DOCS.Core" Version="3.0.6" />
    <PackageReference Include="Yw.Application.Map.Core" Version="3.0.6" />
    <PackageReference Include="Yw.Application.Monitor.Core" Version="3.3.1" />
    <PackageReference Include="Yw.Application.MonitorRelation.Core" Version="3.1.1" />
    <PackageReference Include="Yw.Application.Repair.Core" Version="3.0.3" />
    <PackageReference Include="Yw.Application.Run.Core" Version="3.0.9" />
    <PackageReference Include="Yw.Application.Unit.Core" Version="3.0.6" />
  </ItemGroup>

  <ItemGroup>

 IStation.Entry.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,6 +5,7 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>D:\WorkData\git\istation\szjt\IStation.Entry.SZJT\bin\Release\net6.0\publish\</_PublishTargetUrl>
    <History>True|2024-04-04T03:28:14.8768964Z;True|2024-04-04T09:39:21.6552156+08:00;True|2024-03-11T16:36:41.1901368+08:00;True|2024-01-27T11:33:20.6165535+08:00;True|2024-01-18T15:02:34.3492480+08:00;True|2024-01-15T18:07:28.9717635+08:00;True|2024-01-13T18:33:12.9427731+08:00;True|2024-01-03T12:04:02.7753609+08:00;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>
    <History>True|2024-05-15T05:42:09.6126744Z;True|2024-05-14T13:53:12.1723807+08:00;True|2024-05-11T15:05:20.5973067+08:00;True|2024-05-10T11:01:01.2440816+08:00;False|2024-05-10T10:59:59.6830545+08:00;True|2024-04-04T16:28:54.7974027+08:00;True|2024-04-04T11:28:14.8768964+08:00;True|2024-04-04T09:39:21.6552156+08:00;True|2024-03-11T16:36:41.1901368+08:00;True|2024-01-27T11:33:20.6165535+08:00;True|2024-01-18T15:02:34.3492480+08:00;True|2024-01-15T18:07:28.9717635+08:00;True|2024-01-13T18:33:12.9427731+08:00;True|2024-01-03T12:04:02.7753609+08:00;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;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 IStation.Entry.SZJT/appsettings.json

@@ -1,20 +1,21 @@
{
  "AppSettings": {
    "EnabledReferenceAssemblyScan": true, // å¯ç”¨æ¨¡å—化程序集扫描
    "EnabledReferenceAssemblyScan": true,
    "SupportPackageNamePrefixs": [
      "Yw.Application.Core",
      "Yw.Application.Basic.Core",
      "Yw.Application.Dict.Core",
      "Yw.Application.Unit.Core",
      "Yw.Application.Monitor.Core",
      "Yw.Application.Assets.Core",
      "Yw.Application.Monitor.Core",
      "Yw.Application.MonitorRelation.Core",
      "Yw.Application.Repair.Core",
      "Yw.Application.ArtImage.Core",
      "Yw.Application.Bimface.Core",
      "Yw.Application.Map.Core",
      "Yw.Application.DOCS.Core",
      "Yw.Application.DMA.Core"
    ] // é…ç½®é€šè¿‡ NuGet æ–¹å¼å®‰è£…的模块化包
      "Yw.Application.DMA.Core",
      "Yw.Application.Run.Core"
    ]
  },
  "Logging": {
    "LogLevel": {
@@ -24,16 +25,20 @@
  },
  "AllowedHosts": "*",
  "IgnoreConfigurationFiles": [
    "paras_repair_settings.json",
    "paras_monitor_settings.json",
    "paras_dict_settings.json",
    "paras_unit_settings.json",
    "paras_basic_settings.json",
    "paras_memory_cache_settings.json",
    "paras_sqlsugar_settings.json",
    "paras_service_settings.json",
    "paras_basic_settings.json",
    "paras_unit_settings.json",
    "paras_dict_settings.json",
    "paras_assets_settings.json",
    "paras_monitor_settings.json",
    "paras_monitor_relation_settings.json",
    "paras_repair_settings.json",
    "paras_map_settings.json",
    "paras_docs_settings.json",
    "paras_bimface_settings.json",
    "paras_dma_settings.json"
    "paras_dma_settings.json",
    "paras_run_settings.json"
  ]
}

 IStation.Server.SZJT/00-core/ConfigHelper.cs

 IStation.Server.SZJT/00-core/IJobHelper.cs

 IStation.Server.SZJT/00-core/JobHelper.cs

ÎļþÃû´Ó IStation.Server.SZJT/0-helper/JobHelper.cs ÐÞ¸Ä
@@ -7,7 +7,7 @@
    {
        private List<IJobHelper> _jobHelpers = new List<IJobHelper>()
        {
            new EquipmentRunAnalyServiceJobHelper()

        };

        /// <summary>

 IStation.Server.SZJT/1-equipment-run-analy/1-service/EquipmentRunAnalyServiceJob.cs

ÎļþÒÑɾ³ý

 IStation.Server.SZJT/1-equipment-run-analy/1-service/EquipmentRunAnalyServiceJobHelper.cs

ÎļþÒÑɾ³ý

 IStation.Server.SZJT/1-equipment-run-analy/2-single/EquipmentRunAnalyChangeTimesHelper.cs

ÎļþÒÑɾ³ý

 IStation.Server.SZJT/1-equipment-run-analy/2-single/EquipmentRunAnalySingleJob.cs

ÎļþÒÑɾ³ý

 IStation.Server.SZJT/1-equipment-run-analy/2-single/EquipmentRunAnalySingleJobHelper.cs

ÎļþÒÑɾ³ý

 IStation.Server.SZJT/1-equipment-run-analy/2-single/EquipmentRunAnalySingleJobNameHelper.cs

ÎļþÒÑɾ³ý

 IStation.Server.SZJT/IStation.Server.SZJT.csproj

@@ -9,7 +9,7 @@

  <ItemGroup>
    <PackageReference Include="Yw.Quartz.Core" Version="3.0.0" />
    <PackageReference Include="Yw.Service.Run.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Service.Run.Core" Version="3.0.7" />
  </ItemGroup>

  <ItemGroup>

 IStation.Service.SZJT/IStation.Service.SZJT.csproj

@@ -17,6 +17,11 @@
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="Yw.DAL.PostgreSql.Core" Version="3.0.2" />
    <PackageReference Include="Yw.Service.Core" Version="3.0.2" />
  </ItemGroup>

  <ItemGroup>
    <Content Update="C:\Users\admin\.nuget\packages\yw.service.assets.core\1.0.0\contentFiles\any\net6.0\paras_assets_settings.json">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
@@ -35,12 +40,6 @@
    <Content Update="C:\Users\admin\.nuget\packages\yw.service.unit.core\1.0.0\contentFiles\any\net6.0\paras_unit_settings.json">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Service.Assets.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Service.Basic.Core" Version="3.0.3" />
    <PackageReference Include="Yw.Service.Monitor.Core" Version="3.0.5" />
  </ItemGroup>

</Project>

 IStation.WebApi.SZJT/Filters/ActionFilter.cs

@@ -16,7 +16,7 @@
        /// <returns></returns>
        public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
        {
            LogHelper.Info(context.HttpContext.Request.Path);
            LogHelper.Info($"ActionFilter:{context.HttpContext.Request.Path}");
            await next();
        }


 IStation.WebApi.SZJT/Filters/AuthorizationFilter.cs

@@ -20,7 +20,7 @@
        /// <returns></returns>
        public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
        {
            await Task.Run(() => LogHelper.Info(context.HttpContext.Request.Path));
            await Task.Run(() => LogHelper.Info($"AuthorizationFilter:{context.HttpContext.Request.Path}"));

        }
    }

 IStation.WebApi.SZJT/Filters/ResultFilter.cs

@@ -17,7 +17,7 @@
        /// <returns></returns>
        public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
        {
            LogHelper.Info(context.HttpContext.Request.Path);
            LogHelper.Info($"ResultFilter:{context.HttpContext.Request.Path}");
            await next();
        }
    }

 IStation.WebApi.SZJT/Handlers/JwtHandler.cs

@@ -2,7 +2,7 @@
using Furion.DataEncryption;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;

using Yw.JWT;

namespace IStation.WebApi
{
@@ -42,6 +42,19 @@
            // æ­¤å¤„已经自动验证 Jwt token的有效性了，无需手动验证

            // æ£€æŸ¥æƒé™ï¼Œå¦‚果方法是异步的就不用 Task.FromResult åŒ…裹，直接使用 async/await å³å¯

            Yw.Untity.UserRegister.Regist
                (
                    UserManager.CorpID,
                    UserManager.UserID,
                    UserManager.AdminType,
                    UserManager.UserName,
                    UserManager.UserTag,
                    UserManager.LoginAccountID,
                    UserManager.LoginTypeID,
                    UserManager.ProjectID,
                    UserManager.SoftwareID
                );
            return Task.FromResult(CheckAuthorzie(httpContext));
        }

@@ -58,5 +71,7 @@
                return true;
            return true;
        }


    }
}

 IStation.WebApi.SZJT/Result/XnRestfulResultProvider.cs

@@ -10,6 +10,8 @@
using Yw.Untity;
using Yw.Application;
using Yw.Dto;
using System.Text.Json.Serialization;
using System.Text.Json;

namespace IStation.WebApi
{
@@ -134,7 +136,13 @@
        {
            // è®¾ç½®å“åº”状态码
            UnifyContext.SetResponseStatusCodes(context, statusCode, unifyResultSettings);

            var options = new JsonSerializerOptions();
            options.PropertyNamingPolicy = null; //返回属性大小写问题
            options.ReferenceHandler = ReferenceHandler.IgnoreCycles; //忽略循环引用 ä»….NET 6支持
            options.Converters.Add(new DateTimeJsonConverter());//时间格式处理
            options.Converters.Add(new DateTimeNullableJsonConverter());//时间格式处理
            options.Converters.Add(new LongJsonConverter());//长整型格式处理
            options.Converters.Add(new LongNullableJsonConverter());//长整型格式处理
            if (Enum.IsDefined(typeof(HttpStatusCode), (HttpStatusCode)statusCode))
            {
                await context.Response.WriteAsJsonAsync(new Result<object>
@@ -145,7 +153,7 @@
                    Data = null,
                    Extras = UnifyContext.Take(),
                    Timestamp = DateTime.Now
                });
                }, options);
            }
        }
    }