Merge branch 'master' of http://47.103.154.90:83/r/IStation/shys/ChEqCalc.V1.3

tangxu

2024-07-24 5cb7e73f506b2dbf48837a49786df1d6ccbb6e81

Merge branch 'master' of http://47.103.154.90:83/r/IStation/shys/ChEqCalc.V1.3

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

@@ -340,8 +340,6 @@
                      return totalWaterSupply;*/
        }



   /*     /// <summary>
        /// åˆ¤æ–­ä¾›æ°´æ€»é‡æ˜¯å¦æœ‰è¯¯
        /// </summary>
@@ -363,14 +361,12 @@
            switch (sort) 
            {
                case 1:
                    var result = HttpClientHelper.Get<List<DataPoint>>(ZyApiUrl, startTime.ToString("yyyy-MM-dd"), startTime.AddDays(1).ToString("yyyy-MM-dd"), "first", resolution, joinedValues);
                    var realScadaDataList = GetScadaData(result);
                         var data = HttpClientHelper.Get<List<DataPoint>>(ZyApiUrl, startTime.ToString("yyyy-MM-dd"), startTime.AddDays(1).ToString("yyyy-MM-dd"), "first", resolution, joinedValues);
                         var realScadaDataList = GetScadaData(data);
                    foreach (var item in realScadaDataList)
                    {
                         
                    }
                    break;

            }
              return realScadaDataList;
         }*/
@@ -383,33 +379,23 @@
        {
            if (isDebug)
                return 6.1;//debug
            double err = -1;
            string tag_water_level = "10001";
            string url = $"{ZyApiUrl}dataController/getCurrentJsonDataOfRedis/义维模型";
            var result = HttpClientHelper.Get(url);
            // LogHelper.Info(result)
            if (result != null)
            var data = HttpClientHelper.Get(url);
            if (data == null)
                return err;
            if (!data.ContainsKey(tag_water_level))
                return err;
            var scada = data[tag_water_level];
            if (!scada.ContainsKey("vals"))
                return err;
            var vals = scada["vals"];
            if (double.TryParse(vals, out double value))
            {
                foreach (var item in result)
                {
                    try
                    {
                        if (item.Key == "10001")
                        {
                            foreach (var valuedata in item.Value)
                            {
                                if (valuedata.Key == "vals")
                                {
                                    return Convert.ToDouble(valuedata.Value);
                return value;
                                }
                            }
                        }
                    }
                    catch
                    {
                        return -1;
                    }
                }
            }
            return -1;
            return err;
        }

        /// <summary>
@@ -579,13 +565,13 @@
            {
                List<byte> outputBytes = new List<byte>();//全部消息容器
                var buffer = new byte[1024 * 4];//缓冲区
                var result = await ws.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None); //监听Socket信息
                while (!result.CloseStatus.HasValue)  //是否关闭
                   var data = await ws.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None); //监听Socket信息
                   while (!data.CloseStatus.HasValue)  //是否关闭
                {
                    if (result.MessageType == WebSocketMessageType.Text)//文本消息
                       if (data.MessageType == WebSocketMessageType.Text)//文本消息
                    {
                        outputBytes.AddRange(buffer.Take(result.Count));
                        if (result.EndOfMessage)//消息是否已接收完全
                           outputBytes.AddRange(buffer.Take(data.Count));
                           if (data.EndOfMessage)//消息是否已接收完全
                        {
                            //发送过来的消息
                            string outputJson = Encoding.UTF8.GetString(outputBytes.ToArray(), 0, outputBytes.Count);
@@ -609,7 +595,7 @@
                            break;
                        }
                    }
                    result = await ws.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);//继续监听Socket信息
                       data = await ws.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);//继续监听Socket信息
                }
            }
            catch (Exception ex)
@@ -656,13 +642,13 @@
            {
                List<byte> outputBytes = new List<byte>();//全部消息容器
                var buffer = new byte[1024 * 4];//缓冲区
                var result = await ws.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None); //监听Socket信息
                while (!result.CloseStatus.HasValue)  //是否关闭
                   var data = await ws.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None); //监听Socket信息
                   while (!data.CloseStatus.HasValue)  //是否关闭
                {
                    if (result.MessageType == WebSocketMessageType.Text)//文本消息
                       if (data.MessageType == WebSocketMessageType.Text)//文本消息
                    {
                        outputBytes.AddRange(buffer.Take(result.Count));
                        if (result.EndOfMessage)//消息是否已接收完全
                           outputBytes.AddRange(buffer.Take(data.Count));
                           if (data.EndOfMessage)//消息是否已接收完全
                        {
                            //发送过来的消息
                            string outputJson = Encoding.UTF8.GetString(outputBytes.ToArray(), 0, outputBytes.Count);
@@ -690,7 +676,7 @@
                            break;
                        }
                    }
                    result = await ws.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);//继续监听Socket信息
                       data = await ws.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);//继续监听Socket信息
                }
            }
            catch (Exception ex)