From 69b4b758498b839aedbd82f7d4dee9d879ba65fe Mon Sep 17 00:00:00 2001 From: yanjinhui <3306209981@qq.com> Date: 星期四, 12 六月 2025 09:17:53 +0800 Subject: [PATCH] 修改开始检修和查看检修人员接口 --- project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs | 78 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 76 insertions(+), 2 deletions(-) diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs" index c3932b7..2bbe0da 100644 --- "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs" +++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs" @@ -10,9 +10,11 @@ using WIDESEAWCS_Core; using WIDESEAWCS_Core.BaseRepository; using WIDESEAWCS_Core.BaseServices; +using WIDESEAWCS_Core.Helper; using WIDESEAWCS_DTO.Telescopic; using WIDESEAWCS_ITaskInfoService; using WIDESEAWCS_Model.Models; +using WIDESEAWCS_QuartzJob; namespace WIDESEAWCS_TelescopicService { @@ -31,10 +33,11 @@ /// </summary> /// <param name="entity"></param> /// <returns></returns> - public WebResponseContent AddAlarmHsy(string alarmContent, bool resetStatus) + public WebResponseContent AddAlarmHsy(int deptid, string alarmContent, bool resetStatus) { var alarm = new Dt_AlarmResetHsy { + Deptid = deptid, AlarmContent= alarmContent, ResetStatus= resetStatus, AlarmTime=DateTime.Now, @@ -87,6 +90,41 @@ { return new WebResponseContent { Status = false, Message = "娌℃湁瑕佸浣嶆暟鎹�" }; } + // 鑾峰彇鎵�鏈変笉鍚岀殑 DeptId锛堟瘡涓唬琛ㄤ竴涓狿LC锛� + var deptIds = query.Select(x => x.Deptid).Distinct(); + + foreach (var deptId in deptIds) + { + try + { + var devices = GetDevicesByDeptId(deptId); + + try + { + devices.Value.left.Communicator.Write<bool>("M105", true); + } + catch (Exception) + { + + + } + try + { + devices.Value.right.Communicator.Write<bool>("M105", true); + } + catch (Exception) + { + + + } + + } + catch (Exception ex) + { + Console.WriteLine($"鍚� DeptId={deptId} 鐨凱LC鍐欏叆澶辫触锛�" + ex.Message); + // 鍙互閫夋嫨缁х画鎴栦腑鏂� + } + } foreach (var item in query) { item.ResetStatus = false; @@ -127,7 +165,43 @@ return new WebResponseContent { Status = false, Message = "鎺ㄩ�佸け璐ワ細" + ex.Message }; } } + public WebResponseContent DeleteAllinform() + { + try + { - + + //鎵惧埌璇ヨ建閬撶珯鐨勫叏閮ㄤ俊鎭� + var alarm = BaseDal.QueryData().ToList(); + if (alarm.Count < 0) + { + return new WebResponseContent { Status = false, Message = $"娌℃湁瑕佸垹闄ょ殑鎶ヨ淇℃伅" }; + } + //鎵惧埌鍚庡叏閮ㄥ垹闄� + var reslut = BaseDal.DeleteData(alarm); + return new WebResponseContent { Status = true, Message = "鍒犻櫎鎴愬姛", Data = reslut }; + } + catch (Exception ex) + { + + return new WebResponseContent { Status = false, Message = ex.Message }; + } + } + public (OtherDevice left, OtherDevice right)? GetDevicesByDeptId(int deptId) + { + // 宸﹁澶囧彿锛�1 -> 001锛�2 -> 003锛�3 -> 005... + int baseCode = 1 + (deptId - 1) * 2; + string leftCode = $"SSG{baseCode.ToString("D3")}"; + string rightCode = $"SSG{(baseCode + 1).ToString("D3")}"; + + var left = (OtherDevice)Storage.Devices.Find(x => x.DeviceCode == leftCode); + var right = (OtherDevice)Storage.Devices.Find(x => x.DeviceCode == rightCode); + + + //if (left == null || right == null) + // return null; + + return (left, right); + } } } -- Gitblit v1.9.3