From 1dcc7b63a20daad7c7060f18878d8e8dbaad02de Mon Sep 17 00:00:00 2001
From: qiuyao <qiuyao@hnkhzn.com>
Date: 星期一, 28 四月 2025 16:41:31 +0800
Subject: [PATCH] 解决冲突
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IAlarmResetHsyServer.cs | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IAlarmResetHsyServer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IAlarmResetHsyServer.cs"
index a51fce2..a62c3ad 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IAlarmResetHsyServer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IAlarmResetHsyServer.cs"
@@ -15,8 +15,32 @@
{
IRepository<Dt_AlarmResetHsy> Repository { get; }
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <param name="alarmContent"></param>
+ /// <param name="resetStatus"></param>
+ /// <returns></returns>
WebResponseContent AddAlarmHsy(string alarmContent, bool resetStatus);
+ /// <summary>
+ /// 鏌ョ湅琛ㄧ殑鍏ㄩ儴淇℃伅锛屾寜鐓х姸鎬佷负ture锛屾椂闂存渶鏂版潵鎺掑簭
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent GetWebSocketInfo();
+
+
+ /// <summary>
+ /// 灏嗚〃涓姸鎬佸叏閮ㄤ负true鐨勬敼涓篺alse
+ /// </summary>
+ /// <param name="status"></param>
+ /// <returns></returns>
+ WebResponseContent BecomeTrue();
+
+ /// <summary>
+ /// 涓婃父妫�淇亾淇℃伅
+ /// </summary>
+ WebResponseContent UpstreamInspectionRoad(UpstreamIDTO upstreamIDTO);
}
}
--
Gitblit v1.9.3