修复监控记录原始时间，提高整体项目兼容性

lixiaojun

2022-11-30 eab37249501e3b10181f60d237995e17d2d52491

修复监控记录原始时间，提高整体项目兼容性

 Entity/IStation.Entity.Run/monitor_record/MonitorDayRecord.cs

@@ -78,12 +78,12 @@
        /// <summary>
        /// åŽŸå§‹æ—¶é—´
        /// </summary>    
        public DateTime? SrcTime
        public DateTime SrcTime
        {
            get { return _srctime; }
            set { _srctime = value; }
        }
        private DateTime? _srctime;
        private DateTime _srctime;

        /// <summary>
        /// åŽŸå§‹å€¼

 Entity/IStation.Entity.Run/monitor_record/MonitorHourRecord.cs

@@ -89,12 +89,12 @@
        /// <summary>
        /// åŽŸå§‹æ—¶é—´
        /// </summary>    
        public DateTime? SrcTime
        public DateTime SrcTime
        {
            get { return _srctime; }
            set { _srctime = value; }
        }
        private DateTime? _srctime;
        private DateTime _srctime;

        /// <summary>
        /// åŽŸå§‹å€¼

 Entity/IStation.Entity.Run/monitor_record/MonitorMonthRecord.cs

@@ -89,12 +89,12 @@
        /// <summary>
        /// åŽŸå§‹æ—¶é—´
        /// </summary>    
        public DateTime? SrcTime
        public DateTime SrcTime
        {
            get { return _srctime; }
            set { _srctime = value; }
        }
        private DateTime? _srctime;
        private DateTime _srctime;

        /// <summary>
        /// åŽŸå§‹å€¼

 Entity/IStation.Entity.Run/monitor_record/MonitorRealRecord.cs

@@ -67,12 +67,12 @@
        /// <summary>
        /// åŽŸå§‹æ—¶é—´
        /// </summary>    
        public DateTime? SrcTime
        public DateTime SrcTime
        {
            get { return _srctime; }
            set { _srctime = value; }
        }
        private DateTime? _srctime;
        private DateTime _srctime;

        /// <summary>
        /// åŽŸå§‹å€¼

 Entity/IStation.Entity.Run/monitor_record/MonitorWeekRecord.cs

@@ -89,12 +89,12 @@
        /// <summary>
        /// åŽŸå§‹æ—¶é—´
        /// </summary>    
        public DateTime? SrcTime
        public DateTime SrcTime
        {
            get { return _srctime; }
            set { _srctime = value; }
        }
        private DateTime? _srctime;
        private DateTime _srctime;

        /// <summary>
        /// åŽŸå§‹å€¼

 Entity/IStation.Entity.Run/monitor_record/MonitorYearRecord.cs

@@ -78,12 +78,12 @@
        /// <summary>
        /// åŽŸå§‹æ—¶é—´
        /// </summary>    
        public DateTime? SrcTime
        public DateTime SrcTime
        {
            get { return _srctime; }
            set { _srctime = value; }
        }
        private DateTime? _srctime;
        private DateTime _srctime;

        /// <summary>
        /// åŽŸå§‹å€¼

 Model/IStation.Model.Run/data_docking/MonitorDataDockingReceiveRecord.cs

@@ -40,7 +40,7 @@
        /// <summary>
        /// åŽŸå§‹æ—¶é—´
        /// </summary>
        public DateTime? SrcTime { get; set; }
        public DateTime SrcTime { get; set; }

        /// <summary>
        /// åŽŸå§‹å€¼(如果是常规)

 Model/IStation.Model.Run/data_docking/MonitorDataDockingSrcRecord.cs

@@ -40,7 +40,7 @@
        /// <summary>
        /// åŽŸå§‹æ—¶é—´
        /// </summary>
        public DateTime? SrcTime { get; set; }
        public DateTime SrcTime { get; set; }

        /// <summary>
        /// åŽŸå§‹å€¼

 Model/IStation.Model.Run/monitor_record/basic/MonitorBasicRecordContent.cs

@@ -31,7 +31,7 @@
        /// <summary>
        /// åŽŸå§‹æ—¶é—´
        /// </summary>
        public DateTime? SrcTime { get; set; }
        public DateTime SrcTime { get; set; }

        /// <summary>
        /// åŽŸå§‹å€¼
@@ -54,11 +54,8 @@
        public List<string> DataStatus { get; set; }

        /// <summary>
        /// 
        /// èŽ·å–数据值
        /// </summary>
        /// <param name="roundNum"></param>
        /// <param name="value"></param>
        /// <returns></returns>
        public bool GetDataValue(int roundNum , out double value)
        {
            value =0;
@@ -75,5 +72,8 @@
                return true;
            }
        }



    }
}

 Settings/IStation.Settings/IStation.Settings.csproj

@@ -15,7 +15,7 @@

  <ItemGroup>
    <Content Include="paras_settings.json">
      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
  </ItemGroup>


 Socket/IStation.DataDockingSocket4KQ/HandleHelper.cs

@@ -8,6 +8,9 @@

namespace IStation.DataDockingSocket
{
    /// <summary>
    /// å¤„理辅助类
    /// </summary>
    public class HandleHelper : IDataDockingSocket.IHandleHelper
    {
        /// <summary>
@@ -86,13 +89,13 @@
            var item = appParas.InstructionItems.Find(x => x.Verify(bytes));
            if (item == null)
                return;
            var src_list = HandleDataHelper.HandleData(item, bytes);
            if (src_list != null && src_list.Count > 0)
            var srcList = HandleDataHelper.HandleData(item, bytes);
            if (srcList != null && srcList.Count > 0)
            {
                var receive_list = new List<Model.MonitorDataDockingReceiveRecord>();
                var receiveList = new List<Model.MonitorDataDockingReceiveRecord>();
                foreach (var mapper in mappers)
                {
                    var src = src_list.Find(x => x.SignId == mapper.SignId);
                    var src = srcList.Find(x => x.SignId == mapper.SignId);
                    if (src != null)
                    {
                        var record = new Model.MonitorDataDockingReceiveRecord();
@@ -100,10 +103,10 @@
                        record.RecordType = src.RecordType;
                        record.SrcTime = src.SrcTime;
                        record.SrcValue = src.SrcValue;
                        receive_list.Add(record);
                        receiveList.Add(record);
                    }
                }
                receive(receive_list);
                receive(receiveList);
            }

            if (appParas.Src)
@@ -112,14 +115,10 @@
            }
            if (appParas.Debug)
            {
                DebugHelper.Debug(src_list);
                DebugHelper.Debug(srcList);
            }
        }

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




 Socket/IStation.DataDockingSocket4KQ/IStation.DataDockingSocket4KQ.csproj

@@ -6,12 +6,12 @@
    <Nullable>disable</Nullable>
    <AssemblyName>IStation.DataDockingSocket4KQ</AssemblyName>
    <RootNamespace>IStation.DataDockingSocket</RootNamespace>
    <GenerateDocumentationFile>False</GenerateDocumentationFile>
  </PropertyGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\Component\IStation.Log4Net\IStation.Log4Net.csproj" />
    <ProjectReference Include="..\..\Component\IStation.Quartz\IStation.Quartz.csproj" />
    <ProjectReference Include="..\..\Untity\IStation.Untity\IStation.Untity.csproj" />
    <ProjectReference Include="..\IStation.IDataDockingSocket\IStation.IDataDockingSocket.csproj" />
  </ItemGroup>


 Socket/IStation.DataDockingSocket4KQ/helper/DebugHelper.cs

@@ -16,22 +16,23 @@
        /// <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)
            var debugList = new List<Model.MonitorDataDockingDebugRecord>();
            foreach (var srcRecord 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.SrcValue = record.SrcValue;
                debug_list.Add(debugRecord);
                debugRecord.SignId = srcRecord.SignId;
                debugRecord.RecordType = srcRecord.RecordType;
                debugRecord.SrcTime = srcRecord.SrcTime.ToString("yyyy-MM-dd HH:mm:ss");
                debugRecord.SrcValue = srcRecord.SrcValue;
                debugList.Add(debugRecord);
            }
            var json = JsonHelper.Object2Json(debug_list);
            var json = JsonHelper.Object2Json(debugList);
            LogHelper.Custom(_logName, json);
        }

    }
}

 Socket/IStation.DataDockingSocket4KQ/helper/HandleDataHelper.cs

@@ -33,7 +33,7 @@
                var record = new Model.MonitorDataDockingSrcRecord();
                record.SignId = x.SignId;
                record.RecordType = Model.eMonitorType.General;
                record.SrcTime = null;
                record.SrcTime = DateTime.Now;
                record.SrcValue = null;
                var rule = x.Rule == null ? item.DefaultRule : x.Rule.Value;
                switch (rule)

 Socket/IStation.DataDockingSocket4KQ/helper/SrcHelper.cs

@@ -7,7 +7,10 @@

namespace IStation.DataDockingSocket
{
    public class SrcHelper
    /// <summary>
    /// ç”ŸæˆåŽŸå§‹ä¿¡æ¯è¾…助类
    /// </summary>
    internal class SrcHelper
    {
        private const string _logName = "socket-kq-src";

@@ -16,10 +19,10 @@
        /// </summary>
        public static void Src( byte[] bts)
        {
            if (bts == null || bts.Count() < 1)
            if (bts == null || bts.Length < 1)
                return;
            var message_bts = BitTransfer.ToString(bts);
            LogHelper.Custom(_logName, message_bts);
            var message = BitTransfer.ToString(bts);
            LogHelper.Custom(_logName, message);
        }

    }

 Socket/IStation.DataDockingSocket4KQ/instruction/SendInstructionJob.cs

@@ -17,6 +17,9 @@
        internal const string Session = "Session";//会话字符
        internal const string Instruction = "Instruction";//指令字符

        /// <summary>
        /// æ‰§è¡Œ
        /// </summary>
        public async Task Execute(IJobExecutionContext context)
        {
            try
@@ -44,5 +47,7 @@
                throw e;
            }
        }


    }
}

 Socket/IStation.IDataDockingSocket/IHandleHelper.cs

@@ -7,12 +7,11 @@

namespace IStation.IDataDockingSocket
{
    /// <summary>
    /// å¤„理辅助类接口
    /// </summary>
    public interface IHandleHelper
    {
        /// <summary>
        /// éªŒè¯æ•°æ®
        /// </summary> 
        bool Valid(byte[] bytes);

        /// <summary>
        /// å¤„理注册包

 Update/¸üмǼ»ã×Ü.txt

@@ -8,4 +8,5 @@
8.2022-8-24 monitor模块新增DataDockingProblem表及 Problem服务程序
9.2022-11-28 æ–°å¢ž SimPaymentRecord表
10.2022-11-30 basic模块 æ–°å¢ž Catalog、 GeneralProperty、SpecialPropertyGroup、SpecialProperty、SpecialPropertyChoice、SpecialPropertyMapping、SpecialPropertyValue表
10.2022-11-30 basic模块 æ–°å¢ž CorpDictType ã€CorpDictData表，SysDictData表结构修改（部分接口作废）
10.2022-11-30 basic模块 æ–°å¢ž CorpDictType ã€CorpDictData表，SysDictData表结构修改（部分接口作废）
11.2022-11-30 ç›‘测记录 SrcTime å¯ç©ºä¿®æ”¹