From 0aac30d1c6f1ca0c2bf7662fb9ca4f0d98b3bca7 Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期一, 09 六月 2025 14:29:25 +0800
Subject: [PATCH] Merge branch 'qy0427' of http://115.159.85.185:8098/r/MeiXinLaiRui/ShenSuoGanKongZhi into qy0427
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/AlarmResetHsyController.cs | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/AlarmResetHsyController.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/AlarmResetHsyController.cs
index 73af0a8..188e97b 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/AlarmResetHsyController.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/AlarmResetHsyController.cs
@@ -22,9 +22,9 @@
}
[HttpPost, Route("AddAlarmHsy")]
- public WebResponseContent AddAlarmHsy(string alarmContent, bool resetStatus)
+ public WebResponseContent AddAlarmHsy(int deptid, string alarmContent, bool resetStatus)
{
- return Service.AddAlarmHsy(alarmContent, resetStatus);
+ return Service.AddAlarmHsy(deptid,alarmContent, resetStatus);
}
@@ -33,9 +33,9 @@
/// </summary>
/// <returns></returns>
[HttpPost, Route("GetWebSocketInfo")]
- public WebResponseContent GetWebSocketInfo()
+ public WebResponseContent GetWebSocketInfo(int deptid)
{
- return Service.GetWebSocketInfo();
+ return Service.GetWebSocketInfo(deptid);
}
/// <summary>
@@ -43,9 +43,9 @@
/// </summary>
/// <param name="status"></param>
[HttpPost, Route("BecomeTrue")]
- public WebResponseContent BecomeTrue(string account)
+ public WebResponseContent BecomeTrue()
{
- return Service.BecomeTrue(account);
+ return Service.BecomeTrue();
}
@@ -61,5 +61,16 @@
}
+ /// <summary>
+ /// 鍒犻櫎璇ヨ建閬撶珯鐨勬姤璀︿俊鍙�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("DeleteAllinform")]
+ public WebResponseContent DeleteAllinform()
+ {
+ return Service.DeleteAllinform();
+ }
+
+
}
}
--
Gitblit v1.9.3