From 2f30d9dfe474db862e1b409065a7ba5280bed92b Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期一, 31 十月 2022 14:18:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1
---
Application/IStation.Application.Monitor/monitor_control/MonitorControlNTConfigure_Controller.cs | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/Application/IStation.Application.Monitor/monitor_control/MonitorControlNTConfigure_Controller.cs b/Application/IStation.Application.Monitor/monitor_control/MonitorControlNTConfigure_Controller.cs
index 92e312d..1a4473f 100644
--- a/Application/IStation.Application.Monitor/monitor_control/MonitorControlNTConfigure_Controller.cs
+++ b/Application/IStation.Application.Monitor/monitor_control/MonitorControlNTConfigure_Controller.cs
@@ -29,8 +29,21 @@
{
throw Oops.Oh("瀵嗙爜閿欒!");
}
- var context = new Model.MonitorTestControlParas.StartContext(input.HZ, input.OperatingMode, input.OperatingValue);
-
+ double operatingValue = 0;
+ /* switch (input.OperatingMode)
+ {
+ case Model.MonitorTestControlParas.eOperatingMode.Timing:
+ {
+ operatingValue = input.OperatingValue * 3600;
+ }
+ break;
+ case Model.MonitorTestControlParas.eOperatingMode.ConstantFlow:
+ break;
+ default:
+ break;
+ }*/
+ operatingValue = input.OperatingValue * 3600;
+ var context = new Model.MonitorTestControlParas.StartContext(input.HZ, input.OperatingMode, operatingValue);
var paras = new Model.MonitorTestControlParas();
paras.ControlType = Model.MonitorTestControlParas.eControlType.Start;
paras.Context = context.ToJson();
@@ -61,23 +74,22 @@
}
-/*
/// <summary>
- /// 娴嬭瘯鍙橀
+ /// 娴嬭瘯杩炴帴妯″紡
/// </summary>
[Route("TestChange@V1.0")]
[HttpPost]
public string TestChange(NTTestChangeInput input)
{
var paras = new Model.MonitorTestControlParas();
- paras.ControlType = -1;
- paras.Context = input.HZ.ToString();
+ paras.ControlType = Model.MonitorTestControlParas.eControlType.Stop;
+ paras.Context = string.Empty;
var runQueue = new RabbitMqExChangeHelper();
runQueue.Push("NTTEST", paras);
return "OK";
}
-*/
+
--
Gitblit v1.9.3