解决冲突

qiuyao

2025-04-28 1dcc7b63a20daad7c7060f18878d8e8dbaad02de

 ÏîÄ¿´úÂë/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的改为false
        /// </summary>
        /// <param name="status"></param>
        /// <returns></returns>
        WebResponseContent BecomeTrue();

        /// <summary>
        /// ä¸Šæ¸¸æ£€ä¿®é“信息
        /// </summary>
        WebResponseContent UpstreamInspectionRoad(UpstreamIDTO upstreamIDTO);

    }
}