修复监测记录SrcTime

lixiaojun

2022-12-01 dbc11dad71dd51b98a79186491bf5d8440a30278

修复监测记录SrcTime

 Application/IStation.Application.Run/data_docking/DataDocking_StandardController.cs

@@ -70,13 +70,16 @@
            foreach (var mapper in standardConfigure.Mappers)
            {
                var inputRecord = inputRecords.Find(x => x.RecordId == mapper.SignId);
                var record = new Model.MonitorDataDockingReceiveRecord();
                record.SysId = mapper.SysId;
                record.RecordType = inputRecord.RecordType;
                record.SrcTime = inputRecord.RecordTime;
                record.SrcValue = inputRecord.RecordValue;
                record.DataStatus = new List<string>();
                records.Add(record);
                if (inputRecord != null)
                {
                    var record = new Model.MonitorDataDockingReceiveRecord();
                    record.SysId = mapper.SysId;
                    record.RecordType = inputRecord.RecordType;
                    record.SrcTime = inputRecord.RecordTime;
                    record.SrcValue = inputRecord.RecordValue;
                    record.DataStatus = new List<string>();
                    records.Add(record);
                }
            }

            if (records.Count < 1)

 Application/IStation.Application.Run/monitor_real_record/mgr/dto/AgainMonitorRealRecordInput.cs

@@ -24,7 +24,7 @@
        /// <summary>
        /// 原始时间
        /// </summary>
        public DateTime? SrcTime { get; set; }
        public DateTime SrcTime { get; set; }

        /// <summary>
        /// 原始值

 Application/IStation.Application.Run/monitor_real_record/mgr/dto/SupplementMonitorRealRecordInput.cs

@@ -24,7 +24,7 @@
        /// <summary>
        /// 原始时间
        /// </summary>
        public DateTime? SrcTime { get; set; }
        public DateTime SrcTime { get; set; }

        /// <summary>
        /// 原始值

 Application/IStation.Application.Run/monitor_real_record/mgr/dto/UpdateMonitorRealRecordInput.cs

@@ -39,7 +39,7 @@
        /// <summary>
        /// 原始时间
        /// </summary>
        public DateTime? SrcTime { get; set; }
        public DateTime SrcTime { get; set; }

        /// <summary>
        /// 原始值

 Calculation/IStation.Calculation.Handle/MonitorHandleHelper.cs

@@ -42,24 +42,21 @@
            {
                if (lastRecord != null)
                {
                    if (lastRecord.SrcTime != null && receiveRecord.SrcTime != null)
                    if (lastRecord.SrcTime == receiveRecord.SrcTime)
                    {
                        if (lastRecord.SrcTime.Value == receiveRecord.SrcTime.Value)
                        //相同时间给出了相同值
                        if (lastRecord.SrcValue == receiveRecord.SrcValue)
                        {
                            //相同时间给出了相同值
                            if (lastRecord.SrcValue == receiveRecord.SrcValue)
                            var real_slot = Model.Monitor.RealSlot.ToModel(monitor.CronParas);
                            if (real_slot == null)
                            {
                                var real_slot = Model.Monitor.RealSlot.ToModel(monitor.CronParas);
                                if (real_slot == null)
                                {
                                    real_slot = new Model.Monitor.RealSlot();
                                }
                                if (!real_slot.UpdateWhenChanged)
                                {
                                    return record;
                                }
                                dataStatus.Add(MonitorRecord.Status_Supplement);
                                real_slot = new Model.Monitor.RealSlot();
                            }
                            if (!real_slot.UpdateWhenChanged)
                            {
                                return record;
                            }
                            dataStatus.Add(MonitorRecord.Status_Supplement);
                        }
                    }
                }
@@ -390,7 +387,7 @@
                Model.MonitorPoint monitor,
                Model.Signal_SignalType signal,
                Model.MonitorBasicRecord lastRecord,
                DateTime? srcTime,
                DateTime srcTime,
                string srcValue,
                List<string> dataStatus
            )
@@ -408,24 +405,21 @@
            {
                if (lastRecord != null)
                {
                    if (lastRecord.SrcTime != null && srcTime != null)
                    if (lastRecord.SrcTime == srcTime)
                    {
                        if (lastRecord.SrcTime.Value == srcTime.Value)
                        //相同时间给出了相同值
                        if (lastRecord.SrcValue == srcValue)
                        {
                            //相同时间给出了相同值
                            if (lastRecord.SrcValue == srcValue)
                            var real_slot = Model.Monitor.RealSlot.ToModel(monitor.CronParas);
                            if (real_slot == null)
                            {
                                var real_slot = Model.Monitor.RealSlot.ToModel(monitor.CronParas);
                                if (real_slot == null)
                                {
                                    real_slot = new Model.Monitor.RealSlot();
                                }
                                if (!real_slot.UpdateWhenChanged)
                                {
                                    return default;
                                }
                                dataStatus.Add(MonitorRecord.Status_Supplement);
                                real_slot = new Model.Monitor.RealSlot();
                            }
                            if (!real_slot.UpdateWhenChanged)
                            {
                                return default;
                            }
                            dataStatus.Add(MonitorRecord.Status_Supplement);
                        }
                    }
                }
@@ -720,7 +714,7 @@
                Model.MonitorPoint monitor,
                Model.Signal_SignalType signal,
                Func<Model.MonitorBasicRecord> getLastRecord,
                DateTime? srcTime,
                DateTime srcTime,
                string srcValue,
                List<string> dataStatus
            )
@@ -740,24 +734,21 @@
                lastRecord = getLastRecord();
                if (lastRecord != null)
                {
                    if (lastRecord.SrcTime != null && srcTime != null)
                    if (lastRecord.SrcTime == srcTime)
                    {
                        if (lastRecord.SrcTime.Value == srcTime.Value)
                        //相同时间给出了相同值
                        if (lastRecord.SrcValue == srcValue)
                        {
                            //相同时间给出了相同值
                            if (lastRecord.SrcValue == srcValue)
                            var real_slot = Model.Monitor.RealSlot.ToModel(monitor.CronParas);
                            if (real_slot == null)
                            {
                                var real_slot = Model.Monitor.RealSlot.ToModel(monitor.CronParas);
                                if (real_slot == null)
                                {
                                    real_slot = new Model.Monitor.RealSlot();
                                }
                                if (!real_slot.UpdateWhenChanged)
                                {
                                    return default;
                                }
                                dataStatus.Add(MonitorRecord.Status_Supplement);
                                real_slot = new Model.Monitor.RealSlot();
                            }
                            if (!real_slot.UpdateWhenChanged)
                            {
                                return default;
                            }
                            dataStatus.Add(MonitorRecord.Status_Supplement);
                        }
                    }
                }
@@ -1068,7 +1059,7 @@
            (
                Model.MonitorPoint monitor,
                Model.Signal_SignalType signal,
                DateTime? srcTime,
                DateTime srcTime,
                string srcValue,
                DateTime dataTime,
                string dataValue,

 Socket/IStation.DataDockingSocket4KQ/helper/HandleDataHelper.cs

@@ -27,13 +27,13 @@
            var instrution_bts = BitTransfer.FromString(item.Instruction);
            //请求数据的索引器位置 从0开始
            var startIndex = instrution_bts[2] * 16 * 16 + instrution_bts[3];

            var now = DateTime.Now;
            foreach (var x in item.RuleItems)
            {
                var record = new Model.MonitorDataDockingSrcRecord();
                record.SignId = x.SignId;
                record.RecordType = Model.eMonitorType.General;
                record.SrcTime = DateTime.Now;
                record.SrcTime = now;
                record.SrcValue = null;
                var rule = x.Rule == null ? item.DefaultRule : x.Rule.Value;
                switch (rule)

 Socket/IStation.DataDockingSocket4NT/HandleHelper.cs

@@ -120,10 +120,6 @@

        }

        public bool Valid(byte[] bytes)
        {
            return false;
        }

    } 
}

 Socket/IStation.DataDockingSocket4SZZS/HandleHelper.cs

@@ -118,10 +118,6 @@
        }


        public bool Valid(byte[] bytes)
        {
            return false;
        }
         
    }
}

 Socket/IStation.DataDockingSocket4SZZS/helper/DebugHelper.cs

@@ -16,17 +16,17 @@
        /// <summary>
        /// 生成
        /// </summary>
        public static void Debug(List<Model.MonitorDataDockingSrcRecord> src_list)
        public static void Debug(List<Model.MonitorDataDockingSrcRecord> srcList)
        {
            if (src_list == null || src_list.Count < 1)
            if (srcList == null || srcList.Count < 1)
                return;
            var debug_list = new List<Model.MonitorDataDockingDebugRecord>();
            foreach (var record in src_list)
            foreach (var record in srcList)
            {
                var debugRecord = new Model.MonitorDataDockingDebugRecord();
                debugRecord.SignId = record.SignId;
                debugRecord.RecordType = record.RecordType;
                debugRecord.SrcTime = record.SrcTime?.ToString("yyyy-MM-dd HH:mm:ss");
                debugRecord.SrcTime = record.SrcTime.ToString("yyyy-MM-dd HH:mm:ss");
                debugRecord.SrcValue = record.SrcValue;
                debug_list.Add(debugRecord);
            }

 Socket/IStation.DataDockingSocket4SZZS/helper/HandleDataHelper.cs

@@ -27,13 +27,13 @@
            var instrution_bts = BitTransfer.FromString(item.Instruction);
            //请求数据的索引器位置 从0开始
            var startIndex = instrution_bts[2] * 16 * 16 + instrution_bts[3];

            var now = DateTime.Now;
            foreach (var x in item.RuleItems)
            {
                var record = new Model.MonitorDataDockingSrcRecord();
                record.SignId = x.SignId;
                record.RecordType = Model.eMonitorType.General;
                record.SrcTime = null;
                record.SrcTime = now;
                record.SrcValue = null;
                var rule = x.Rule == null ? item.DefaultRule : x.Rule.Value;
                switch (rule)