From 950a104d4690606f3b9744cc4b917b45fef34fb3 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期五, 09 十二月 2022 10:44:03 +0800
Subject: [PATCH] 用户日志报表接口
---
Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs b/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
index d63eee2..c31e9cb 100644
--- a/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
+++ b/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
@@ -42,7 +42,7 @@
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;
@@ -176,8 +176,8 @@
water_level = scada_water.value;
}
- complex_request_paras.WaterLevelPara = new List<IStation.Calculation.DispatchAna.Model.WaterLevelPara>();
- complex_request_paras.WaterLevelPara.Add(new IStation.Calculation.DispatchAna.Model.WaterLevelPara() {
+ complex_request_paras.InletPipePara = new List<IStation.Calculation.DispatchAna.Model.InletPipePara>();
+ complex_request_paras.InletPipePara.Add(new IStation.Calculation.DispatchAna.Model.InletPipePara() {
Name = "鍚告按浜曟恫浣�",
Value = water_level });
@@ -290,11 +290,13 @@
complex_request_paras.SchemeSortType = Calculation.DispatchAna.Model.eAnaSchemeSortType.鍔熺巼;
complex_request_paras.SchemeNumber = 1;
+ //鏋勯�犺绠楀櫒
+ var calulator = IStation.Calculation.DispatchAnalyCalculatorFactory.CreateKeepStatusCalculator(4, IStation.ObjectType.Station, 2,null);
+ calulator.IntialRequest(complex_request_paras,
+ null,
+ machine_run_status);
//鍑烘柟妗�
- var scheme = new IStation.Calculation.DispatchAna.Calculator4ShysCxbz().CalcKeepStatusByWhole(
- complex_request_paras,
- machine_run_status,
- out error_info);
+ var scheme = calulator.Calc(out error_info);
if (scheme == null)
return default;
var result = new IStation.Application.DispatchAnaSchemeOutput();
--
Gitblit v1.9.3