重新优化接口调取数据

duheng

2024-03-27 dc97e187c607119bbd2945b9a277db8da15f8dc0

 WebApi/ÖÚÒãµ÷¶È/ZyConnectHelper.cs

@@ -417,7 +417,7 @@
        /// <param name="endTime">结束时间</param>
        /// <param name="resolution">时间步长,默认300秒</param>
        /// <returns></returns>
        public static async Task<List<IStation.ZyDto.MonitorRecord>> GetRealRiverWaterLevel(DateTime startTime, DateTime endTime, string resolution = "300")
        public static async Task<List<IStation.ZyModel.MonitorRecord>> GetRealRiverWaterLevel(DateTime startTime, DateTime endTime, string resolution = "300")
        {
            var tag = "_0402010204089903001";
            var input = new ScadaDispatchInput
@@ -681,7 +681,7 @@
        /// èŽ·å–实时数据字典
        /// </summary> 
        /// <returns></returns>
        public static async Task<List<RealScadaRecord>> GetRealScadaResult(List<string> tags, object input)
        public static async Task<List<ZyModel.RealScadaRecord>> GetRealScadaResult(List<string> tags, object input)
        {
            if (tags == null || !tags.Any())
                return default;
@@ -694,7 +694,7 @@
                return default;
            }

            var realScadaRecordList = new List<RealScadaRecord>();
            var realScadaRecordList = new List<ZyModel.RealScadaRecord>();
            var inputJson = JsonHelper.Object2Json(input);
            var inputBytes = Encoding.UTF8.GetBytes(inputJson);
            await ws.SendAsync(new ArraySegment<byte>(inputBytes), WebSocketMessageType.Text, true, CancellationToken.None);
@@ -720,7 +720,7 @@
                                    var tag = dict.Value.keys.Trim();
                                    if (tags.Contains(tag))
                                    {
                                        var data = new RealScadaRecord();
                                        var data = new ZyModel.RealScadaRecord();
                                        data.TagName = tag;

                                        if (double.TryParse(dict.Value.vals, out double value))
@@ -763,7 +763,7 @@
        /// èŽ·å–实时数据字典
        /// </summary>  
        /// <returns></returns>
        public static async Task<List<RealScadaData>> GetRealScadaResult(ScadaDispatchInput input)
        public static async Task<List<ZyModel.RealScadaData>> GetRealScadaResult(ScadaDispatchInput input)
        {
            if (input == null)
                return default;
@@ -773,7 +773,7 @@
            {
                return default;
            }
            var realScadaDataList = new List<RealScadaData>();
            var realScadaDataList = new List<ZyModel.RealScadaData>();
            var inputJson = JsonHelper.Object2Json(input);
            var inputBytes = Encoding.UTF8.GetBytes(inputJson);
            await ws.SendAsync(new ArraySegment<byte>(inputBytes), WebSocketMessageType.Text, true, CancellationToken.None);
@@ -796,12 +796,12 @@
                            {
                                foreach (var dict in scadaDict)
                                {
                                    var data = new RealScadaData();
                                    var data = new ZyModel.RealScadaData();
                                    data.TagName = dict.Key;
                                    data.MonitorRecords = new List<IStation.ZyDto.MonitorRecord>();
                                    data.MonitorRecords = new List<IStation.ZyModel.MonitorRecord>();
                                    foreach (var item in dict.Value)
                                    {
                                        var record = new IStation.ZyDto.MonitorRecord();
                                        var record = new IStation.ZyModel.MonitorRecord();
                                        record.Time = item.Key;
                                        if (double.TryParse(item.Value, out double value))
                                        {
@@ -1064,33 +1064,6 @@
        }


        /// <summary>
        /// 
        /// </summary>
        public class RealScadaData
        {
            /// <summary>
            /// 
            /// </summary>
            public string TagName { get; set; }
            /// <summary>
            /// 
            /// </summary>
            public List<IStation.ZyDto.MonitorRecord> MonitorRecords { get; set; }
        }
        /// <summary>
        /// 
        /// </summary>
        public class RealScadaRecord
        {
            /// <summary>
            /// 
            /// </summary>
            public string TagName { get; set; }
            /// <summary>
            /// 
            /// </summary>
            public double Value { get; set; }
        }

    }
}