From 4b4cc0dd66d0bfb8220709f6a5edd5fc3b8a65c2 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 02 六月 2025 13:58:47 +0800
Subject: [PATCH] 按需修改美心接口
---
project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs | 101 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 88 insertions(+), 13 deletions(-)
diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs"
index 8f64b67..f05ae68 100644
--- "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs"
+++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs"
@@ -63,29 +63,74 @@
int liftPosition = (int)para.LeftPosition;//宸︿几鍑轰綅缃�
int rigtpostition = (int)para.RightPosition;//鍙充几鍑轰綅缃�
+ var leftorigin = devices.Value.left.Communicator.Read<bool>("M115");//宸lc鍒板師鐐逛綅缃俊鍙�
+ var rightorigin = devices.Value.right.Communicator.Read<bool>("M115");//鍙硃lc鍒拌揪鍘熺偣浣嶇疆淇″彿
+ var lefttarget = devices.Value.left.Communicator.Read<bool>("M116");//宸lc鍒拌揪鐩爣浣嶇疆
+ var righttarget = devices.Value.right.Communicator.Read<bool>("M116");//鍙硃lc鍒拌揪鐩爣浣嶇疆
+
+ if (leftorigin == true || rightorigin == true)
+ {
+ return new WebResponseContent { Status = false, Message = "宸插埌鍘熷鐐�" };
+ }
+ if (lefttarget == true || righttarget == true)
+ {
+ return new WebResponseContent { Status = false, Message = "宸插埌鏈�澶у��" };
+ }
if (extendedState == "浼稿嚭")
{
- devices.Value.left.Communicator.Write<int>("D1001", ext);//宸LC鑷姩浼稿嚭缂╁洖閫熷害
- devices.Value.left.Communicator.Write<bool>("M102", true);//浼稿嚭鎸夐挳
- devices.Value.right.Communicator.Write<int>("D1002", liftPosition);//宸︿几鍑轰綅缃�
+ 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)
+ {
+
+ }
- 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);//鍙充几鍑轰綅缃�
+ 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)
+ {
+
+ throw;
+ }
+
+
Console.WriteLine($"DeptId={deptId} 锛屽乏閫熷害={ext}锛屽彸閫熷害={ret}");
}
else if (extendedState == "缂╁洖")
{
- devices.Value.left.Communicator.Write<int>("D1001", ext);//缂╁洖閫熷害
- devices.Value.left.Communicator.Write<bool>("M103", true);//缂╁洖鎸夐挳
+ try
+ {
+ devices.Value.left.Communicator.Write<int>("D1001", ext);//缂╁洖閫熷害
+ devices.Value.left.Communicator.Write<bool>("M103", true);//缂╁洖鎸夐挳
+ }
+ catch (Exception)
+ {
- devices.Value.right.Communicator.Write<int>("D1001", ret);
- devices.Value.right.Communicator.Write<bool>("M103", true);
+ throw;
+ }
+ try
+ {
+ devices.Value.right.Communicator.Write<int>("D1001", ret);
+ devices.Value.right.Communicator.Write<bool>("M103", true);
+ }
+ catch (Exception)
+ {
+
+ throw;
+ }
Console.WriteLine($"DeptId={deptId} 缂╁洖鎿嶄綔锛屽乏閫熷害={ext}锛屽彸閫熷害={ret}");
}
else
@@ -129,6 +174,19 @@
int ext = (int)para.ManualExtend;//宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害
int ret = (int)para.ManualRetraction;//鍙砅LC鎵嬪姩浼稿嚭缂╁洖閫熷害
+ var leftorigin = devices.Value.left.Communicator.Read<bool>("M115");//宸lc鍒板師鐐逛綅缃俊鍙�
+ var rightorigin = devices.Value.right.Communicator.Read<bool>("M115");//鍙硃lc鍒拌揪鍘熺偣浣嶇疆淇″彿
+ var lefttarget = devices.Value.left.Communicator.Read<bool>("M116");//宸lc鍒拌揪鐩爣浣嶇疆
+ var righttarget = devices.Value.right.Communicator.Read<bool>("M116");//鍙硃lc鍒拌揪鐩爣浣嶇疆
+
+ if (leftorigin == true || rightorigin == true)
+ {
+ return new WebResponseContent { Status = false, Message = "宸插埌鍘熷鐐�" };
+ }
+ if (lefttarget == true || righttarget == true)
+ {
+ return new WebResponseContent { Status = false, Message = "宸插埌鏈�澶у��" };
+ }
if (position == "宸�" && ExtendedState == "浼稿嚭")
{
@@ -188,8 +246,25 @@
{
//鏍规嵁int.TryParse(AppSettings.Get("DepartmentID")璇诲彇鍒板綋鍓嶆槸杞ㄩ亾鍑狅紝鎵�鏈変汉閮藉彧鑳芥搷浣滃綋鍓�
var devices = GetDevicesByDeptId(deptid);
- devices.Value.left.Communicator.Write<bool>("M104", true);
- devices.Value.right.Communicator.Write<bool>("M104", true);
+ try
+ {
+ devices.Value.left.Communicator.Write<bool>("M104", true);
+ }
+ catch (Exception)
+ {
+
+ throw;
+ }
+
+ try
+ {
+ devices.Value.right.Communicator.Write<bool>("M104", true);
+ }
+ catch (Exception)
+ {
+
+ throw;
+ }
return new WebResponseContent { Status = true, Message = "鏆傚仠鎴愬姛", Data = devices };
}
catch (Exception ex)
@@ -201,7 +276,7 @@
/// <summary>
- /// 浼哥缉鏉嗗綋鍓嶄綅缃�
+ /// 浼哥缉鏉嗗綋鍓嶄綅缃�(杩欎釜娌℃湁鐢�)
/// <param name="deptid">杞ㄩ亾绔欏彿</param>
public WebResponseContent CurrentLocation(int deptid)
{
--
Gitblit v1.9.3