修改标准数据对接接口

lixiaojun

2022-12-01 b0b02d28060640d432e53ba870eb6dd1da880253

修改标准数据对接接口

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

@@ -32,9 +32,9 @@
        /// </summary>
        [Route("Insert@V1.0")]
        [HttpPost]
        public bool Insert([Required] DataDockingStandardCorpRecordInput input)
        public bool Insert([Required] DataDockingStandardInput input)
        {
            LogHelper.Info($"注册码:{input.RegisterCode},插入数据记录数量:{input.Records.Count}.");
            LogHelper.Info($"数据标准对接接口中，注册码:{input.RegisterCode},插入数据记录数量:{input.Records.Count}.");

            var corpIds = DataDockingCorpHelper.GetCorpIds();
            if (corpIds == null || corpIds.Count < 1)
@@ -72,12 +72,14 @@
                var inputRecord = inputRecords.Find(x => x.RecordId == mapper.SignId);
                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>();
                    var record = new Model.MonitorDataDockingReceiveRecord
                    {
                        SysId = mapper.SysId,
                        RecordType = inputRecord.RecordType,
                        SrcTime = inputRecord.RecordTime,
                        SrcValue = inputRecord.RecordValue,
                        DataStatus = new List<string>()
                    };
                    records.Add(record);
                }
            }
@@ -96,28 +98,107 @@
            });
            if (bol)
            {
                LogHelper.Info($"客户:{standardConfigure.CorpID},标准数据对接配置:{standardConfigure.ID},推入通道记录数量:{records.Count}.");
                LogHelper.Info($"数据标准对接接口中，客户:{standardConfigure.CorpID},标准数据对接配置:{standardConfigure.ID},推入通道记录数量:{records.Count}.");
                return true;
            }
            return false;
        }



        /// <summary>
        /// è¡¥å½•å¤šæ¡
        /// </summary>
        //[Route("InsertsSupplement@V1.0")]
        ///// <summary>
        ///// è¡¥å½•
        ///// </summary>
        //[Route("Supplement@V1.0")]
        //[HttpPost]
        //public bool InsertsSupplement([Required] List<SupplementMonitorRealRecordInput> list)
        //public bool Supplement([Required] DataDockingStandardInput input)
        //{
        //    var corpIds = list.Select(x => x.CorpID).Distinct().ToList();
        //    if (corpIds.Count > 1)
        //    LogHelper.Info($"数据标准对接接口中，注册码:{input.RegisterCode},补录数据记录数量:{input.Records.Count}.");

        //    var corpIds = DataDockingCorpHelper.GetCorpIds();
        //    if (corpIds == null || corpIds.Count < 1)
        //    {
        //        return false;
        //        throw new Exception("未检索到客户标识配置信息！");
        //    }
        //    if (_standardConfigureList == null)
        //    {
        //        var configureList = new Service.DataDockingConfigure().GetByCorpIds(corpIds);
        //        if (configureList == null || configureList.Count < 1)
        //        {
        //            throw new Exception("未检索到数据对接配置信息！");
        //        }
        //        configureList = configureList.Where(x => x.DockingMode == Model.DataDockingConfigure.eDockingMode.Standard).ToList();
        //        if (configureList == null || configureList.Count < 1)
        //        {
        //            throw new Exception("未检索到数据对接标准配置信息！");
        //        }
        //        _standardConfigureList = configureList.Select(x => new Model.DataDockingConfigureExStandard(x)).ToList();
        //    }
        //    var standardConfigure = _standardConfigureList.Find(x => x.ConfigureParas != null && x.ConfigureParas.RegisterCode == input.RegisterCode);
        //    if (standardConfigure == null)
        //    {
        //        throw new Exception("未检索到数据对接标准配置信息！");
        //    }
        //    if (standardConfigure.Mappers == null || standardConfigure.Mappers.Count < 1)
        //    {
        //        throw new Exception("数据对接标准配置信息中，未配置有效映射关系！");
        //    }

        //    var record_list = new List<Model.MonitorRealRecordPure>();
        //    //生成记录
        //    var recordList = new List<Model.MonitorRealRecordPure>();
        //    foreach (var mapper in standardConfigure.Mappers)
        //    {
        //        var inputRecordList = input.Records.Where(t => t.RecordId == mapper.SignId).ToList();
        //        if (inputRecordList != null && inputRecordList.Count > 0)
        //        {
        //            var inputGroupList = inputRecordList.GroupBy(x => new { x.RecordId, x.RecordTime }).ToList();
        //            foreach (var inputGroup in inputGroupList)
        //            {
        //                var inputFirstRecord = inputGroup.First();
        //                var monitor = new Service.MonitorPoint().GetExSignalWithSignalTypeByID(standardConfigure.CorpID, mapper.SysId);
        //                if (monitor == null)
        //                {
        //                    continue;
        //                }
        //                if (monitor.CronType != Model.Monitor.eCronType.Real)
        //                {
        //                    continue;
        //                }
        //                switch (inputFirstRecord.RecordType)
        //                {
        //                    case Model.eMonitorType.General:
        //                        {
        //                            var record = new Model.MonitorRealRecordPure();
        //                            record.CorpID = standardConfigure.CorpID;
        //                            record.MonitorPointID = monitor.ID;
        //                            record.SignalID = monitor.SignalList.First().ID;
        //                            record.RecordType = monitor.MonitorType;
        //                            record.SrcTime = inputFirstRecord.RecordTime;
        //                            record.SrcValue = inputFirstRecord.RecordValue;


        //                            record.MonitorPointID = item.MonitorPointID;
        //                            record.SignalID = signal.ID;
        //                            record.RecordType = monitor.MonitorType;
        //                            record.SrcTime = item.SrcTime;
        //                            record.SrcValue = item.SrcValue;
        //                            record.DataTime = item.DataTime;
        //                            record.DataValue = data_value;
        //                            record.DataStatus = data_status;
        //                            recordList.Add(record);

        //                        }
        //                        break;
        //                    case Model.eMonitorType.Vibration:
        //                        { 
                                
        //                        }
        //                        break;
        //                    default:break;
        //                }
                        

        //            }
        //        }
        //    }
        //    foreach (var item in list)
        //    {
        //        var monitor = new Service.MonitorPoint().GetExSignalWithSignalTypeByID(item.CorpID, item.MonitorPointID);
@@ -150,7 +231,7 @@
        //                            record.DataTime = item.DataTime;
        //                            record.DataValue = data_value;
        //                            record.DataStatus = data_status;
        //                            record_list.Add(record);
        //                            recordList.Add(record);
        //                        }
        //                    }
        //                }
@@ -179,7 +260,7 @@
        //                            record.DataTime = item.DataTime;
        //                            record.DataValue = data_value;
        //                            record.DataStatus = data_status;
        //                            record_list.Add(record);
        //                            recordList.Add(record);
        //                        }
        //                    }
        //                }
@@ -188,12 +269,13 @@
        //        }
        //    }

        //    if (record_list.Count < 1)
        //    if (recordList.Count < 1)
        //    {
        //        return false;
        //    }
        //    var bol = _service.InsertsSupplement(record_list);
        //    var bol = _service.InsertsSupplement(recordList);
        //    return bol;

        //}


@@ -213,5 +295,7 @@





    }
}

 Application/IStation.Application.Run/data_docking/dto/Class1.cs

ÎļþÒÑɾ³ý

 Application/IStation.Application.Run/data_docking/dto/DataDockingStandardInput.cs

ÎļþÃû´Ó Application/IStation.Application.Run/data_docking/dto/DataDockingStandardCorpRecordInput.cs ÐÞ¸Ä
@@ -8,9 +8,9 @@
namespace IStation.Application
{
    /// <summary>
    /// æ•°æ®å¯¹æŽ¥æ ‡è¯†å®¢æˆ·è®°å½•dto
    /// æ•°æ®æ ‡å‡†å¯¹æŽ¥input
    /// </summary>
    public class DataDockingStandardCorpRecordInput : IValidatableObject
    public class DataDockingStandardInput : IValidatableObject 
    {

        /// <summary>

 Application/IStation.Application.Run/data_docking/dto/DataDockingStandardSubRecordDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace IStation.Application
{
    /// <summary>
    /// æ•°æ®æ ‡å‡†å¯¹æŽ¥å­è®°å½•dto
    /// </summary>
    public class DataDockingStandardSubRecordDto : Model.JsonList<DataDockingStandardSubRecordDto>
    {

        /// <summary>
        /// å­è®°å½•id
        /// </summary>
        public string RecordId { get; set; }

        /// <summary>
        /// å­è®°å½•å€¼
        /// </summary>
        public string RecordValue { get; set; }

    }

}

 Calculation/IStation.Calculation.Handle/IStation.Calculation.Handle.csproj

@@ -9,7 +9,6 @@
  </PropertyGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\Core\IStation.Core\IStation.Core.csproj" />
    <ProjectReference Include="..\..\Model\IStation.Model.Monitor\IStation.Model.Monitor.csproj" />
    <ProjectReference Include="..\..\Model\IStation.Model.Run\IStation.Model.Run.csproj" />
  </ItemGroup>