From 4b4cc0dd66d0bfb8220709f6a5edd5fc3b8a65c2 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 02 六月 2025 13:58:47 +0800
Subject: [PATCH] 按需修改美心接口
---
project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs"
index 224163e..9743d9d 100644
--- "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs"
+++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs"
@@ -65,43 +65,52 @@
{
try
{
- var stuck = device.Communicator.Read<bool>("M109");//浼哥缉鏉嗘姤璀�//榛樿鏄痜alse
- var other = device.Communicator.Read<bool>("M110");//鍏朵粬鎶ヨ //榛樿鏄痜alse
+ var stuck = device.Communicator.Read<bool>("M109"); //浼哥缉鏉嗘姤璀�//榛樿鏄痜alse
+ var other = device.Communicator.Read<bool>("M110"); //鍏朵粬鎶ヨ //榛樿鏄痜alse
+
Console.WriteLine($"{device.DeviceName}:鍗′綇鎶ヨ鐨勯粯璁ゅ�间负{stuck}锛屽叾浠栨姤璀︾殑榛樿鍊间负{other}");
- string location = device.DeviceCode switch
+
+ // 鏍规嵁璁惧浠ｇ爜鑾峰彇浣嶇疆鍜岄儴闂↖D
+ var (location, deptId) = device.DeviceCode switch
{
- "SSG001" => "杞ㄩ亾涓�-宸�",
- "SSG002" => "杞ㄩ亾涓�-鍙�",
- "SSG003" => "杞ㄩ亾浜�-宸�",
- "SSG004" => "杞ㄩ亾浜�-鍙�",
- "SSG005" => "杞ㄩ亾涓�-宸�",
- "SSG006" => "杞ㄩ亾涓�-鍙�",
- "SSG007" => "杞ㄩ亾鍥�-宸�",
- "SSG008" => "杞ㄩ亾鍥�-鍙�",
- "SSG009" => "杞ㄩ亾浜�-宸�",
- "SSG0010" => "杞ㄩ亾浜�-鍙�",
- // 渚濇绫绘帹...
- _ => $"鏈煡璁惧({device.DeviceCode})"
+ "SSG001" => ("杞ㄩ亾涓�-宸�", 1),
+ "SSG002" => ("杞ㄩ亾涓�-鍙�", 1),
+ "SSG003" => ("杞ㄩ亾浜�-宸�", 2),
+ "SSG004" => ("杞ㄩ亾浜�-鍙�", 2),
+ "SSG005" => ("杞ㄩ亾涓�-宸�", 3),
+ "SSG006" => ("杞ㄩ亾涓�-鍙�", 3),
+ "SSG007" => ("杞ㄩ亾鍥�-宸�", 4),
+ "SSG008" => ("杞ㄩ亾鍥�-鍙�", 4),
+ "SSG009" => ("杞ㄩ亾浜�-宸�", 5),
+ "SSG0010" => ("杞ㄩ亾浜�-鍙�", 5),
+ _ => ($"鏈煡璁惧({device.DeviceCode})", 0) // 鏈煡璁惧榛樿閮ㄩ棬ID涓�0
};
+
+ // 濡傛灉閮ㄩ棬ID涓�0(鏈煡璁惧)锛屽彲浠ラ�夋嫨璁板綍鏃ュ織鎴栧鐞嗛敊璇�
+ if (deptId == 0)
+ {
+ Console.WriteLine($"鏈煡璁惧浠ｇ爜: {device.DeviceCode}");
+ return;
+ }
+
if (stuck && !other)
{
- var alarm= _alarmResetHsyServer.AddAlarmHsy($"{location}:浼哥缉鏉嗗崱浣忔姤璀�", stuck);
+ var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, $"{location}:浼哥缉鏉嗗崱浣忔姤璀�", stuck);
Console.WriteLine($"{location}:浼哥缉鏉嗗崱浣忔姤璀�", stuck);
}
else if (!stuck && other)
{
- var alarm = _alarmResetHsyServer.AddAlarmHsy($"{location}锛氬叾浠栨姤璀�", other);
+ var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, $"{location}锛氬叾浠栨姤璀�", other);
Console.WriteLine($"{location}锛氬叾浠栨姤璀�", other);
}
else if (stuck && other)
{
- var alarm= _alarmResetHsyServer.AddAlarmHsy($"{location}锛氫几缂╂潌鍗′綇鎶ヨ鍜屽叾浠栨姤璀�", other);
+ var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, $"{location}锛氫几缂╂潌鍗′綇鎶ヨ鍜屽叾浠栨姤璀�", other);
Console.WriteLine($"{location}锛氫几缂╂潌鍗′綇鎶ヨ鍜屽叾浠栨姤璀�", other);
}
}
catch (Exception ex)
{
-
Console.WriteLine($"璁惧 {device.DeviceCode} 澶勭悊寮傚父锛�" + ex.Message);
}
}
--
Gitblit v1.9.3