From 752223f279965b562e3d086b78f01efb55925ae4 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 30 四月 2025 16:32:23 +0800
Subject: [PATCH] 11
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs" b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs
similarity index 87%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs"
copy to project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs
index cb644ff..b9bba81 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs"
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs
@@ -20,9 +20,12 @@
{
public IRepository<Dt_AlarmResetHsy> Repository => BaseDal;
private readonly WebSocketServer _webSocketServer;
- public AlarmResetHsyServer(IRepository<Dt_AlarmResetHsy> BaseDal, WebSocketServer webSocketServer) : base(BaseDal)
+ private readonly IRepository<Sys_User> _user;
+
+ public AlarmResetHsyServer(IRepository<Dt_AlarmResetHsy> BaseDal, WebSocketServer webSocketServer, IRepository<Sys_User> user) : base(BaseDal)
{
- _webSocketServer = webSocketServer;
+ _webSocketServer = webSocketServer;
+ _user = user;
}
@@ -50,10 +53,6 @@
{
try
{
-
-
-
-
// 鏌ヨ骞舵帓搴忥紝纭繚 ResetStatus 涓� true 鐨勮褰曟帓鍦ㄥ墠闈紝骞舵寜 CreateDate 闄嶅簭鎺掑垪
// var query = Db.Queryable<Dt_AlarmResetHsy>()
// .OrderBy(x => new { ResetStatus = SqlFunc.IsNull(x.ResetStatus, false), x.CreateDate }, OrderByType.Desc); // 鎸� ResetStatus 涓� true 鎺掑湪鍓嶏紝骞舵寜 CreateDate 闄嶅簭
@@ -79,13 +78,16 @@
/// <summary>
- /// 灏嗚〃涓姸鎬佸叏閮ㄤ负true鐨勬敼涓篺alse
+ /// 灏嗚〃涓儴闂╥d涓虹姸鎬佸叏閮ㄤ负true鐨勬敼涓篺alse
/// </summary>
/// <param name="status"></param>
/// <returns></returns>
- public WebResponseContent BecomeTrue()
+ public WebResponseContent BecomeTrue(string account)
{
- var query=BaseDal.QueryData(x=>x.ResetStatus==true).ToList();
+ //鎵惧埌鐧诲叆浜虹殑deptid
+ var loginer = _user.QueryFirst(x => x.UserName == account);
+
+ var query = BaseDal.QueryData(x => x.ResetStatus == true && x.Deptid==loginer.Dept_Id ).ToList();
// 濡傛灉娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勬暟鎹�
if (query.Count == 0)
{
@@ -113,6 +115,9 @@
}
+
+
+
public WebResponseContent UpstreamInspectionRoad(UpstreamIDTO upstreamIDTO)
{
try
--
Gitblit v1.9.3