From b9c76ce85e533250cd36de670146530f970859e7 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 01 八月 2025 11:29:49 +0800
Subject: [PATCH] 修改伸缩杆接口
---
项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs"
index ca85a13..f40ae71 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs"
@@ -98,7 +98,7 @@
- var query = BaseDal.QueryData(x => x.ResetStatus == true && x.Deptid== deid).ToList();
+ var query = BaseDal.QueryData(x => x.ResetStatus == true && x.Deptid== deid&&!x.AlarmContent.Contains("闅滅")).ToList();
// 濡傛灉娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勬暟鎹�
if (query.Count == 0)
{
@@ -106,7 +106,15 @@
}
try
{
+
var left = devices.Value.left.Communicator.Write<bool>("M105", true); //閲嶅惎鎶ヨ澶嶄綅
+ // 绛夊緟3绉�
+ Thread.Sleep(1000);
+ if (devices.Value.left.Communicator.Read<bool>("M109") || devices.Value.left.Communicator.Read<bool>("M111") || devices.Value.left.Communicator.Read<bool>("M110"))
+ {
+ devices.Value.left.Communicator.Write<bool>("M105", true); //閲嶅惎鎶ヨ澶嶄綅
+ return WebResponseContent.Instance.Error("澶嶄綅澶辫触锛岃閲嶆柊妫�鏌ュ悗閲嶆柊澶嶄綅锛堝锛氭�ュ仠鎸夐挳鏄惁鏉惧紑锛�");
+ }
Console.WriteLine($"宸︽姤璀︿俊鍙峰浣嶅啓鍏left}");
}
catch (Exception)
@@ -117,6 +125,13 @@
try
{
var right = devices.Value.right.Communicator.Write<bool>("M105", true);
+ Thread.Sleep(1000);
+ if (devices.Value.right.Communicator.Read<bool>("M109") || devices.Value.right.Communicator.Read<bool>("M111") || devices.Value.right.Communicator.Read<bool>("M110"))
+ {
+ devices.Value.right.Communicator.Write<bool>("M105", true);
+ return WebResponseContent.Instance.Error("澶嶄綅澶辫触锛岃閲嶆柊妫�鏌ュ悗閲嶆柊澶嶄綅锛堝锛氭�ュ仠鎸夐挳鏄惁鏉惧紑锛�");
+ }
+
Console.WriteLine($"鍙虫姤璀︿俊鍙峰浣嶅啓鍏right}");
}
catch (Exception)
@@ -179,6 +194,11 @@
}
//鎵惧埌璇ヨ建閬撶珯鐨勫叏閮ㄤ俊鎭�
var alarm = BaseDal.QueryData(x => x.Deptid == deid).ToList();
+ var deletableAlarms = alarm.Where(x => x.ResetStatus == true && !x.AlarmContent.Contains("闅滅")).ToList();//
+ if (deletableAlarms.Count>0)
+ {
+ return WebResponseContent.Instance.Error("璇峰厛澶嶄綅鍐嶅垹闄ゆ暟鎹�");
+ }
if (alarm.Count<=0)
{
return new WebResponseContent { Status = false, Message = $"娌℃湁瑕佸垹闄ょ殑{deid}杞ㄩ亾绔欑殑鎶ヨ淇℃伅" };
--
Gitblit v1.9.3