From 0354ecda41778206f0457b4c7c2c774ea3e99944 Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期一, 24 十月 2022 16:36:36 +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 | 12
Application/IStation.Application.OpenApi/shys/plan/shys/ShysHelper.cs | 12 +
Application/IStation.Application.OpenApi/shys/plan/shys/shys严桥泵站.cs | 105 +++++++++++++++
TopShelf/IStation.TopShelf.Eta/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
Application/IStation.Application.OpenApi/shys/plan/shys/shys五号沟严桥方向1.cs | 102 ++++++++++++++
Application/IStation.Application.OpenApi/shys/plan/shys/shys五号沟金海方向.cs | 107 +++++++++++++++
Application/IStation.Application.OpenApi/shys/plan/shys/shys五号沟凌桥方向.cs | 31 ++--
Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
8 files changed, 346 insertions(+), 27 deletions(-)
diff --git a/Application/IStation.Application.Monitor/monitor_control/MonitorControlNTConfigure_Controller.cs b/Application/IStation.Application.Monitor/monitor_control/MonitorControlNTConfigure_Controller.cs
index 9b1565e..95108a3 100644
--- a/Application/IStation.Application.Monitor/monitor_control/MonitorControlNTConfigure_Controller.cs
+++ b/Application/IStation.Application.Monitor/monitor_control/MonitorControlNTConfigure_Controller.cs
@@ -24,9 +24,9 @@
/// </summary>
[Route("TestStart@V1.0")]
[HttpPost]
- public bool TestStart()
+ public string TestStart()
{
- return true;
+ return "娴嬭瘯鎴愬姛!";
}
/// <summary>
@@ -34,9 +34,9 @@
/// </summary>
[Route("TestStop@V1.0")]
[HttpPost]
- public bool TestStop()
+ public string TestStop()
{
- return true;
+ return "娴嬭瘯鎴愬姛!";
}
/// <summary>
@@ -44,9 +44,9 @@
/// </summary>
[Route("TestChange@V1.0")]
[HttpPost]
- public bool TestChange(NTTestChangeInput input)
+ public string TestChange(NTTestChangeInput input)
{
- return true;
+ return "娴嬭瘯鎴愬姛!";
}
diff --git a/Application/IStation.Application.OpenApi/shys/plan/shys/ShysHelper.cs b/Application/IStation.Application.OpenApi/shys/plan/shys/ShysHelper.cs
index 9c1c6fd..c366097 100644
--- a/Application/IStation.Application.OpenApi/shys/plan/shys/ShysHelper.cs
+++ b/Application/IStation.Application.OpenApi/shys/plan/shys/ShysHelper.cs
@@ -32,12 +32,14 @@
private static void Inital()
{
_dict = new Dictionary<int, StationInfo>();
- //_dict.Add(1, new StationInfo(2, new IStation.Calculation.shys闀垮叴娉电珯()));
- //_dict.Add(2, new StationInfo(12, new IStation.Calculation.shys浜斿彿娌熷噷妗ユ柟鍚�()));
-
-
- _dict.Add(5, new StationInfo(5, new shys浜斿彿娌熶弗妗ユ柟鍚�2()));
+ _dict.Add(1, new StationInfo(2, new IStation.Calculation.shys闀垮叴娉电珯()));//OK
+ _dict.Add(2, new StationInfo(12, new IStation.Calculation.shys浜斿彿娌熷噷妗ユ柟鍚�()));//OK
+ _dict.Add(3, new StationInfo(9, new IStation.Calculation.shys浜斿彿娌熼噾娴锋柟鍚�()));//OK
+ _dict.Add(4, new StationInfo(3, new IStation.Calculation.shys浜斿彿娌熶弗妗ユ柟鍚�1()));
+ _dict.Add(5, new StationInfo(5, new IStation.Calculation.shys浜斿彿娌熶弗妗ユ柟鍚�2()));//OK
+ _dict.Add(6, new StationInfo(4, new IStation.Calculation.shys浜斿彿娌熶弗妗ユ柟鍚�2()));//OK
//{
+
// {1,2},//闀垮叴娉电珯
// {2,12},//浜斿彿娌熷噷妗ユ柟鍚�
// {3,9},//浜斿彿娌熼噾娴锋柟鍚�
diff --git "a/Application/IStation.Application.OpenApi/shys/plan/shys/shys\344\270\245\346\241\245\346\263\265\347\253\231.cs" "b/Application/IStation.Application.OpenApi/shys/plan/shys/shys\344\270\245\346\241\245\346\263\265\347\253\231.cs"
new file mode 100644
index 0000000..3b1e472
--- /dev/null
+++ "b/Application/IStation.Application.OpenApi/shys/plan/shys/shys\344\270\245\346\241\245\346\263\265\347\253\231.cs"
@@ -0,0 +1,105 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IStation.Calculation
+{
+ internal class shys涓ユˉ娉电珯 : PlanAnaBaseCalculator
+ {
+ public shys涓ユˉ娉电珯()
+ {
+ this._corpID = 4;
+ this._dispatchAnaCalc = new IStation.Calculation.DispatchAna.Calculator_OptAna_General();
+ }
+
+ /// <summary>
+ /// 娴嬬偣瀛楀吀(杩欎釜姣忎釜娉电珯閮戒笉涓�鏍�)
+ /// </summary>
+ private Tuple<string, long> monitor杩涙按璋冭妭姹犳恫浣� = new Tuple<string, long>("_0402010101089903001", 409);
+
+
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="tagname"></param>
+ /// <returns></returns>
+ public override bool Is娑蹭綅Monitor(string tagname)
+ {
+ if (tagname == monitor杩涙按璋冭妭姹犳恫浣�.Item1)
+ return true;
+ else
+ return false;
+ }
+
+ /// <summary>
+ /// 鏍规嵁涓夐珮鎻愪緵鐨勫弬鏁�,鏋勫缓璋冨害鍒嗘瀽鎵�闇�鐨勫弬鏁�, (杩欎釜姣忎釜娉电珯閮戒笉涓�鏍�)
+ /// </summary>
+ /// <param name="allRecords_hour"></param>
+ /// <param name="error_info"></param>
+ /// <returns></returns>
+ protected override DispatchAna.Model.RequestParasComplex BuildDispatchAnaRequest(
+ List<IStation.Dto.MonitorRecord4SG> allRecords_hour,
+ out string error_info)
+ {
+ if (allRecords_hour == null || allRecords_hour.Count == 0)
+ {
+ error_info = "浜斿彿娌熷噷妗ユ柟鍚戞祴鐐规暟鎹负绌�";
+ return null;
+ }
+ var complex_dispatch_request = new DispatchAna.Model.RequestParasComplex();
+ var water_level = allRecords_hour.Find(x => x.MonitorTag == monitor杩涙按璋冭妭姹犳恫浣�.Item1);
+ if (water_level == null)
+ {
+ water_level = allRecords_hour.Find(x => x.MonitorTag == monitor杩涙按璋冭妭姹犳恫浣�.Item1);
+ if (water_level == null)
+ {
+ error_info = "浜斿彿娌熷噷妗ユ柟鍚戞按搴撴恫浣嶆祴鐐规湭鎵惧埌";
+ return null;
+ }
+ }
+ //var pipe1_flow = allRecords_hour.Find(x => x.MonitorTag == monitor鍑烘按鎬荤鐬椂娴侀噺.Item1);
+ //if (pipe1_flow == null)
+ //{
+ // error_info = "浜斿彿娌熷噷妗ユ柟鍚戞按绠￠亾1娴侀噺娴嬬偣鏈壘鍒�";
+ // return null;
+ //}
+
+ //var pipe1_press = allRecords_hour.Find(x => x.MonitorTag == monitor鍑烘按鎬荤鍘嬪姏.Item1);
+ //if (pipe1_press == null)
+ //{
+ // error_info = "浜斿彿娌熷噷妗ユ柟鍚戞按绠￠亾1鍘嬪姏娴嬬偣鏈壘鍒�";
+ // return null;
+ //}
+
+
+ complex_dispatch_request.CorpID = this._corpID;
+ complex_dispatch_request.StationID = this._stationID;
+ complex_dispatch_request.SchemeNumber = 1;
+ complex_dispatch_request.PressValueType = DispatchAna.Model.RequestParasComplex.ePressValueType.鍘嬪姏;
+ complex_dispatch_request.WaterLevelPara = new List<DispatchAna.Model.WaterLevelPara>()
+ {
+ new DispatchAna.Model.WaterLevelPara(){ Name="姘存睜", Value = water_level.RecordValue}
+ };
+ complex_dispatch_request.OutletPipePara = new List<DispatchAna.Model.OutletPipePara>();
+ complex_dispatch_request.OutletPipePara.Add(new DispatchAna.Model.OutletPipePara()
+ {
+ Name = "鎬荤璺�",
+ //TargetFlow = pipe1_flow.RecordValue,
+ //TargetPress = pipe1_press.RecordValue,
+ });
+
+
+
+
+
+ error_info = null;
+ return complex_dispatch_request;
+ }
+
+
+ }
+}
diff --git "a/Application/IStation.Application.OpenApi/shys/plan/shys/shys\344\272\224\345\217\267\346\262\237\344\270\245\346\241\245\346\226\271\345\220\2211.cs" "b/Application/IStation.Application.OpenApi/shys/plan/shys/shys\344\272\224\345\217\267\346\262\237\344\270\245\346\241\245\346\226\271\345\220\2211.cs"
new file mode 100644
index 0000000..db8263d
--- /dev/null
+++ "b/Application/IStation.Application.OpenApi/shys/plan/shys/shys\344\272\224\345\217\267\346\262\237\344\270\245\346\241\245\346\226\271\345\220\2211.cs"
@@ -0,0 +1,102 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IStation.Calculation
+{
+ internal class shys浜斿彿娌熶弗妗ユ柟鍚�1 : PlanAnaBaseCalculator
+ {
+ public shys浜斿彿娌熶弗妗ユ柟鍚�1( )
+ {
+ this._corpID = 4;
+ this._dispatchAnaCalc = new IStation.Calculation.DispatchAna.Calculator_OptAna_General();
+ }
+
+ /// <summary>
+ /// 娴嬬偣瀛楀吀(杩欎釜姣忎釜娉电珯閮戒笉涓�鏍�)
+ /// </summary>
+ private Tuple<string, long> monitor鍑烘按鎬荤鍘嬪姏1 = new Tuple<string, long>("_0402010501080204001", 123);
+ private Tuple<string, long> monitor鍑烘按鎬荤鐬椂娴侀噺1 = new Tuple<string, long>("_0402010501080202001", 124);
+ private Tuple<string, long> monitor鍓嶆睜娑蹭綅1 = new Tuple<string, long>("_0402010501080203001", 120);
+ private Tuple<string, long> monitor鍓嶆睜娑蹭綅2 = new Tuple<string, long>("_0402010501080203002", 121);
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="tagname"></param>
+ /// <returns></returns>
+ public override bool Is娑蹭綅Monitor(string tagname)
+ {
+ if (tagname == monitor鍓嶆睜娑蹭綅1.Item1)
+ return true;
+ else
+ return false;
+ }
+
+ /// <summary>
+ /// 鏍规嵁涓夐珮鎻愪緵鐨勫弬鏁�,鏋勫缓璋冨害鍒嗘瀽鎵�闇�鐨勫弬鏁�, (杩欎釜姣忎釜娉电珯閮戒笉涓�鏍�)
+ /// </summary>
+ /// <param name="allRecords_hour"></param>
+ /// <param name="error_info"></param>
+ /// <returns></returns>
+ protected override DispatchAna.Model.RequestParasComplex BuildDispatchAnaRequest(
+ List<IStation.Dto.MonitorRecord4SG> allRecords_hour,
+ out string error_info)
+ {
+ if(allRecords_hour == null || allRecords_hour.Count == 0)
+ {
+ error_info = "浜斿彿娌熶弗妗ユ柟鍚�2娴嬬偣鏁版嵁涓虹┖";
+ return null;
+ }
+ var complex_dispatch_request = new DispatchAna.Model.RequestParasComplex();
+ var water_level = allRecords_hour.Find(x => x.MonitorTag == monitor鍓嶆睜娑蹭綅1.Item1);
+ if (water_level == null)
+ {
+
+ error_info = "浜斿彿娌熶弗妗ユ柟鍚�2姘村簱娑蹭綅娴嬬偣鏈壘鍒�";
+ return null;
+
+ }
+ var pipe1_flow = allRecords_hour.Find(x => x.MonitorTag == monitor鍑烘按鎬荤鐬椂娴侀噺1.Item1);
+ if (pipe1_flow == null)
+ {
+ error_info = "浜斿彿娌熶弗妗ユ柟鍚�2姘寸閬�1娴侀噺娴嬬偣鏈壘鍒�";
+ return null;
+ }
+
+ var pipe1_press = allRecords_hour.Find(x => x.MonitorTag == monitor鍑烘按鎬荤鍘嬪姏1.Item1);
+ if (pipe1_press == null)
+ {
+ error_info = "浜斿彿娌熶弗妗ユ柟鍚�2姘寸閬�1鍘嬪姏娴嬬偣鏈壘鍒�";
+ return null;
+ }
+
+
+ complex_dispatch_request.CorpID = this._corpID;
+ complex_dispatch_request.StationID = this._stationID;
+ complex_dispatch_request.SchemeNumber = 1;
+ complex_dispatch_request.PressValueType = DispatchAna.Model.RequestParasComplex.ePressValueType.鍘嬪姏;
+ complex_dispatch_request.WaterLevelPara = new List<DispatchAna.Model.WaterLevelPara>()
+ {
+ new DispatchAna.Model.WaterLevelPara(){ Name="姘存睜", Value = water_level.RecordValue}
+ };
+ complex_dispatch_request.OutletPipePara = new List<DispatchAna.Model.OutletPipePara>();
+ complex_dispatch_request.OutletPipePara.Add(new DispatchAna.Model.OutletPipePara()
+ {
+ Name = "鎬荤璺�",
+ TargetFlow = pipe1_flow.RecordValue,
+ TargetPress = pipe1_press.RecordValue,
+ });
+
+
+
+
+
+ error_info = null;
+ return complex_dispatch_request;
+ }
+
+
+ }
+}
diff --git "a/Application/IStation.Application.OpenApi/shys/plan/shys/shys\344\272\224\345\217\267\346\262\237\345\207\214\346\241\245\346\226\271\345\220\221.cs" "b/Application/IStation.Application.OpenApi/shys/plan/shys/shys\344\272\224\345\217\267\346\262\237\345\207\214\346\241\245\346\226\271\345\220\221.cs"
index 3aa786e..33c592e 100644
--- "a/Application/IStation.Application.OpenApi/shys/plan/shys/shys\344\272\224\345\217\267\346\262\237\345\207\214\346\241\245\346\226\271\345\220\221.cs"
+++ "b/Application/IStation.Application.OpenApi/shys/plan/shys/shys\344\272\224\345\217\267\346\262\237\345\207\214\346\241\245\346\226\271\345\220\221.cs"
@@ -2,13 +2,13 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
namespace IStation.Calculation
{
internal class shys浜斿彿娌熷噷妗ユ柟鍚� : PlanAnaBaseCalculator
- {
- public shys浜斿彿娌熷噷妗ユ柟鍚�( )
+ {
+ public shys浜斿彿娌熷噷妗ユ柟鍚�()
{
this._corpID = 4;
this._dispatchAnaCalc = new IStation.Calculation.DispatchAna.Calculator_OptAna_General();
@@ -17,10 +17,13 @@
/// <summary>
/// 娴嬬偣瀛楀吀(杩欎釜姣忎釜娉电珯閮戒笉涓�鏍�)
/// </summary>
- private Tuple<string, long> monitor鍑烘按鎬荤鍘嬪姏 = new Tuple<string, long>("_0402010501080204002", 126);
- private Tuple<string, long> monitor鍑烘按鎬荤鐬椂娴侀噺 = new Tuple<string, long>("_0402010501080202003", 127);
- private Tuple<string, long> monitor鍓嶆睜娑蹭綅 = new Tuple<string, long>("_0402010501080203003", 122);
-
+ private Tuple<string, long> monitor鍑烘按鎬荤鐬椂娴侀噺 = new Tuple<string, long>("_0402010501080102001", 351);
+ private Tuple<string, long> monitor鍑烘按鎬荤鍘嬪姏 = new Tuple<string, long>("_0402010501080104001", 350);
+ private Tuple<string, long> monitor鍓嶆睜娑蹭綅6 = new Tuple<string, long>("_0402010501080103003", 349);
+
+
+
+
/// <summary>
///
/// </summary>
@@ -28,7 +31,7 @@
/// <returns></returns>
public override bool Is娑蹭綅Monitor(string tagname)
{
- if (tagname == monitor鍓嶆睜娑蹭綅.Item1)
+ if (tagname == monitor鍓嶆睜娑蹭綅6.Item1)
return true;
else
return false;
@@ -44,16 +47,16 @@
List<IStation.Dto.MonitorRecord4SG> allRecords_hour,
out string error_info)
{
- if(allRecords_hour == null || allRecords_hour.Count == 0)
+ if (allRecords_hour == null || allRecords_hour.Count == 0)
{
error_info = "浜斿彿娌熷噷妗ユ柟鍚戞祴鐐规暟鎹负绌�";
return null;
}
var complex_dispatch_request = new DispatchAna.Model.RequestParasComplex();
- var water_level = allRecords_hour.Find(x => x.MonitorTag == monitor鍓嶆睜娑蹭綅.Item1);
+ var water_level = allRecords_hour.Find(x => x.MonitorTag == monitor鍓嶆睜娑蹭綅6.Item1);
if (water_level == null)
{
- water_level = allRecords_hour.Find(x => x.MonitorTag == monitor鍓嶆睜娑蹭綅.Item1);
+ water_level = allRecords_hour.Find(x => x.MonitorTag == monitor鍓嶆睜娑蹭綅6.Item1);
if (water_level == null)
{
error_info = "浜斿彿娌熷噷妗ユ柟鍚戞按搴撴恫浣嶆祴鐐规湭鎵惧埌";
@@ -74,7 +77,7 @@
return null;
}
-
+
complex_dispatch_request.CorpID = this._corpID;
complex_dispatch_request.StationID = this._stationID;
complex_dispatch_request.SchemeNumber = 1;
@@ -90,9 +93,9 @@
TargetFlow = pipe1_flow.RecordValue,
TargetPress = pipe1_press.RecordValue,
});
-
-
+
+
error_info = null;
diff --git "a/Application/IStation.Application.OpenApi/shys/plan/shys/shys\344\272\224\345\217\267\346\262\237\351\207\221\346\265\267\346\226\271\345\220\221.cs" "b/Application/IStation.Application.OpenApi/shys/plan/shys/shys\344\272\224\345\217\267\346\262\237\351\207\221\346\265\267\346\226\271\345\220\221.cs"
new file mode 100644
index 0000000..2b32d6f
--- /dev/null
+++ "b/Application/IStation.Application.OpenApi/shys/plan/shys/shys\344\272\224\345\217\267\346\262\237\351\207\221\346\265\267\346\226\271\345\220\221.cs"
@@ -0,0 +1,107 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IStation.Calculation
+{
+ internal class shys浜斿彿娌熼噾娴锋柟鍚� : PlanAnaBaseCalculator
+ {
+ public shys浜斿彿娌熼噾娴锋柟鍚�()
+ {
+ this._corpID = 4;
+ this._dispatchAnaCalc = new IStation.Calculation.DispatchAna.Calculator_OptAna_General();
+ }
+
+ /// <summary>
+ /// 娴嬬偣瀛楀吀(杩欎釜姣忎釜娉电珯閮戒笉涓�鏍�)
+ /// </summary>
+
+ private Tuple<string, long> monitor鍑烘按鎬荤1鍘嬪姏 = new Tuple<string, long>("_0402010501080104002", 265);
+ private Tuple<string, long> monitor鍑烘按鎬荤1鐬椂娴侀噺 = new Tuple<string, long>("_0402010501080102003", 266);
+ private Tuple<string, long> monitor鍑烘按鎬荤2鍘嬪姏 = new Tuple<string, long>("_0402010501080104003", 268);
+ private Tuple<string, long> monitor鍑烘按鎬荤2鐬椂娴侀噺 = new Tuple<string, long>("_0402010501080102005", 269);
+ private Tuple<string, long> monitor鍓嶆睜娑蹭綅4 = new Tuple<string, long>("_0402010501080103001", 263);
+ private Tuple<string, long> monitor鍓嶆睜娑蹭綅5 = new Tuple<string, long>("_0402010501080103002", 264);
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="tagname"></param>
+ /// <returns></returns>
+ public override bool Is娑蹭綅Monitor(string tagname)
+ {
+ if (tagname == monitor鍓嶆睜娑蹭綅5.Item1)
+ return true;
+ else
+ return false;
+ }
+
+ /// <summary>
+ /// 鏍规嵁涓夐珮鎻愪緵鐨勫弬鏁�,鏋勫缓璋冨害鍒嗘瀽鎵�闇�鐨勫弬鏁�, (杩欎釜姣忎釜娉电珯閮戒笉涓�鏍�)
+ /// </summary>
+ /// <param name="allRecords_hour"></param>
+ /// <param name="error_info"></param>
+ /// <returns></returns>
+ protected override DispatchAna.Model.RequestParasComplex BuildDispatchAnaRequest(
+ List<IStation.Dto.MonitorRecord4SG> allRecords_hour,
+ out string error_info)
+ {
+ if (allRecords_hour == null || allRecords_hour.Count == 0)
+ {
+ error_info = "浜斿彿娌熷噷妗ユ柟鍚戞祴鐐规暟鎹负绌�";
+ return null;
+ }
+ var complex_dispatch_request = new DispatchAna.Model.RequestParasComplex();
+ var water_level = allRecords_hour.Find(x => x.MonitorTag == monitor鍓嶆睜娑蹭綅5.Item1);
+ if (water_level == null)
+ {
+ water_level = allRecords_hour.Find(x => x.MonitorTag == monitor鍓嶆睜娑蹭綅5.Item1);
+ if (water_level == null)
+ {
+ error_info = "浜斿彿娌熷噷妗ユ柟鍚戞按搴撴恫浣嶆祴鐐规湭鎵惧埌";
+ return null;
+ }
+ }
+ var pipe1_flow = allRecords_hour.Find(x => x.MonitorTag == monitor鍑烘按鎬荤1鐬椂娴侀噺.Item1);
+ if (pipe1_flow == null)
+ {
+ error_info = "浜斿彿娌熷噷妗ユ柟鍚戞按绠￠亾1娴侀噺娴嬬偣鏈壘鍒�";
+ return null;
+ }
+
+ var pipe1_press = allRecords_hour.Find(x => x.MonitorTag == monitor鍑烘按鎬荤1鍘嬪姏.Item1);
+ if (pipe1_press == null)
+ {
+ error_info = "浜斿彿娌熷噷妗ユ柟鍚戞按绠￠亾1鍘嬪姏娴嬬偣鏈壘鍒�";
+ return null;
+ }
+
+
+ complex_dispatch_request.CorpID = this._corpID;
+ complex_dispatch_request.StationID = this._stationID;
+ complex_dispatch_request.SchemeNumber = 1;
+ complex_dispatch_request.PressValueType = DispatchAna.Model.RequestParasComplex.ePressValueType.鍘嬪姏;
+ complex_dispatch_request.WaterLevelPara = new List<DispatchAna.Model.WaterLevelPara>()
+ {
+ new DispatchAna.Model.WaterLevelPara(){ Name="姘存睜", Value = water_level.RecordValue}
+ };
+ complex_dispatch_request.OutletPipePara = new List<DispatchAna.Model.OutletPipePara>();
+ complex_dispatch_request.OutletPipePara.Add(new DispatchAna.Model.OutletPipePara()
+ {
+ Name = "鎬荤璺�",
+ TargetFlow = pipe1_flow.RecordValue,
+ TargetPress = pipe1_press.RecordValue,
+ });
+
+
+
+
+
+ error_info = null;
+ return complex_dispatch_request;
+ }
+
+
+ }
+}
diff --git a/Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user b/Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
index 1d1c54a..08910bc 100644
--- a/Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\WorkData\IStation\IStationV4.1\Core\Service.V4.1\Entry\IStation.WebApi.Entry\bin\Release\net6.0\publish\</_PublishTargetUrl>
- <History>True|2022-10-21T10:51:32.0221235Z;True|2022-10-21T18:35:12.1463858+08:00;True|2022-10-21T09:54:19.2138550+08:00;True|2022-10-21T09:38:21.1672347+08:00;True|2022-10-19T12:04:59.9103579+08:00;True|2022-10-19T11:57:45.1000513+08:00;True|2022-10-19T11:49:03.6494799+08:00;True|2022-10-19T11:06:22.4198711+08:00;True|2022-10-18T11:17:20.1435537+08:00;True|2022-10-18T09:08:58.6802639+08:00;True|2022-10-17T16:33:12.8912333+08:00;True|2022-10-17T14:23:10.0264671+08:00;True|2022-10-17T14:16:07.3590282+08:00;True|2022-10-17T11:53:21.9425089+08:00;True|2022-10-17T11:45:51.9336429+08:00;True|2022-10-14T14:37:15.6323508+08:00;True|2022-10-11T09:01:44.5831439+08:00;True|2022-10-09T14:03:43.6568874+08:00;True|2022-10-09T11:15:56.2934983+08:00;True|2022-10-09T09:39:28.1074512+08:00;True|2022-10-08T18:45:23.9581502+08:00;True|2022-10-08T18:35:18.5574217+08:00;True|2022-10-08T16:12:04.2903137+08:00;True|2022-10-08T15:59:54.5588351+08:00;True|2022-10-08T15:55:01.2711550+08:00;True|2022-10-08T15:19:08.5487617+08:00;True|2022-10-08T15:11:55.8626990+08:00;False|2022-10-08T15:02:33.5639703+08:00;True|2022-10-08T09:23:21.6592006+08:00;True|2022-10-07T15:35:37.7532304+08:00;True|2022-10-07T15:04:51.9161653+08:00;False|2022-10-07T14:58:32.8816319+08:00;False|2022-10-07T14:54:55.4175944+08:00;False|2022-10-07T14:52:46.7215376+08:00;False|2022-10-07T14:51:14.0508027+08:00;False|2022-10-07T14:49:57.6007572+08:00;False|2022-10-07T14:48:56.6085134+08:00;False|2022-10-07T14:47:54.7931315+08:00;True|2022-09-22T13:35:52.6495568+08:00;True|2022-09-22T13:19:28.3609130+08:00;True|2022-09-22T09:45:29.7312648+08:00;True|2022-09-21T17:11:30.6881814+08:00;True|2022-09-15T16:32:44.8582766+08:00;True|2022-09-04T14:21:59.9156800+08:00;True|2022-09-03T18:27:37.0001278+08:00;True|2022-08-29T10:26:27.0532192+08:00;True|2022-08-24T13:40:25.0333335+08:00;True|2022-08-23T10:20:23.3347504+08:00;True|2022-08-19T15:24:53.5488496+08:00;False|2022-08-19T15:24:15.4430294+08:00;True|2022-08-19T11:51:17.0556654+08:00;True|2022-08-19T11:45:03.9834334+08:00;True|2022-08-19T10:56:27.1184994+08:00;True|2022-08-18T16:31:26.4673400+08:00;True|2022-08-18T10:37:50.8776926+08:00;True|2022-08-17T17:10:09.3527873+08:00;True|2022-08-17T16:04:30.4487827+08:00;True|2022-08-15T13:35:48.4976973+08:00;True|2022-08-15T13:35:34.4046702+08:00;True|2022-08-15T13:31:44.3380038+08:00;True|2022-08-15T13:07:03.2183172+08:00;True|2022-07-25T15:14:36.3659352+08:00;True|2022-07-25T15:10:01.3426246+08:00;True|2022-07-25T13:20:08.1574461+08:00;True|2022-07-19T10:26:17.1257582+08:00;True|2022-07-14T10:30:13.1942620+08:00;True|2022-07-13T14:35:30.0524912+08:00;True|2022-07-08T14:32:42.4327635+08:00;True|2022-07-05T11:08:07.0982998+08:00;True|2022-07-04T10:33:11.4756479+08:00;True|2022-07-01T22:05:04.4907981+08:00;True|2022-07-01T15:57:41.6399584+08:00;True|2022-06-29T10:33:01.2518877+08:00;True|2022-06-29T09:35:04.8176716+08:00;True|2022-06-22T10:29:08.8189250+08:00;True|2022-06-21T20:20:26.7306581+08:00;True|2022-06-21T09:54:59.2174617+08:00;True|2022-06-20T16:05:34.5414017+08:00;True|2022-06-16T13:17:09.9717924+08:00;True|2022-06-16T09:40:45.1175998+08:00;True|2022-06-15T18:01:54.0267150+08:00;False|2022-06-15T18:00:46.8407587+08:00;True|2022-06-15T15:22:18.3048191+08:00;True|2022-06-15T14:10:37.0479735+08:00;False|2022-06-15T14:08:52.7287625+08:00;True|2022-06-15T11:52:36.3090013+08:00;True|2022-06-15T10:29:17.8467709+08:00;True|2022-06-15T09:53:07.0983926+08:00;False|2022-06-15T09:51:02.1269263+08:00;True|2022-06-14T16:42:04.7964854+08:00;True|2022-06-14T14:08:49.4227432+08:00;True|2022-06-14T14:04:00.9153594+08:00;True|2022-06-13T14:57:09.1986107+08:00;True|2022-06-12T10:12:40.2143903+08:00;True|2022-06-12T09:59:01.3527438+08:00;True|2022-06-09T17:47:54.0302121+08:00;True|2022-06-09T17:30:21.7998171+08:00;True|2022-06-09T13:53:49.3251173+08:00;True|2022-06-09T11:06:42.0691794+08:00;True|2022-06-09T10:24:37.1232972+08:00;</History>
+ <History>True|2022-10-24T08:12:49.4291001Z;True|2022-10-24T16:10:25.3757944+08:00;True|2022-10-24T14:04:51.7783988+08:00;True|2022-10-21T18:51:32.0221235+08:00;True|2022-10-21T18:35:12.1463858+08:00;True|2022-10-21T09:54:19.2138550+08:00;True|2022-10-21T09:38:21.1672347+08:00;True|2022-10-19T12:04:59.9103579+08:00;True|2022-10-19T11:57:45.1000513+08:00;True|2022-10-19T11:49:03.6494799+08:00;True|2022-10-19T11:06:22.4198711+08:00;True|2022-10-18T11:17:20.1435537+08:00;True|2022-10-18T09:08:58.6802639+08:00;True|2022-10-17T16:33:12.8912333+08:00;True|2022-10-17T14:23:10.0264671+08:00;True|2022-10-17T14:16:07.3590282+08:00;True|2022-10-17T11:53:21.9425089+08:00;True|2022-10-17T11:45:51.9336429+08:00;True|2022-10-14T14:37:15.6323508+08:00;True|2022-10-11T09:01:44.5831439+08:00;True|2022-10-09T14:03:43.6568874+08:00;True|2022-10-09T11:15:56.2934983+08:00;True|2022-10-09T09:39:28.1074512+08:00;True|2022-10-08T18:45:23.9581502+08:00;True|2022-10-08T18:35:18.5574217+08:00;True|2022-10-08T16:12:04.2903137+08:00;True|2022-10-08T15:59:54.5588351+08:00;True|2022-10-08T15:55:01.2711550+08:00;True|2022-10-08T15:19:08.5487617+08:00;True|2022-10-08T15:11:55.8626990+08:00;False|2022-10-08T15:02:33.5639703+08:00;True|2022-10-08T09:23:21.6592006+08:00;True|2022-10-07T15:35:37.7532304+08:00;True|2022-10-07T15:04:51.9161653+08:00;False|2022-10-07T14:58:32.8816319+08:00;False|2022-10-07T14:54:55.4175944+08:00;False|2022-10-07T14:52:46.7215376+08:00;False|2022-10-07T14:51:14.0508027+08:00;False|2022-10-07T14:49:57.6007572+08:00;False|2022-10-07T14:48:56.6085134+08:00;False|2022-10-07T14:47:54.7931315+08:00;True|2022-09-22T13:35:52.6495568+08:00;True|2022-09-22T13:19:28.3609130+08:00;True|2022-09-22T09:45:29.7312648+08:00;True|2022-09-21T17:11:30.6881814+08:00;True|2022-09-15T16:32:44.8582766+08:00;True|2022-09-04T14:21:59.9156800+08:00;True|2022-09-03T18:27:37.0001278+08:00;True|2022-08-29T10:26:27.0532192+08:00;True|2022-08-24T13:40:25.0333335+08:00;True|2022-08-23T10:20:23.3347504+08:00;True|2022-08-19T15:24:53.5488496+08:00;False|2022-08-19T15:24:15.4430294+08:00;True|2022-08-19T11:51:17.0556654+08:00;True|2022-08-19T11:45:03.9834334+08:00;True|2022-08-19T10:56:27.1184994+08:00;True|2022-08-18T16:31:26.4673400+08:00;True|2022-08-18T10:37:50.8776926+08:00;True|2022-08-17T17:10:09.3527873+08:00;True|2022-08-17T16:04:30.4487827+08:00;True|2022-08-15T13:35:48.4976973+08:00;True|2022-08-15T13:35:34.4046702+08:00;True|2022-08-15T13:31:44.3380038+08:00;True|2022-08-15T13:07:03.2183172+08:00;True|2022-07-25T15:14:36.3659352+08:00;True|2022-07-25T15:10:01.3426246+08:00;True|2022-07-25T13:20:08.1574461+08:00;True|2022-07-19T10:26:17.1257582+08:00;True|2022-07-14T10:30:13.1942620+08:00;True|2022-07-13T14:35:30.0524912+08:00;True|2022-07-08T14:32:42.4327635+08:00;True|2022-07-05T11:08:07.0982998+08:00;True|2022-07-04T10:33:11.4756479+08:00;True|2022-07-01T22:05:04.4907981+08:00;True|2022-07-01T15:57:41.6399584+08:00;True|2022-06-29T10:33:01.2518877+08:00;True|2022-06-29T09:35:04.8176716+08:00;True|2022-06-22T10:29:08.8189250+08:00;True|2022-06-21T20:20:26.7306581+08:00;True|2022-06-21T09:54:59.2174617+08:00;True|2022-06-20T16:05:34.5414017+08:00;True|2022-06-16T13:17:09.9717924+08:00;True|2022-06-16T09:40:45.1175998+08:00;True|2022-06-15T18:01:54.0267150+08:00;False|2022-06-15T18:00:46.8407587+08:00;True|2022-06-15T15:22:18.3048191+08:00;True|2022-06-15T14:10:37.0479735+08:00;False|2022-06-15T14:08:52.7287625+08:00;True|2022-06-15T11:52:36.3090013+08:00;True|2022-06-15T10:29:17.8467709+08:00;True|2022-06-15T09:53:07.0983926+08:00;False|2022-06-15T09:51:02.1269263+08:00;True|2022-06-14T16:42:04.7964854+08:00;True|2022-06-14T14:08:49.4227432+08:00;True|2022-06-14T14:04:00.9153594+08:00;True|2022-06-13T14:57:09.1986107+08:00;True|2022-06-12T10:12:40.2143903+08:00;True|2022-06-12T09:59:01.3527438+08:00;True|2022-06-09T17:47:54.0302121+08:00;True|2022-06-09T17:30:21.7998171+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/TopShelf/IStation.TopShelf.Eta/Properties/PublishProfiles/FolderProfile.pubxml.user b/TopShelf/IStation.TopShelf.Eta/Properties/PublishProfiles/FolderProfile.pubxml.user
index c5a6115..a3fdff3 100644
--- a/TopShelf/IStation.TopShelf.Eta/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/TopShelf/IStation.TopShelf.Eta/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2022-10-21T10:55:37.1960388Z;True|2022-10-21T18:37:47.3142064+08:00;True|2022-10-19T11:11:19.9748484+08:00;True|2022-10-18T14:53:08.5305852+08:00;True|2022-10-18T09:19:14.0442732+08:00;True|2022-10-17T11:35:09.6040323+08:00;True|2022-10-17T10:52:29.3004702+08:00;True|2022-10-17T10:34:49.0817739+08:00;True|2022-10-17T09:35:57.5450395+08:00;True|2022-10-17T09:19:39.4916147+08:00;True|2022-10-14T14:45:04.5959774+08:00;True|2022-10-08T13:42:45.7291582+08:00;True|2022-10-08T13:31:33.0167880+08:00;True|2022-10-08T11:09:08.8028943+08:00;True|2022-10-08T10:04:57.3573208+08:00;True|2022-09-28T16:12:17.1471133+08:00;True|2022-09-28T15:11:17.3924597+08:00;True|2022-09-28T15:07:24.1542712+08:00;True|2022-09-28T15:01:05.9450589+08:00;True|2022-09-28T13:14:26.7038834+08:00;True|2022-09-27T16:32:29.0286484+08:00;True|2022-09-27T14:15:56.0426476+08:00;True|2022-09-26T16:16:45.3404775+08:00;True|2022-09-26T15:50:09.2992619+08:00;True|2022-09-26T15:47:20.6418528+08:00;True|2022-09-25T16:30:19.2053341+08:00;True|2022-09-22T17:08:02.6481758+08:00;True|2022-09-22T10:24:35.0635421+08:00;True|2022-09-16T15:41:38.0594228+08:00;True|2022-09-16T15:23:44.1558393+08:00;True|2022-07-01T21:10:56.8914203+08:00;True|2022-07-01T15:16:47.4260591+08:00;True|2022-06-29T09:41:10.5136306+08:00;True|2022-06-08T10:45:13.3564100+08:00;True|2022-06-08T10:41:35.1533091+08:00;True|2022-06-06T14:07:28.9893476+08:00;True|2022-06-01T09:15:01.3097804+08:00;True|2022-05-29T10:18:06.7001434+08:00;</History>
+ <History>True|2022-10-24T06:01:39.4175627Z;True|2022-10-21T18:55:37.1960388+08:00;True|2022-10-21T18:37:47.3142064+08:00;True|2022-10-19T11:11:19.9748484+08:00;True|2022-10-18T14:53:08.5305852+08:00;True|2022-10-18T09:19:14.0442732+08:00;True|2022-10-17T11:35:09.6040323+08:00;True|2022-10-17T10:52:29.3004702+08:00;True|2022-10-17T10:34:49.0817739+08:00;True|2022-10-17T09:35:57.5450395+08:00;True|2022-10-17T09:19:39.4916147+08:00;True|2022-10-14T14:45:04.5959774+08:00;True|2022-10-08T13:42:45.7291582+08:00;True|2022-10-08T13:31:33.0167880+08:00;True|2022-10-08T11:09:08.8028943+08:00;True|2022-10-08T10:04:57.3573208+08:00;True|2022-09-28T16:12:17.1471133+08:00;True|2022-09-28T15:11:17.3924597+08:00;True|2022-09-28T15:07:24.1542712+08:00;True|2022-09-28T15:01:05.9450589+08:00;True|2022-09-28T13:14:26.7038834+08:00;True|2022-09-27T16:32:29.0286484+08:00;True|2022-09-27T14:15:56.0426476+08:00;True|2022-09-26T16:16:45.3404775+08:00;True|2022-09-26T15:50:09.2992619+08:00;True|2022-09-26T15:47:20.6418528+08:00;True|2022-09-25T16:30:19.2053341+08:00;True|2022-09-22T17:08:02.6481758+08:00;True|2022-09-22T10:24:35.0635421+08:00;True|2022-09-16T15:41:38.0594228+08:00;True|2022-09-16T15:23:44.1558393+08:00;True|2022-07-01T21:10:56.8914203+08:00;True|2022-07-01T15:16:47.4260591+08:00;True|2022-06-29T09:41:10.5136306+08:00;True|2022-06-08T10:45:13.3564100+08:00;True|2022-06-08T10:41:35.1533091+08:00;True|2022-06-06T14:07:28.9893476+08:00;True|2022-06-01T09:15:01.3097804+08:00;True|2022-05-29T10:18:06.7001434+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.3