From ac93c4092a21dbf0fa9cf8b9b1302f2d5d183f61 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 09 六月 2025 20:48:20 +0800
Subject: [PATCH] 修改提示字段
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs | 308 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 193 insertions(+), 115 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs
index c5ba941..4382f87 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs
@@ -15,6 +15,7 @@
using WIDESEAWCS_ITelescopicService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
+using static WIDESEAWCS_Common.Face.TH_Faces;
namespace WIDESEAWCS_TelescopicService
@@ -37,6 +38,7 @@
/// <returns></returns>
public WebResponseContent automation(string ExtendedState)
{
+
try
{
@@ -48,105 +50,128 @@
var devices = GetDevicesByDeptId(deid);
//鎵惧埌Dt_Parameters涓殑鏈�鏂颁竴鏉℃暟鎹�
- var para = BaseDal.QueryData().Where(x=>x.Deptid== deid).OrderByDescending(x => x.CreateDate).FirstOrDefault();
+ var para = BaseDal.QueryData().Where(x => x.Deptid == deid).OrderByDescending(x => x.CreateDate).FirstOrDefault();
if (para == null)
return new WebResponseContent { Status = false, Message = "鏈壘鍒板弬鏁伴厤缃�" };
int ext = (int)para.ExtendSpeed;//宸LC鑷姩浼稿嚭缂╁洖閫熷害
int ret = (int)para.RetractionSpeed;//鍙砅LC鑷姩浼稿嚭缂╁洖閫熷害
- int liftPosition= (int)para.LeftPosition;//宸︿几鍑轰綅缃�
- int rigtpostition= (int)para.RightPosition;//鍙充几鍑轰綅缃�
+ int liftPosition = (int)para.LeftPosition;//宸︿几鍑轰綅缃�
+ int rigtpostition = (int)para.RightPosition;//鍙充几鍑轰綅缃�
+ string message = "";
+
try
{
- var leftorigin = devices.Value.left.Communicator.Read<bool>("M115");//宸lc鍒板師鐐逛綅缃俊鍙�
- var rightorigin = devices.Value.right.Communicator.Read<bool>("M115");//鍙硃lc鍒拌揪鍘熺偣浣嶇疆淇″彿
- if (leftorigin == true || rightorigin == true)
+ if (devices.Value.left.Communicator.Read<bool>("M117"))
{
- return new WebResponseContent { Status = false, Message = "宸插埌鍘熷鐐�" };
- }
- }
- catch (Exception)
- {
-
-
- }
- try
- {
- var lefttarget = devices.Value.left.Communicator.Read<bool>("M116");//宸lc鍒拌揪鐩爣浣嶇疆
- var righttarget = devices.Value.right.Communicator.Read<bool>("M116");//鍙硃lc鍒拌揪鐩爣浣嶇疆
- if (lefttarget == true || righttarget == true)
- {
- return new WebResponseContent { Status = false, Message = "宸插埌鏈�澶у��" };
- }
-
- }
- catch (Exception)
- {
-
-
- }
- if (ExtendedState == "浼稿嚭")
- {
- try
- {
- devices.Value.left.Communicator.Write<int>("D1001", ext);//宸LC鑷姩浼稿嚭缂╁洖閫熷害
- devices.Value.left.Communicator.Write<bool>("M102", true);//浼稿嚭鎸夐挳
- devices.Value.left.Communicator.Write<int>("D1002", liftPosition);//宸︿几鍑轰綅缃�
- }
- catch (Exception)
- {
-
- }
- try
- {
- devices.Value.right.Communicator.Write<int>("D1001", ret);//鍙砅LC鑷姩浼稿嚭缂╁洖閫熷害
- devices.Value.right.Communicator.Write<bool>("M102", true);//浼稿嚭鎸夐挳
- devices.Value.right.Communicator.Write<int>("D1002", rigtpostition);//鍙充几鍑轰綅缃�
- }
- catch (Exception)
- {
-
+
+ return new WebResponseContent { Status = true, Message = "鐜板湪姝ｅ湪杩涜涓紝绛夊緟鎿嶄綔瀹屾垚" };
}
- Console.WriteLine($"鑷姩浼哥缉鏉嗕几鍑� {ext},鍙充几鍑轰綅缃畕liftPosition}锛屽彸浼稿嚭浣嶇疆{rigtpostition}");
+ }
+ catch (Exception)
+ {
+ }
+ try
+ {
+ if (devices.Value.right.Communicator.Read<bool>("M117"))
+ {
+ return new WebResponseContent { Status = true, Message = "鐜板湪姝ｅ湪杩涜涓紝绛夊緟鎿嶄綔瀹屾垚" };
+ }
+
+ }
+ catch (Exception)
+ {
+ }
+
+ if (ExtendedState == "浼稿嚭")
+ {
+
+ try
+ {
+ if (devices.Value.left.Communicator.Read<float>("D80")>= liftPosition-5)//鍒拌揪鏈�澶т綅缃�)
+ {
+ message += "宸︿几缂╂潌鍒拌揪鐩爣浣嶇疆锛�";
+ }
+ else
+ {
+ devices.Value.left.Communicator.Write<int>("D1022", liftPosition);//浼稿嚭浣嶇疆
+ devices.Value.left.Communicator.Write<int>("D1002", ext);//宸LC鑷姩鍔ㄤ几鍑虹缉鍥為�熷害
+ devices.Value.left.Communicator.Write<bool>("M102", true);//浼稿嚭鎸夐挳
+
+ }
+ }
+ catch { }
+
+ try
+ {
+ if (devices.Value.right.Communicator.Read<float>("D80") >= rigtpostition-5)
+ {
+ message += "鍙充几缂╂潌鍒拌揪鐩爣浣嶇疆锛�";
+ }
+ else
+ {
+ devices.Value.right.Communicator.Write<int>("D1022", rigtpostition);
+ devices.Value.right.Communicator.Write<int>("D1002", ret);
+ devices.Value.right.Communicator.Write<bool>("M102", true);
+
+ } }
+ catch { }
+
}
else if (ExtendedState == "缂╁洖")
{
- try
- {
- devices.Value.left.Communicator.Write<int>("D1001", ext);//宸LC鑷姩浼稿嚭缂╁洖閫熷害
- devices.Value.left.Communicator.Write<bool>("M103", true);//缂╁洖鎸夐挳
- }
- catch (Exception)
- {
-
- }
- try
- {
- devices.Value.right.Communicator.Write<int>("D1001", ret);//鍙砅LC鑷姩浼稿嚭缂╁洖閫熷害
- devices.Value.right.Communicator.Write<bool>("M103", true);//缂╁洖鎸夐挳
- }
- catch (Exception)
- {
-
- }
- Console.WriteLine($"鑷姩浼哥缉鏉嗙缉鍥� {ret}");
- }
+ try
+ {
+ if (devices.Value.left.Communicator.Read<bool>("M115")) //鍒拌揪鍘熺偣浣�
+ {
+ message += "宸︿几缂╂潌宸插埌鍘熺偣锛�";
+ }
+ else
+ {
+ devices.Value.left.Communicator.Write<int>("D1022", liftPosition);
+ devices.Value.left.Communicator.Write<int>("D1002", ext);//宸LC鑷姩浼�=缂╁洖鍑虹缉鍥為�熷害
+ devices.Value.left.Communicator.Write<bool>("M103", true);//宸lc缂╁洖鎸夐挳
+
+
+ }
+ }
+ catch { }
+
+ try
+ {
+ if (devices.Value.right.Communicator.Read<bool>("M115"))
+ {
+ message += "鍙充几缂╂潌宸插埌鍘熺偣锛�";
+ }
+ else
+ {
+ devices.Value.right.Communicator.Write<int>("D1022", rigtpostition);
+ devices.Value.right.Communicator.Write<int>("D1002", ret);
+ devices.Value.right.Communicator.Write<bool>("M103", true);
+
+
+ }
+
+
+ }
+ catch { }
+
+ }
else
{
return new WebResponseContent { Status = false, Message = "鏈煡鐨勬搷浣滃懡浠�" };
}
- return new WebResponseContent { Status = true, Message = "鎴愬姛",
- Data = new
- {
- ExtendSpeed = ext,//
- RetractionSpeed = ret,
-
- }
+ return new WebResponseContent
+ {
+ Status = true,
+ Message = string.IsNullOrEmpty(message) ? "鎵ц鎴愬姛" : $"{message}",
+ Data = new { ExtendSpeed = ext, RetractionSpeed = ret,liftweiz= liftPosition,rightweiz= rigtpostition }
};
+
}
catch (Exception ex)
{
@@ -183,71 +208,124 @@
var para = BaseDal.QueryData().Where(x => x.Deptid == deid).OrderByDescending(x => x.CreateDate).FirstOrDefault();
int ext = (int)para.ManualExtend;//宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害
int ret = (int)para.ManualRetraction;//鍙砅LC鎵嬪姩浼稿嚭缂╁洖閫熷害
- try
- {
- var leftorigin = devices.Value.left.Communicator.Read<bool>("M115");//宸lc鍒板師鐐逛綅缃俊鍙�
- var rightorigin = devices.Value.right.Communicator.Read<bool>("M115");//鍙硃lc鍒拌揪鍘熺偣浣嶇疆淇″彿
- if (leftorigin == true || rightorigin == true)
- {
- return new WebResponseContent { Status = false, Message = "宸插埌鍘熷鐐�" };
- }
- }
- catch (Exception)
- {
+ int liftPosition = (int)para.LeftPosition;//宸︿几鍑轰綅缃�
+ int rigtpostition = (int)para.RightPosition;//鍙充几鍑轰綅缃�
+ //bool canLeft = true,
+ // canRight = true;
+ string message = "";
-
- }
try
{
- var lefttarget = devices.Value.left.Communicator.Read<bool>("M116");//宸lc鍒拌揪鐩爣浣嶇疆
- var righttarget = devices.Value.right.Communicator.Read<bool>("M116");//鍙硃lc鍒拌揪鐩爣浣嶇疆
- if (lefttarget == true || righttarget == true)
+ if (devices.Value.left.Communicator.Read<bool>("M117")) //榛樿鏄痜lase
{
- return new WebResponseContent { Status = false, Message = "宸插埌鏈�澶у��" };
+
+ return new WebResponseContent { Status = true, Message = "鐜板湪姝ｅ湪杩涜涓紝绛夊緟鎿嶄綔瀹屾垚" };
}
}
catch (Exception)
{
-
-
}
-
+ try
+ {
+ if (devices.Value.right.Communicator.Read<bool>("M117"))
+ {
+ return new WebResponseContent { Status = true, Message = "鐜板湪姝ｅ湪杩涜涓紝绛夊緟鎿嶄綔瀹屾垚" };
+ }
+ }
+ catch (Exception)
+ {
+ }
if (position == "宸�" && ExtendedState == "浼稿嚭")
{
- devices.Value.left.Communicator.Write<int>("D1000", ext);//宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害
- devices.Value.left.Communicator.Write<bool>("M100", true);//浼稿嚭鎸夐挳
- Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑簕ext}");
+ if (devices.Value.left.Communicator.Read<float>("D80") >= liftPosition - 5) //鍒拌揪鐩爣浣嶇疆
+ {
+ message += "宸︿几缂╂潌鍒拌揪鐩爣浣嶇疆锛�";
+ }
+ else
+ {
+ devices.Value.left.Communicator.Write<int>("D1004", liftPosition);//宸︿几鍑轰綅缃�
+ devices.Value.left.Communicator.Write<int>("D1000", ext);//宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害
+ devices.Value.left.Communicator.Write<bool>("M100", true);//浼稿嚭鎸夐挳
+ Thread.Sleep(100); // 绛夊緟100ms锛堟ā鎷熸寜閽寜涓嬶級
+ devices.Value.left.Communicator.Write<bool>("M100", false); // 閲婃斁鎸夐挳
+
+
+ Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑簕ext}");
+ }
+
}
else if (position == "宸�" && ExtendedState == "缂╁洖")
{
- devices.Value.left.Communicator.Write<int>("D1000", ext);//宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害
- devices.Value.left.Communicator.Write<bool>("M101", true);
-
- Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄧ缉鍥瀧ext}");
+ if (devices.Value.left.Communicator.Read<bool>("M115"))//缂╁洖鐨勬椂鍊欏垽鏂�)
+ {
+ message += "宸︿几缂╂潌宸插埌鍘熺偣锛�";
+ }
+ else
+ {
+ devices.Value.left.Communicator.Write<int>("D1004", liftPosition);//浼稿嚭浣嶇疆
+ devices.Value.left.Communicator.Write<int>("D1000", ext);//宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害
+ devices.Value.left.Communicator.Write<bool>("M101", true);
+ Thread.Sleep(100); // 绛夊緟100ms锛堟ā鎷熸寜閽寜涓嬶級
+ devices.Value.left.Communicator.Write<bool>("M101", false); // 閲婃斁鎸夐挳
+ Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄧ缉鍥瀧ext}");
+ }
+
}
- else if (position == "鍙�" && ExtendedState == "浼稿嚭")
+
+ if (position == "鍙�" && ExtendedState == "浼稿嚭")
{
- devices.Value.right.Communicator.Write<int>("D1000", ret);//鍙砅LC鎵嬪姩浼稿嚭缂╁洖閫熷害
- devices.Value.right.Communicator.Write<bool>("M100", true);
- Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑簕ret}");
+ if (devices.Value.right.Communicator.Read<float>("D80") >= rigtpostition - 5)
+ {
+ message += "鍙充几缂╂潌鍒拌揪鐩爣浣嶇疆锛�";
+ }
+ else
+ {
+ devices.Value.right.Communicator.Write<int>("D1004", rigtpostition);//鍙充几鍑轰綅缃�
+ devices.Value.right.Communicator.Write<int>("D1000", ret);//鍙砅LC鎵嬪姩浼稿嚭缂╁洖閫熷害
+ devices.Value.right.Communicator.Write<bool>("M100", true);
+ Thread.Sleep(100); // 绛夊緟100ms锛堟ā鎷熸寜閽寜涓嬶級
+ devices.Value.right.Communicator.Write<bool>("M100", false); // 閲婃斁鎸夐挳
+ Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑簕ret}");
+ }
+
+
}
else if (position == "鍙�" && ExtendedState == "缂╁洖")
{
- devices.Value.right.Communicator.Write<int>("D1000", ret);//鍙砅LC鎵嬪姩浼稿嚭缂╁洖閫熷害
- devices.Value.right.Communicator.Write<bool>("M101", true);
- Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄧ缉鍥瀧ret}");
+ if (devices.Value.right.Communicator.Read<bool>("M115"))
+ {
+ message += "鍙充几缂╂潌宸插埌鍘熺偣锛�";
+ }
+ else
+ {
+ devices.Value.right.Communicator.Write<int>("D1004", rigtpostition);//浼稿嚭浣嶇疆
+ devices.Value.right.Communicator.Write<int>("D1000", ret);//鍙砅LC鎵嬪姩浼稿嚭缂╁洖閫熷害
+ devices.Value.right.Communicator.Write<bool>("M101", true);
+ Thread.Sleep(100); // 绛夊緟100ms锛堟ā鎷熸寜閽寜涓嬶級
+ devices.Value.right.Communicator.Write<bool>("M101", false); // 閲婃斁鎸夐挳
+ Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄧ缉鍥瀧ret}");
+ }
+
}
- return new WebResponseContent { Status = true,
- Message = "鎴愬姛" ,
+
+
+
+ return new WebResponseContent
+ {
+ Status = true,
+ Message = string.IsNullOrEmpty(message) ? "鎵ц鎴愬姛" : $"{message}",
Data = new
{
ManualExtend = ext,
- ManualRetraction = ret
+ ManualRetraction = ret,
+ message
}
};
}
+
+
catch (Exception ex)
{
return new WebResponseContent { Status = false, Message = ex.Message };
--
Gitblit v1.9.3