From c5de0d98241f8c8349fa38851b77efcfc61e4d26 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 29 七月 2025 15:42:00 +0800
Subject: [PATCH] 前端代码
---
项目代码/后端/后台管理/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs"
index aa136b4..04cb277 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs"
@@ -22,15 +22,17 @@
{
public IRepository<Dt_Parameters> Repository => BaseDal;
private readonly IRepository<Sys_User> _user;
+ private readonly IRepository<Dt_AlarmResetHsy> _alarm;
- public ParametersService(IRepository<Dt_Parameters> BaseDal, IRepository<Sys_User> user) : base(BaseDal)
+ public ParametersService(IRepository<Dt_Parameters> BaseDal, IRepository<Sys_User> user,IRepository<Dt_AlarmResetHsy> alarm) : base(BaseDal)
{
- _user = user;
+ _user = user;
+ _alarm = alarm;
}
/// <summary>
- /// 鑷姩鎺у埗浼哥缉鏉嗙殑浼稿嚭鍜岀缉鍥為�熷害锛堜竴娆℃�ф帶鍒舵墍鏈夌殑锛�
+ /// 鑷姩鎺у埗璀︽儠鏈烘瀯鐨勪几鍑哄拰缂╁洖閫熷害锛堜竴娆℃�ф帶鍒舵墍鏈夌殑锛�
/// </summary>
/// <param name="ExtendedState">浼�/鍑虹姸鎬�</param>
/// <returns></returns>
@@ -50,6 +52,11 @@
messages.Add($"DeptId={deptId} 鏈壘鍒拌澶囷紝璺宠繃");
continue;
}
+ var alarm = _alarm.QueryData(x => x.ResetStatus == true && x.Deptid == deptId && !x.AlarmContent.Contains("闅滅")); // 鎺掗櫎 AlarmContent 鍖呭惈 "闅滅s" 鐨勮褰�.ToList();
+ if (alarm.Count > 0)
+ {
+ return new WebResponseContent { Status = true, Message = "璀︽儠鏈烘瀯鎶ヨ锛岃鍏堝浣�" };
+ }
var para = BaseDal.QueryData()
.Where(x => x.Deptid == deptId)
@@ -62,13 +69,15 @@
continue;
}
+
int ext = (int)para.ExtendSpeed;
int ret = (int)para.RetractionSpeed;
int liftPos = (int)para.LeftPosition;
int rightPos = (int)para.RightPosition;
-
+
try
{
+
if (devices.Value.left.Communicator.Read<bool>("M117"))
{
@@ -81,6 +90,8 @@
}
try
{
+
+
if (devices.Value.right.Communicator.Read<bool>("M117"))
{
return new WebResponseContent { Status = true, Message = "鐜板湪姝ｅ湪杩涜涓紝绛夊緟鎿嶄綔瀹屾垚" };
@@ -98,7 +109,7 @@
{
if (devices.Value.left.Communicator.Read<float>("D80")>= liftPos-5)//鍒拌揪鏈�澶т綅缃�)
{
- messages.Add($"杞ㄩ亾绔檣deptId}宸︿几缂╂潌宸插埌鏈�澶т綅缃�");
+ messages.Add($"杞ㄩ亾绔檣deptId}宸﹁鎯曟満鏋勫凡鍒版渶澶т綅缃�");
}
else
@@ -115,7 +126,7 @@
{
if (devices.Value.left.Communicator.Read<float>("D80") >=rightPos-5)
{
- messages.Add($"杞ㄩ亾绔檣deptId}鍙充几缂╂潌宸插埌鏈�澶т綅缃�");
+ messages.Add($"杞ㄩ亾绔檣deptId}鍙宠鎯曟満鏋勫凡鍒版渶澶т綅缃�");
}
else
@@ -135,7 +146,7 @@
{
if (devices.Value.left.Communicator.Read<bool>("M115")) //鍒拌揪鍘熺偣浣�
{
- messages.Add($"杞ㄩ亾绔檣deptId}宸︿几缂╂潌宸插埌鍘熺偣");
+ messages.Add($"杞ㄩ亾绔檣deptId}宸﹁鎯曟満鏋勫凡鍒板師鐐�");
}
else
@@ -154,7 +165,7 @@
{
if (devices.Value.right.Communicator.Read<bool>("M115"))
{
- messages.Add($"杞ㄩ亾绔檣deptId}鍙充几缂╂潌宸插埌鍘熺偣");
+ messages.Add($"杞ㄩ亾绔檣deptId}鍙宠鎯曟満鏋勫凡鍒板師鐐�");
}
else
@@ -206,9 +217,9 @@
/// <summary>
- /// 鎵嬪姩鎺у埗锛屼几缂╂潌鐨勭缉鍥炲拰浼稿嚭閫熷害
+ /// 鎵嬪姩鎺у埗锛岃鎯曟満鏋勭殑缂╁洖鍜屼几鍑洪�熷害
/// </summary>
- /// <param name="position">浼哥缉鏉嗙殑浣嶇疆锛堝乏鍙筹級</param>
+ /// <param name="position">璀︽儠鏈烘瀯鐨勪綅缃紙宸﹀彸锛�</param>
/// <param name="ExtendedState">浼�/缂╃姸鎬�</param>
/// <param name="DeptId">鑲￠亾鍙�</param>
/// <returns></returns>
@@ -233,8 +244,15 @@
// canRight = true;
string message = "";
+ var alarm = _alarm.QueryData(x => x.ResetStatus == true && x.Deptid == DeptId && !x.AlarmContent.Contains("闅滅")); // 鎺掗櫎 AlarmContent 鍖呭惈 "闅滅s" 鐨勮褰�.ToList();
+ if (alarm.Count > 0)
+ {
+ return new WebResponseContent { Status = true, Message = "璀︽儠鏈烘瀯鎶ヨ锛岃鍏堝浣�" };
+ }
+
try
{
+
if (devices.Value.left.Communicator.Read<bool>("M117")) //榛樿鏄痜lase
{
@@ -247,6 +265,7 @@
}
try
{
+
if (devices.Value.right.Communicator.Read<bool>("M117"))
{
return new WebResponseContent { Status = true, Message = "鐜板湪姝ｅ湪杩涜涓紝绛夊緟鎿嶄綔瀹屾垚" };
@@ -260,7 +279,7 @@
{
if (devices.Value.left.Communicator.Read<float>("D80") >= liftPosition - 5) //鍒拌揪鐩爣浣嶇疆
{
- message += "宸︿几缂╂潌鍒拌揪鐩爣浣嶇疆锛�";
+ message += "宸﹁鎯曟満鏋勫埌杈剧洰鏍囦綅缃紱";
}
else
{
@@ -271,7 +290,7 @@
devices.Value.left.Communicator.Write<bool>("M100", false); // 閲婃斁鎸夐挳
- Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑簕ext}");
+ Console.WriteLine($"{position}璀︽儠鏈烘瀯鎵嬪姩浼稿嚭{ext}");
}
}
@@ -288,7 +307,7 @@
devices.Value.left.Communicator.Write<bool>("M101", true);
Thread.Sleep(100); // 绛夊緟100ms锛堟ā鎷熸寜閽寜涓嬶級
devices.Value.left.Communicator.Write<bool>("M101", false); // 閲婃斁鎸夐挳
- Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄧ缉鍥瀧ext}");
+ Console.WriteLine($"{position}璀︽儠鏈烘瀯鎵嬪姩缂╁洖{ext}");
}
}
@@ -297,7 +316,7 @@
{
if (devices.Value.right.Communicator.Read<float>("D80") >= rigtpostition - 5)
{
- message += "鍙充几缂╂潌鍒拌揪鐩爣浣嶇疆锛�";
+ message += "鍙宠鎯曟満鏋勫埌杈剧洰鏍囦綅缃紱";
}
else
{
@@ -306,7 +325,7 @@
devices.Value.right.Communicator.Write<bool>("M100", true);
Thread.Sleep(100); // 绛夊緟100ms锛堟ā鎷熸寜閽寜涓嬶級
devices.Value.right.Communicator.Write<bool>("M100", false); // 閲婃斁鎸夐挳
- Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑簕ret}");
+ Console.WriteLine($"{position}璀︽儠鏈烘瀯鎵嬪姩浼稿嚭{ret}");
}
@@ -315,7 +334,7 @@
{
if (devices.Value.right.Communicator.Read<bool>("M115"))
{
- message += "鍙充几缂╂潌宸插埌鍘熺偣锛�";
+ message += "鍙宠鎯曟満鏋勫凡鍒板師鐐癸紱";
}
else
{
@@ -324,7 +343,7 @@
devices.Value.right.Communicator.Write<bool>("M101", true);
Thread.Sleep(100); // 绛夊緟100ms锛堟ā鎷熸寜閽寜涓嬶級
devices.Value.right.Communicator.Write<bool>("M101", false); // 閲婃斁鎸夐挳
- Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄧ缉鍥瀧ret}");
+ Console.WriteLine($"{position}璀︽儠鏈烘瀯鎵嬪姩缂╁洖{ret}");
}
}
@@ -394,7 +413,7 @@
/// <summary>
- /// 浼哥缉鏉嗗綋鍓嶄綅缃�(杩欎釜娌℃湁鐢�)
+ /// 璀︽儠鏈烘瀯褰撳墠浣嶇疆(杩欎釜娌℃湁鐢�)
/// <param name="deptid">杞ㄩ亾绔欏彿</param>
public WebResponseContent CurrentLocation(int deptid)
{
@@ -405,7 +424,7 @@
return new WebResponseContent { Status = false, Message = "璁惧鏈壘鍒�" };
var deviceslift = devices.Value.left.Communicator.Read<float>("D80");
var devicesright = devices.Value.right.Communicator.Read<float>("D80");
- Console.WriteLine($"褰撳墠宸﹀彸浼哥缉鏉嗚繑鍥為�熷害鍒嗗埆涓轰负{deviceslift}");
+ Console.WriteLine($"褰撳墠宸﹀彸璀︽儠鏈烘瀯杩斿洖閫熷害鍒嗗埆涓轰负{deviceslift}");
return new WebResponseContent
{
Status = true,
--
Gitblit v1.9.3