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 | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 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 2df8ef6..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,6 +63,19 @@
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 == "浼稿嚭")
@@ -161,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 == "浼稿嚭")
{
--
Gitblit v1.9.3