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_Server/Controllers/Telescopic/AlarmResetHsyController.cs |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/AlarmResetHsyController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/AlarmResetHsyController.cs"
index 7fe8049..e45a55a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/AlarmResetHsyController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/AlarmResetHsyController.cs"
@@ -27,6 +27,29 @@
             return Service.AddAlarmHsy(alarmContent, resetStatus);
         }
 
+        [HttpPost, Route("GetWebSocketInfo"), AllowAnonymous]
+        public WebResponseContent GetWebSocketInfo()
+        {
+            return Service.GetWebSocketInfo();
+        }
+
+        [HttpPost, Route("BecomeTrue"), AllowAnonymous]
+        public WebResponseContent BecomeTrue()
+        {
+            return Service.BecomeTrue();
+        }
+
+
+        /// <summary>
+        /// 鎺ユ敹涓婃父绯荤粺淇℃伅
+        /// </summary>
+        /// <param name="upstreamIDTO"></param>
+        /// <returns></returns>
+        [HttpPost, Route("UpstreamInspectionRoad"), AllowAnonymous]
+        public WebResponseContent UpstreamInspectionRoad([FromBody]UpstreamIDTO upstreamIDTO)
+        {
+            return Service.UpstreamInspectionRoad(upstreamIDTO);
+        }
 
 
     }

--
Gitblit v1.9.3