Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1

tangxu

2023-04-12 ac2a648ea67669eab6de9a1864c07f6475511dd2

Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1

 Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs

@@ -30,10 +30,20 @@
        {
            if (input == null)
                return default;
            LogHelper.Debug(JsonHelper.Object2Json(input));
            //众毅连续两次调用解决方案
            if (!string.IsNullOrEmpty(_lastFlowId))
            {
                if (_lastFlowId == input.flowId)
                {
                    LogHelper.Debug($"众毅重复入参：{JsonHelper.Object2Json(input)}");
                    return default;
                }
            }
            _lastFlowId = input.flowId;
            LogHelper.Debug($"众毅入参：{JsonHelper.Object2Json(input)}");
            var url_sg = Settings.WebApi.OpenApi.SanGaoDispatchUrl;
            var responseText = HttpRequestHelper.Post(url_sg,JsonHelper.Object2Json(input));
            LogHelper.Debug(responseText);
            LogHelper.Debug($"三高出参：{responseText}");
            var result_sg = JsonHelper.Json2Object<DispatchFactoryDto>(responseText);
            if (result_sg == null)
                return default;
@@ -43,12 +53,13 @@
                case 1://长兴泵站
                    {
                        var result= shys_cxd(input, result_sg,out error_info);
                        //LogHelper.Debug(JsonHelper.Object2Json(result));
                        LogHelper.Debug($"义维出参：{JsonHelper.Object2Json(result)}");
                        return result;
                    }
                default:return default;
            }
        }
        private static string _lastFlowId = null;

        /// <summary>
        /// 计算保持的方案
@@ -178,9 +189,11 @@
            }
      
            complex_request_paras.InletPipePara = new List<IStation.Calculation.DispatchAna.Model.InletPipePara>();
            complex_request_paras.InletPipePara.Add(new IStation.Calculation.DispatchAna.Model.InletPipePara() {
            complex_request_paras.InletPipePara.Add(new IStation.Calculation.DispatchAna.Model.InletPipePara()
            {
                Name = "吸水井液位", 
                Value = water_level });
                Value = water_level
            });