From c5de0d98241f8c8349fa38851b77efcfc61e4d26 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 29 七月 2025 15:42:00 +0800
Subject: [PATCH] 前端代码
---
项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs | 75 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 23 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/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/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs"
index 33da6ce..26e2834 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/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/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs"
@@ -5,6 +5,7 @@
using System.Text;
using System.Threading.Tasks;
using AutoMapper;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using WIDESEAWCS_Core;
@@ -24,15 +25,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>
@@ -49,6 +52,9 @@
};
var devices = GetDevicesByDeptId(deid);
+
+
+
//鎵惧埌Dt_Parameters涓殑鏈�鏂颁竴鏉℃暟鎹�
var para = BaseDal.QueryData().Where(x => x.Deptid == deid).OrderByDescending(x => x.CreateDate).FirstOrDefault();
if (para == null)
@@ -60,8 +66,16 @@
int rigtpostition = (int)para.RightPosition;//鍙充几鍑轰綅缃�
string message = "";
+ var alarm = _alarm.QueryData(x => x.ResetStatus == true && x.Deptid == deid && !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"))
{
@@ -74,6 +88,8 @@
}
try
{
+
+
if (devices.Value.right.Communicator.Read<bool>("M117"))
{
return new WebResponseContent { Status = true, Message = "鐜板湪姝ｅ湪杩涜涓紝绛夊緟鎿嶄綔瀹屾垚" };
@@ -91,7 +107,7 @@
{
if (devices.Value.left.Communicator.Read<float>("D80")>= liftPosition-5)//鍒拌揪鏈�澶т綅缃�)
{
- message += "宸︿几缂╂潌鍒拌揪鐩爣浣嶇疆锛�";
+ message += "宸﹁鎯曟満鏋勫埌杈剧洰鏍囦綅缃紱";
}
else
{
@@ -107,7 +123,7 @@
{
if (devices.Value.right.Communicator.Read<float>("D80") >= rigtpostition-5)
{
- message += "鍙充几缂╂潌鍒拌揪鐩爣浣嶇疆锛�";
+ message += "鍙宠鎯曟満鏋勫埌杈剧洰鏍囦綅缃紱";
}
else
{
@@ -126,7 +142,7 @@
{
if (devices.Value.left.Communicator.Read<bool>("M115")) //鍒拌揪鍘熺偣浣�
{
- message += "宸︿几缂╂潌宸插埌鍘熺偣锛�";
+ message += "宸﹁鎯曟満鏋勫凡鍒板師鐐癸紱";
}
else
{
@@ -144,7 +160,7 @@
{
if (devices.Value.right.Communicator.Read<bool>("M115"))
{
- message += "鍙充几缂╂潌宸插埌鍘熺偣锛�";
+ message += "鍙宠鎯曟満鏋勫凡鍒板師鐐癸紱";
}
else
{
@@ -184,9 +200,9 @@
/// <summary>
- /// 鎵嬪姩鎺у埗锛屼几缂╂潌鐨勭缉鍥炲拰浼稿嚭閫熷害
+ /// 鎵嬪姩鎺у埗锛岃鎯曟満鏋勭殑缂╁洖鍜屼几鍑洪�熷害
/// </summary>
- /// <param name="position">浼哥缉鏉嗙殑浣嶇疆锛堝乏鍙筹級</param>
+ /// <param name="position">璀︽儠鏈烘瀯鐨勪綅缃紙宸﹀彸锛�</param>
/// <param name="ExtendedState">浼�/缂╃姸鎬�</param>
/// <returns></returns>
///
@@ -196,7 +212,7 @@
{
if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid))
{
- return new WebResponseContent { Status = false, Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" };
+ return new WebResponseContent { Status = true, Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" };
}
var devices = GetDevicesByDeptId(deid);
@@ -213,9 +229,20 @@
//bool canLeft = true,
// canRight = true;
string message = "";
+ var alarm = _alarm.QueryData(x => x.ResetStatus == true && x.Deptid == deid && !x.AlarmContent.Contains("闅滅")); // 鎺掗櫎 AlarmContent 鍖呭惈 "闅滅s" 鐨勮褰�.ToList();
+ if (alarm.Count > 0)
+ {
+ return new WebResponseContent { Status = true, Message = "璀︽儠鏈烘瀯鎶ヨ锛岃鍏堝浣�" };
+ }
try
{
+
+ //var alarmSignals = new[] { "M109", "M111", "M110", "M120" };
+ //if (alarmSignals.Any(signal => devices.Value.left.Communicator.Read<bool>(signal)))
+ //{
+ // return new WebResponseContent { Status = true, Message = "璀︽儠鏈烘瀯鎶ヨ锛岃鍏堝浣�" };
+ //}
if (devices.Value.left.Communicator.Read<bool>("M117")) //榛樿鏄痜lase
{
@@ -228,6 +255,8 @@
}
try
{
+
+
if (devices.Value.right.Communicator.Read<bool>("M117"))
{
return new WebResponseContent { Status = true, Message = "鐜板湪姝ｅ湪杩涜涓紝绛夊緟鎿嶄綔瀹屾垚" };
@@ -241,7 +270,7 @@
{
if (devices.Value.left.Communicator.Read<float>("D80") >= liftPosition - 5) //鍒拌揪鐩爣浣嶇疆
{
- message += "宸︿几缂╂潌鍒拌揪鐩爣浣嶇疆锛�";
+ message += "宸﹁鎯曟満鏋勫埌杈剧洰鏍囦綅缃紱";
}
else
{
@@ -252,7 +281,7 @@
devices.Value.left.Communicator.Write<bool>("M100", false); // 閲婃斁鎸夐挳
- Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑簕ext}");
+ Console.WriteLine($"{position}璀︽儠鏈烘瀯鎵嬪姩浼稿嚭{ext}");
}
}
@@ -260,16 +289,16 @@
{
if (devices.Value.left.Communicator.Read<bool>("M115"))//缂╁洖鐨勬椂鍊欏垽鏂�)
{
- message += "宸︿几缂╂潌宸插埌鍘熺偣锛�";
+ message += "宸﹁鎯曟満鏋勫凡鍒板師鐐癸紱";
}
else
{
- //devices.Value.left.Communicator.Write<int>("D1004", liftPosition);//浼稿嚭浣嶇疆
+ devices.Value.left.Communicator.Write<int>("D1004", liftPosition);//浼稿嚭浣嶇疆
devices.Value.left.Communicator.Write<int>("D1000", ext);//宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害
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}");
}
}
@@ -278,7 +307,7 @@
{
if (devices.Value.right.Communicator.Read<float>("D80") >= rigtpostition - 5)
{
- message += "鍙充几缂╂潌鍒拌揪鐩爣浣嶇疆锛�";
+ message += "鍙宠鎯曟満鏋勫埌杈剧洰鏍囦綅缃紱";
}
else
{
@@ -287,7 +316,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}");
}
@@ -296,16 +325,16 @@
{
if (devices.Value.right.Communicator.Read<bool>("M115"))
{
- message += "鍙充几缂╂潌宸插埌鍘熺偣锛�";
+ message += "鍙宠鎯曟満鏋勫凡鍒板師鐐癸紱";
}
else
{
- //devices.Value.right.Communicator.Write<int>("D1004", rigtpostition);//浼稿嚭浣嶇疆
+ devices.Value.right.Communicator.Write<int>("D1004", rigtpostition);//浼稿嚭浣嶇疆
devices.Value.right.Communicator.Write<int>("D1000", ret);//鍙砅LC鎵嬪姩浼稿嚭缂╁洖閫熷害
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}");
}
}
@@ -443,7 +472,7 @@
/// <summary>
- /// 鑾峰彇褰撳墠绋嬪簭鏈�鏂扮殑浼哥缉鏉嗛�熷害
+ /// 鑾峰彇褰撳墠绋嬪簭鏈�鏂扮殑璀︽儠鏈烘瀯閫熷害
/// </summary>
/// <returns></returns>
public WebResponseContent BackfillSpeed()
@@ -470,7 +499,7 @@
}
/// <summary>
- /// 鑾峰彇褰撳墠浼哥缉鏉嗙殑浣嶇疆(鑷姩)
+ /// 鑾峰彇褰撳墠璀︽儠鏈烘瀯鐨勪綅缃�(鑷姩)
/// </summary>
/// <param name="ExtendedState"></param>
/// <returns></returns>
@@ -488,7 +517,7 @@
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
--
Gitblit v1.9.3