陈行二取(桌面程序和WEBAPI)
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
duheng
2024-03-27 dc97e187c607119bbd2945b9a277db8da15f8dc0 
 WebApi/Controllers/TotalWaterInController.cs


@@ -257,7 +257,7 @@






        private string _url = "ws://192.168.201.17:40001";


        private async Task<List<RealScadaData>> Get(string inputJson)


        private async Task<List<ZyModel.RealScadaData>> Get(string inputJson)


        {


            if (string.IsNullOrEmpty(inputJson))


                return default;


@@ -270,7 +270,7 @@


                return default;


            }


            IStation.LogHelper.Info("ws.ConnectAsync");


            var realScadaDataList = new List<RealScadaData>();


            var realScadaDataList = new List<ZyModel.RealScadaData>();


            var inputBytes = Encoding.UTF8.GetBytes(inputJson);


            await ws.SendAsync(new ArraySegment<byte>(inputBytes), WebSocketMessageType.Text, true, CancellationToken.None);


            try


@@ -294,12 +294,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))


                                        {