From b9c76ce85e533250cd36de670146530f970859e7 Mon Sep 17 00:00:00 2001 From: yanjinhui <3306209981@qq.com> Date: 星期五, 01 八月 2025 11:29:49 +0800 Subject: [PATCH] 修改伸缩杆接口 --- 项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/ParametersController.cs | 21 项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs | 16 项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Program.cs | 2 项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs | 62 ++ 项目代码/后端/后台管理/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_CustomIPaddress.cs | 3 项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs | 329 +++++++------ 项目代码/后端/后台管理/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json | 403 ++++++++-------- 项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/IPaddressController .cs | 9 项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs | 6 项目代码/后端/后台管理/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json | 360 ++++++++------ 项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_CustomIPaddress.cs | 4 项目代码/后端/后台管理/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs | 3 项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 2 项目代码/后端/后台管理/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs | 38 项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs | 4 项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/IPaddressServer.cs | 13 项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs | 127 +++- 项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IParametersService.cs | 10 项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IIPaddressServer .cs | 9 19 files changed, 805 insertions(+), 616 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_ITelescopicService/IIPaddressServer .cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IIPaddressServer .cs" index 4ab61c3..9c0d9f0 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IIPaddressServer .cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IIPaddressServer .cs" @@ -14,6 +14,13 @@ public interface IIPaddressServer : IService<Dt_CustomIPaddress> { IRepository<Dt_CustomIPaddress> Repository { get; } - + + + /// <summary> + /// 鑾峰彇褰撳墠璁惧鐨刬p鍦板潃骞惰繑鍥炲搴旂殑杞ㄩ亾绔欏彿 + /// </summary> + /// <param name="LocalIP"></param> + /// <returns></returns> + WebResponseContent GetStandid(string LocalIP); } } 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_ITelescopicService/IMaintenanceService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs" index a0799f5..a4b17b9 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs" @@ -26,7 +26,7 @@ /// 灞曠ず鍦ㄦ淇汉鍛樼洃鎺� /// </summary> /// <returns></returns> - WebResponseContent PersonnelMonitoring(PaginationDTO pagination); + WebResponseContent PersonnelMonitoring(PaginationDTO pagination, string LocalIP); /// <summary> /// 鏇存敼鐘舵�侊紝寮哄埗涓嬬嚎 @@ -62,11 +62,11 @@ WebResponseContent StopMaintenanceTask(string account,string LocalIP); /// <summary> - /// 灞曠ず寮�濮嬫淇汉鍛�(鍓嶇娌℃湁浣跨敤鍒�) + /// 灞曠ず寮�濮嬫淇汉鍛�() /// </summary> /// <param name="status">妫�淇姸鎬�</param> /// <returns></returns> - WebResponseContent YShowStartTake(); + WebResponseContent YShowStartTake(string LocalIP); } 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_ITelescopicService/IParametersService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IParametersService.cs" index 6d9420f..1525320 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IParametersService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IParametersService.cs" @@ -21,7 +21,7 @@ /// </summary> /// <param name="ExtendedState">浼�/鍑虹姸鎬�</param> /// <returns></returns> - WebResponseContent automation(string ExtendedState); + WebResponseContent automation(string ExtendedState,string LocalIP); /// <summary> /// 鎵嬪姩鎺у埗锛屼几缂╂潌鐨勭缉鍥炲拰浼稿嚭閫熷害 @@ -30,7 +30,7 @@ /// <param name="ExtendedState">浼�/缂╃姸鎬�</param> /// <returns></returns> /// - WebResponseContent ManualOperation(string position, string ExtendedState); + WebResponseContent ManualOperation(string position, string ExtendedState, string LocalIP); /// <summary> @@ -38,20 +38,20 @@ /// </summary> /// <param name="entity"></param> /// <returns></returns> - WebResponseContent AddSpeed(SpeedDTO entity); + WebResponseContent AddSpeed(SpeedDTO entity, string LocalIP); /// <summary> /// 鑾峰彇褰撳墠绋嬪簭鏈�鏂扮殑浼哥缉鏉嗛�熷害 /// </summary> /// <returns></returns> - WebResponseContent BackfillSpeed(); + WebResponseContent BackfillSpeed(string LocalIP); /// <summary> ///褰撹嚜鍔ㄤ几鍑洪渶瑕佹殏鍋滄椂锛屾殏鍋滄寜閽� /// </summary> /// <returns></returns> - WebResponseContent PauseButton(); + WebResponseContent PauseButton(string LocalIP); /// <summary> /// 浼哥缉鏉嗗綋鍓嶄綅缃� 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_Model/Models/Telescopic/Dt_CustomIPaddress.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_CustomIPaddress.cs" index 25334f8..cdd3eeb 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_CustomIPaddress.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_CustomIPaddress.cs" @@ -21,6 +21,10 @@ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鑷畾涔塱p鍦板潃鐨勪腑鏂囧悕瀛�")] public string Addressname { get; set; } + [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "杞ㄩ亾绔欎笓灞瀒d")] + public int StationID { get; set; } + + } } 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_Model/Models/Telescopic/Dt_Maintenance.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs" index 5fd8ffa..83568fa 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs" @@ -55,6 +55,10 @@ [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "妫�淇姸鎬�")] public int MaintenanceStatus{ get; set; } + + [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "杞ㄩ亾绔欎笓灞瀒d")] + public int? StationID { get; set; } + /// <summary> /// ip鍦板潃 /// </summary> 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_Server/Controllers/Telescopic/IPaddressController .cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/IPaddressController .cs" index 167d68e..dd3281c 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/IPaddressController .cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/IPaddressController .cs" @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc; using WIDESEAWCS_Core; using WIDESEAWCS_Core.BaseController; +using WIDESEAWCS_Core.Helper; using WIDESEAWCS_DTO.TaskInfo; using WIDESEAWCS_DTO.Telescopic; using WIDESEAWCS_ITaskInfoService; @@ -22,6 +23,14 @@ { } + public WebResponseContent GetStandid() + { + var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip + var reslut = userIp.Replace("::ffff:", ""); + return Service.GetStandid(reslut); + } + + 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_Server/Controllers/Telescopic/MaintenanceController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs" index b48fc1f..21514e0 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs" @@ -39,7 +39,9 @@ [HttpPost, Route("PersonnelMonitoring"), AllowAnonymous] public WebResponseContent PersonnelMonitoring([FromBody] PaginationDTO pagination) { - return Service.PersonnelMonitoring(pagination); + var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip + var reslut = userIp.Replace("::ffff:", ""); + return Service.PersonnelMonitoring(pagination, reslut); } @@ -47,13 +49,13 @@ /// 鏇存敼鐘舵�侊紝寮哄埗涓嬬嚎 /// </summary> /// <param name="id"></param> - /// <returns></returns> + /// <returns></returns> [HttpPost, Route("RunOperation"), AllowAnonymous] - public WebResponseContent RunOperation(int id, string account, string LocalIP) + public WebResponseContent RunOperation(int id, string account) { - var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip + var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip //鍓嶇瀹㈡埛绔殑ip鍦板潃 var reslut = userIp.Replace("::ffff:", ""); - return Service.RunOperation(id,account, LocalIP); + return Service.RunOperation(id,account, reslut); } /// <summary> @@ -130,7 +132,9 @@ [HttpPost,Route("YShowStartTake")] public WebResponseContent YShowStartTake() { - return Service.YShowStartTake(); + var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip + var reslut = userIp.Replace("::ffff:", ""); + return Service.YShowStartTake(reslut); } } 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_Server/Controllers/Telescopic/ParametersController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/ParametersController.cs" index 561cece..e7afb15 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/ParametersController.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/ParametersController.cs" @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using WIDESEAWCS_Core; using WIDESEAWCS_Core.BaseController; +using WIDESEAWCS_Core.Helper; using WIDESEAWCS_DTO.Telescopic; using WIDESEAWCS_ITelescopicService; using WIDESEAWCS_IWMSPart; @@ -28,7 +29,9 @@ [HttpPost, Route("ManualOperation")] public WebResponseContent ManualOperation(string position, string ExtendedState) { - return Service.ManualOperation(position, ExtendedState); + var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip + var reslut = userIp.Replace("::ffff:", ""); + return Service.ManualOperation(position, ExtendedState, reslut); } /// <summary> @@ -40,7 +43,9 @@ [HttpPost,Route("automation")] public WebResponseContent automation(string ExtendedState) { - return Service.automation(ExtendedState); + var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip + var reslut = userIp.Replace("::ffff:", ""); + return Service.automation(ExtendedState, reslut); } /// <summary> @@ -51,7 +56,9 @@ [HttpPost, Route("AddSpeed"), AllowAnonymous] public WebResponseContent AddSpeed([FromBody]SpeedDTO entity) { - return Service.AddSpeed(entity); + var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip + var reslut = userIp.Replace("::ffff:", ""); + return Service.AddSpeed(entity, reslut); } /// <summary> @@ -61,7 +68,9 @@ [HttpPost, Route("BackfillSpeed")] public WebResponseContent BackfillSpeed() { - return Service.BackfillSpeed(); + var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip + var reslut = userIp.Replace("::ffff:", ""); + return Service.BackfillSpeed(reslut); } @@ -72,7 +81,9 @@ [HttpPost, Route("PauseButton")] public WebResponseContent PauseButton() { - return Service.PauseButton(); + var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip + var reslut = userIp.Replace("::ffff:", ""); + return Service.PauseButton(reslut); } /// <summary> 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_Server/Program.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Program.cs" index b071f5e..0ec2672 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Program.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Program.cs" @@ -48,7 +48,7 @@ builder.Services.AddMemoryCacheSetup();//缓存 builder.Services.AddSqlsugarSetup();//SqlSugar 启动服务 if (AppSettings.GetValue("DBSeedEnable").ObjToBool()) - builder.Services.AddInitializationHostServiceSetup();//应用初始化服务注入 + builder.Services.AddInitializationHostServiceSetup();//应用初始化服务注入 builder.Services.AddHostedService<SeedDataHostedService>(); builder.Services.AddDbSetup();//Db 启动服务 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_Server/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" index 1bceb80..604ab38 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" @@ -40,7 +40,7 @@ "PrintSql": false, //鎵撳嵃SQL璇彞 "LogAOPEnable": false, //鏄惁璁板綍AOP鏃ュ織 "WebSocketEnable": true, - //"WebSocketPort": 5175, + "WebSocketPort": 5175, //"WebSocketPort": 5173, "DepartmentID": "1" //杩欎釜鏄几鍑�/浼稿洖鐨勯儴闂╥d }//鍗曟満鐗� 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_Tasks/SSG/AlarmResetJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs" index 4fc54c3..95d36b1 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs" @@ -15,6 +15,10 @@ using WIDESEAWCS_TelescopicService; using WIDESEAWCS_ISystemServices; using WIDESEAWCS_Core.Helper; +using Microsoft.AspNetCore.Http; +using System.Collections.Concurrent; +using Microsoft.AspNetCore.Hosting.Server; +using static System.Collections.Specialized.BitVector32; namespace WIDESEAWCS_Tasks { @@ -26,6 +30,7 @@ WebSocketServer _webSocketServer; private readonly Idt_ErrormsginfoService _ErrormsginfoService; private readonly AlarmResetHsyServer _alarmResetHsy; + private readonly IIPaddressServer _cunstomipService; //private static readonly object _lockObj = new object(); //鍔犻攣 @@ -45,183 +50,209 @@ ["M120"] = false,//闅滅鎶ヨ }; - public AlarmResetJob(Idt_ErrormsginfoService errormsginfoService, WebSocketServer webSocketServer, IAlarmResetHsyServer alarmResetHsyServer, ISys_UserService UserService) + public AlarmResetJob(Idt_ErrormsginfoService errormsginfoService, WebSocketServer webSocketServer, IAlarmResetHsyServer alarmResetHsyServer, ISys_UserService UserService, IIPaddressServer cunstomipService) { _webSocketServer = webSocketServer; _alarmResetHsyServer = alarmResetHsyServer; _UserService = UserService; _ErrormsginfoService = errormsginfoService; + _cunstomipService = cunstomipService; } + + public Task Execute(IJobExecutionContext context) { try { - if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid)) + WebSocketSession[] webSocketSessions = _webSocketServer.OnlineSessions;//灏嗘墍鏈夌殑杩炴帴淇℃伅瀛樺埌杩欓噷 + //string clientIp = webSocketSessions[0].Remote.Address.ToString().Replace("::ffff", ""); //鑾峰彇涓�涓猧p鍦板潃 + + foreach (var session in webSocketSessions) { - Console.WriteLine("閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�"); - } - var devices = GetDevicesByDeptId(deid); - if (devices != null) - { - // Left PLC processing - try + string clientIp = session.Remote.Address.ToString().Replace("::ffff:", ""); + var customip = _cunstomipService.GetStandid(clientIp); + if (customip.Status && customip.Data != null) { - if (devices.Value.left.IsConnected) + //var deid = customip.Data.StationID; + var deid = Convert.ToInt32(customip.Data); + var devices = GetDevicesByDeptId(deid); + + + + //if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid)) + //{ + // Console.WriteLine("閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�"); + //} + //var devices = GetDevicesByDeptId(deid); + + + + if (devices != null) { - var leftPLcstuck1 = devices.Value.left.Communicator.Read<bool>("M109"); // Servo alarm - var leftPLcOher1 = devices.Value.left.Communicator.Read<bool>("M111"); // Other alarm - var leftscram = devices.Value.left.Communicator.Read<bool>("M110"); // Emergency stop - var leftstop = devices.Value.left.Communicator.Read<bool>("M120"); // Obstacle stop - - var leftPLcNowAdd = devices.Value.left.Communicator.Read<float>("D80"); - Console.WriteLine($"{devices.Value.left.DeviceName}:鍗′綇鎶ヨ{leftPLcstuck1}锛屽叾浠栨姤璀leftPLcOher1}"); - - - // Check and record alarms only when state changes from false to true - if (leftPLcstuck1 && !_leftAlarmStates["M109"]) - { - string text = $"妫�8閬撳乏渚ц鎯曟満鏋勶細浼哥缉鍗′綇鎶ヨ"; - var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, leftPLcstuck1); - _leftAlarmStates["M109"] = true; - } - else if (!leftPLcstuck1) - { - _leftAlarmStates["M109"] = false; - } - - if (leftPLcOher1 && !_leftAlarmStates["M111"]) - { - string text = $"妫�8閬撳乏渚ц鎯曟満鏋勶細鍏朵粬鏁呴殰鎶ヨ"; - var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, leftPLcOher1); - _leftAlarmStates["M111"] = true; - } - else if (!leftPLcOher1) - { - _leftAlarmStates["M111"] = false; - } - - if (leftscram && !_leftAlarmStates["M110"]) - { - string text = $"妫�8閬撳乏渚ц鎯曟満鏋勶細鎬ュ仠鎶ヨ"; - var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, leftscram); - _leftAlarmStates["M110"] = true; - } - else if (!leftscram) - { - _leftAlarmStates["M110"] = false; - } - - if (leftstop && !_leftAlarmStates["M120"]) - { - string text = $"妫�8閬撳乏渚ц鎯曟満鏋勶細閬囬殰纰嶅仠姝㈡姤璀�"; - var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, leftstop); - _leftAlarmStates["M120"] = true; - } - else if (!leftstop) - { - _leftAlarmStates["M120"] = false; - } - - - _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(new + // Left PLC processing + try { - device = "宸lc", - Liftvalue = leftPLcNowAdd - })); + if (devices.Value.left.IsConnected) + { + var leftPLcstuck1 = devices.Value.left.Communicator.Read<bool>("M109"); // Servo alarm + var leftPLcOher1 = devices.Value.left.Communicator.Read<bool>("M111"); // Other alarm + var leftscram = devices.Value.left.Communicator.Read<bool>("M110"); // Emergency stop + var leftstop = devices.Value.left.Communicator.Read<bool>("M120"); // Obstacle stop + + var leftPLcNowAdd = devices.Value.left.Communicator.Read<float>("D80"); + Console.WriteLine($"{devices.Value.left.DeviceName}:鍗′綇鎶ヨ{leftPLcstuck1}锛屽叾浠栨姤璀leftPLcOher1}"); + + + // Check and record alarms only when state changes from false to true + if (leftPLcstuck1 && !_leftAlarmStates["M109"]) + { + string text = $"妫�{deid}閬撳乏渚ц鎯曟満鏋勶細浼哥缉鍗′綇鎶ヨ"; + var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, leftPLcstuck1); + _leftAlarmStates["M109"] = true; + } + else if (!leftPLcstuck1) + { + _leftAlarmStates["M109"] = false; + } + + if (leftPLcOher1 && !_leftAlarmStates["M111"]) + { + string text = $"妫�{deid}閬撳乏渚ц鎯曟満鏋勶細鍏朵粬鏁呴殰鎶ヨ"; + var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, leftPLcOher1); + _leftAlarmStates["M111"] = true; + } + else if (!leftPLcOher1) + { + _leftAlarmStates["M111"] = false; + } + + if (leftscram && !_leftAlarmStates["M110"]) + { + string text = $"妫�{deid}閬撳乏渚ц鎯曟満鏋勶細鎬ュ仠鎶ヨ"; + var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, leftscram); + _leftAlarmStates["M110"] = true; + } + else if (!leftscram) + { + _leftAlarmStates["M110"] = false; + } + + if (leftstop && !_leftAlarmStates["M120"]) + { + string text = $"妫�{deid}閬撳乏渚ц鎯曟満鏋勶細閬囬殰纰嶅仠姝㈡姤璀�"; + var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, leftstop); + _leftAlarmStates["M120"] = true; + } + else if (!leftstop) + { + _leftAlarmStates["M120"] = false; + } + + + _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(new + { + device = "宸lc", + Liftvalue = leftPLcNowAdd + })); + } + } + catch (Exception) + { + string text = $"杞ㄩ亾{deid}锛氬乏PLC鏈繛鎺�"; + //var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, false); + } + + // Right PLC processing + try + { + if (devices.Value.right.IsConnected) + { + var rightPLcSuck = devices.Value.right.Communicator.Read<bool>("M109"); // Servo alarm + var rightPLcOher = devices.Value.right.Communicator.Read<bool>("M111"); // Other alarm + var rightscram = devices.Value.right.Communicator.Read<bool>("M110"); // Emergency stop + var rightstop = devices.Value.right.Communicator.Read<bool>("M120"); // Obstacle stop + + var rightPLcNowAdd = devices.Value.right.Communicator.Read<float>("D80"); + Console.WriteLine($"{devices.Value.right.DeviceName}:鍗′綇鎶ヨ{rightPLcSuck}锛屽叾浠栨姤璀rightPLcOher}"); + + + // Check and record alarms only when state changes from false to true + if (rightPLcSuck && !_rightAlarmStates["M109"]) + { + string text = $"妫�{deid}閬撳彸渚ц鎯曟満鏋勶細鎶ヨ浼哥缉鍗′綇鎶ヨ"; + var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, rightPLcSuck); + _rightAlarmStates["M109"] = true; + } + else if (!rightPLcSuck) + { + _rightAlarmStates["M109"] = false; + } + + if (rightPLcOher && !_rightAlarmStates["M111"]) + { + string text = $"妫�{deid}閬撳彸渚ц鎯曟満鏋勶細鍏朵粬鏁呴殰鎶ヨ"; + var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, rightPLcOher); + _rightAlarmStates["M111"] = true; + } + else if (!rightPLcOher) + { + _rightAlarmStates["M111"] = false; + } + + if (rightscram && !_rightAlarmStates["M110"]) + { + string text = $"妫�{deid}閬撳彸渚ц鎯曟満鏋勶細鎬ュ仠鎶ヨ"; + var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, rightscram); + _rightAlarmStates["M110"] = true; + } + else if (!rightscram) + { + _rightAlarmStates["M110"] = false; + } + + if (rightstop && !_rightAlarmStates["M120"]) + { + string text = $"妫�{deid}閬撳彸渚ц鎯曟満鏋勶細閬囬殰纰嶅仠姝㈡姤璀�"; + var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, rightstop); + _rightAlarmStates["M120"] = true; + } + else if (!rightstop) + { + _rightAlarmStates["M120"] = false; + } + + _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(new + { + device = "鍙砅lc", + Rightvalue = rightPLcNowAdd + })); + } + } + catch (Exception) + { + string text = $"杞ㄩ亾{deid}锛氬彸PLC鏈繛鎺�"; + //var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, false); + } + + var alrt = _alarmResetHsyServer.GetWebSocketInfo(deid); + _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alrt)); } } - catch (Exception) - { - string text = $"杞ㄩ亾{deid}锛氬乏PLC鏈繛鎺�"; - //var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, false); } - - // Right PLC processing - try - { - if (devices.Value.right.IsConnected) - { - var rightPLcSuck = devices.Value.right.Communicator.Read<bool>("M109"); // Servo alarm - var rightPLcOher = devices.Value.right.Communicator.Read<bool>("M111"); // Other alarm - var rightscram = devices.Value.right.Communicator.Read<bool>("M110"); // Emergency stop - var rightstop = devices.Value.right.Communicator.Read<bool>("M120"); // Obstacle stop - - var rightPLcNowAdd = devices.Value.right.Communicator.Read<float>("D80"); - Console.WriteLine($"{devices.Value.right.DeviceName}:鍗′綇鎶ヨ{rightPLcSuck}锛屽叾浠栨姤璀rightPLcOher}"); - - - // Check and record alarms only when state changes from false to true - if (rightPLcSuck && !_rightAlarmStates["M109"]) - { - string text = $"妫�8閬撳彸渚ц鎯曟満鏋勶細鎶ヨ浼哥缉鍗′綇鎶ヨ"; - var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, rightPLcSuck); - _rightAlarmStates["M109"] = true; - } - else if (!rightPLcSuck) - { - _rightAlarmStates["M109"] = false; - } - - if (rightPLcOher && !_rightAlarmStates["M111"]) - { - string text = $"妫�8閬撳彸渚ц鎯曟満鏋勶細鍏朵粬鏁呴殰鎶ヨ"; - var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, rightPLcOher); - _rightAlarmStates["M111"] = true; - } - else if (!rightPLcOher) - { - _rightAlarmStates["M111"] = false; - } - - if (rightscram && !_rightAlarmStates["M110"]) - { - string text = $"妫�8閬撳彸渚ц鎯曟満鏋勶細鎬ュ仠鎶ヨ"; - var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, rightscram); - _rightAlarmStates["M110"] = true; - } - else if (!rightscram) - { - _rightAlarmStates["M110"] = false; - } - - if (rightstop && !_rightAlarmStates["M120"]) - { - string text = $"妫�8閬撳彸渚ц鎯曟満鏋勶細閬囬殰纰嶅仠姝㈡姤璀�"; - var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, rightstop); - _rightAlarmStates["M120"] = true; - } - else if (!rightstop) - { - _rightAlarmStates["M120"] = false; - } - - _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(new - { - device = "鍙砅lc", - Rightvalue = rightPLcNowAdd - })); - } - } - catch (Exception) - { - string text = $"杞ㄩ亾{deid}锛氬彸PLC鏈繛鎺�"; - //var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, false); - } - - var alrt = _alarmResetHsyServer.GetWebSocketInfo(deid); - _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alrt)); } - } catch (Exception ex) { _ErrormsginfoService.UpdateErrorMsg(ex.Message, 1); Console.WriteLine("閿欒淇℃伅锛�" + ex.Message); Console.WriteLine(ex.StackTrace); } + return Task.CompletedTask; + } + public (OtherDevice left, OtherDevice right)? GetDevicesByDeptId(int deptId) { int baseCode = 1 + (deptId - 1) * 2; 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/IPaddressServer.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/IPaddressServer.cs" index 7d1e507..72aa6de 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/IPaddressServer.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/IPaddressServer.cs" @@ -1,6 +1,7 @@ 锘縰sing System; using System.Collections.Generic; using System.Linq; +using System.Net; using System.Text; using System.Threading.Tasks; using WIDESEAWCS_Core; @@ -16,9 +17,17 @@ public IRepository<Dt_CustomIPaddress> Repository => BaseDal; public IPaddressServer(IRepository<Dt_CustomIPaddress> BaseDal) : base(BaseDal) { - + } - + public WebResponseContent GetStandid(string LocalIP) + { + var cunstomip = BaseDal.QueryData(x => x.IPaddress == LocalIP).FirstOrDefault(); + if (cunstomip == null) + { + return new WebResponseContent { Status = false, Message = "璇烽厤缃杞ㄩ亾绔檌p鍦板潃" }; + } + return new WebResponseContent { Status = true, Data = cunstomip.StationID }; + } } } 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/MaintenanceService.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/MaintenanceService.cs" index 9a78cf8..190f7f4 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/MaintenanceService.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/MaintenanceService.cs" @@ -174,14 +174,24 @@ // return new WebResponseContent { Status = false, Data = ex.Message }; // } //} - public WebResponseContent PersonnelMonitoring(PaginationDTO pagination) + /// <summary> + /// 浜哄憳鐩戞帶锛堟暟瀛楀ぇ灞忥級 + /// </summary> + /// <param name="pageIndex"></param> + /// <param name="pageSize"></param> + /// <param name="searchKeyw + public WebResponseContent PersonnelMonitoring(PaginationDTO pagination, string LocalIP) { try { int totalCount = 0; + var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // 濡傛灉 LocalIP 鏄� null锛宨p 浼氭槸 "" + var cunstomip = _ipaddress.QueryData(x => x.IPaddress == ip).FirstOrDefault(); + + var query = _user.Db.Queryable<Dt_Maintenance>() - .Where(b => b.MaintenanceStatus == 1) + .Where(b => b.MaintenanceStatus == 1&&b.StationID==cunstomip.StationID) .InnerJoin<Sys_User>((b, a) => b.UserAccount == a.UserName) .LeftJoin<Dt_CustomIPaddress>((b, a, c) => b.IPAddress == c.IPaddress); @@ -261,6 +271,8 @@ // 4. 鎵ц寮哄埗涓嬬嚎 maint.MaintenanceStatus = 0; // 鏀瑰彉鐘舵�佷负涓嬬嚎 + maint.IPAddress = "";//灏唅p鍦板潃涓簄ull + maint.StationID = null; BaseDal.UpdateData(maint); var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // 濡傛灉 LocalIP 鏄� null锛宨p 浼氭槸 "" @@ -515,7 +527,14 @@ var user = BaseDal.QueryData();//妫�淇〃 var maint = user.Where(x => x.UserAccount == account).FirstOrDefault(); //鍦ㄦ淇〃涓厛鎵惧埌璇ョ敤鎴� var sysuer = _user.QueryData(x => x.UserName == account).FirstOrDefault();//鍦ㄧ敤鎴疯〃涓壘鍒扮敤鎴� - + var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // 濡傛灉 LocalIP 鏄� null锛宨p 浼氭槸 "" + //鎵捐澶噄p鍦板潃琛� + var address = _ipaddress.QueryData(x => x.IPaddress == ip).FirstOrDefault(); + if (address==null) + { + return new WebResponseContent { Status = false, Message = "浣犳病鏈夐厤缃搴旂殑ip鍦板潃锛岃鍏堥厤缃紝鍦ㄦ搷浣�" }; + } + if (maint == null || sysuer == null) { return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌璇ョ敤鎴�" }; @@ -533,7 +552,8 @@ //鍏堣鎵惧埌璇ョ敤鎴峰睘浜庨偅涓鑹茬殑锛岃繖涓鑹蹭腑灞炰簬閭d釜浠�涔堢被鍨嬶紙缁勯暱/缁勫憳锛� if (maint.IsLeader != 1)//濡傛灉璇ョ敤鎴蜂笉鏄彮闀匡紝閭d箞瑕佺瓑鐝暱鍏堝仛锛屼粬鎵嶅彲浠ュ仛 { - bool leaderStarted = user.Any(x => x.IsLeader == 1 && x.MaintenanceStatus == 1); //鍚︽湁婊¤冻鏉′欢 鎵惧埌涓�鏉″氨杩斿洖true MaintenanceStatus锛�0娌℃湁寮�濮嬶紝1寮�濮嬶級 + //鎵捐杞ㄩ亾绔欎笂鐨勭粍闀匡紝鏄惁寮�濮嬫淇� + bool leaderStarted = user.Any(x => x.IsLeader == 1 && x.MaintenanceStatus == 1&&x.StationID==address.StationID); //鍚︽湁婊¤冻鏉′欢 鎵惧埌涓�鏉″氨杩斿洖true锛� MaintenanceStatus锛�0娌℃湁寮�濮嬶紝1寮�濮嬶級 if (!leaderStarted) { return new WebResponseContent { Status = false, Message = "璇风瓑寰呬竴绾т汉鍛樺紑濮嬫淇�" }; @@ -541,13 +561,15 @@ } - var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // 濡傛灉 LocalIP 鏄� null锛宨p 浼氭槸 "" + + //濡傛灉婊¤冻涓嬮潰鐨勬潯浠跺氨寮�濮� maint.MaintenancStartTime = DateTime.Now;//璁板綍寮�濮嬫椂闂� maint.MaintenanceStatus = 1;//鏇存敼鐘舵�� maint.IPAddress = ip;//鏇存敼ip鍦板潃 + maint.StationID = address.StationID;//璁板綍璇ョ敤鎴锋槸閭d釜杞ㄩ亾绔欏紑濮嬩綔涓� BaseDal.UpdateData(maint); - var address = _ipaddress.QueryData(x=>x.IPaddress== ip).FirstOrDefault(); + var addressIp = ""; if (address!=null) //鎵惧埌浜� { @@ -587,8 +609,18 @@ try { var user = BaseDal.QueryData(); // 妫�淇〃 - var maint = user.Where(x => x.UserAccount == account).FirstOrDefault(); + var maint = user.Where(x => x.UserAccount == account).FirstOrDefault();// 妫�淇〃 var sysuer = _user.QueryData(x => x.UserName == account).FirstOrDefault(); // 鐢ㄦ埛琛� + + var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // 濡傛灉 LocalIP 鏄� null锛宨p 浼氭槸 "" + var address = _ipaddress.QueryData(x => x.IPaddress == ip).FirstOrDefault(); + var addressIp = ""; + //濡傛灉鐢ㄦ埛涓嶅湪鍘熸湰杞ㄩ亾绔欎笂缁撴潫浠诲姟锛岄偅涔堝氨鎻愮ず浠栬浠栧洖鍘� + if (maint.IPAddress != ip) + { + return new WebResponseContent { Status = false, Message = "璇峰洖鍒板師鏉ョ殑杞ㄩ亾绔欑粨鏉熶换鍔�" }; + } + if (maint == null || sysuer == null) { @@ -630,9 +662,7 @@ //{ // return new WebResponseContent { Status = false, Message = "鎿嶄綔璁惧涓嶅悓锛岃鍥炲埌鍘熸湰璁惧鍐嶇偣鍑荤粨鏉熸淇�" }; //} - var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // 濡傛灉 LocalIP 鏄� null锛宨p 浼氭槸 "" - var address = _ipaddress.QueryData(x => x.IPaddress == ip).FirstOrDefault(); - var addressIp = ""; + if (address != null) //鎵惧埌浜� { addressIp = address.Addressname; @@ -641,10 +671,13 @@ { addressIp = ip; } + // 鏇存柊褰撳墠鐢ㄦ埛鐨勬淇姸鎬� maint.MaintenancEendTime = DateTime.Now; // 璁板綍缁撴潫鏃堕棿 maint.MaintenanceStatus = 0; // 鏇存敼鐘舵�� + maint.IPAddress= "";//缁撴潫浠诲姟鍚庡皢ip鍦板潃鏀逛负null + maint.StationID = null;//灏嗚建閬撶珯鍙锋敼涓簄ull BaseDal.UpdateData(maint); // 鎻掑叆璁板綍琛� @@ -672,11 +705,16 @@ /// 灞曠ず寮�濮嬫淇汉鍛� /// </summary> /// <returns></returns> - public WebResponseContent YShowStartTake() + public WebResponseContent YShowStartTake(string LocalIP) { try { - var reslut=BaseDal.QueryData(x => x.MaintenanceStatus == 1).ToList(); + var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // 濡傛灉 LocalIP 鏄� null锛宨p 浼氭槸 "" + //鎵捐澶噄p鍦板潃琛� + var address = _ipaddress.QueryData(x => x.IPaddress == ip).FirstOrDefault(); + + + var reslut=BaseDal.QueryData(x => x.MaintenanceStatus == 1&&x.IPAddress==address.IPaddress).ToList(); if (reslut.Count<=0) { return new WebResponseContent { Status = false, Message = "杩樻病鏈変汉寮�濮嬫淇�" }; 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 26e2834..d2cf37b 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" @@ -26,11 +26,13 @@ public IRepository<Dt_Parameters> Repository => BaseDal; private readonly IRepository<Sys_User> _user; private readonly IRepository<Dt_AlarmResetHsy> _alarm; + private readonly IRepository<Dt_CustomIPaddress> _cunstomip; - public ParametersService(IRepository<Dt_Parameters> BaseDal, IRepository<Sys_User> user, IRepository<Dt_AlarmResetHsy> alarm) : base(BaseDal) + public ParametersService(IRepository<Dt_Parameters> BaseDal, IRepository<Sys_User> user, IRepository<Dt_AlarmResetHsy> alarm, IRepository<Dt_CustomIPaddress> cunstomip) : base(BaseDal) { _user = user; _alarm = alarm; + _cunstomip = cunstomip; } @@ -39,21 +41,30 @@ /// </summary> /// <param name="ExtendedState">浼�/鍑虹姸鎬�</param> /// <returns></returns> - public WebResponseContent automation(string ExtendedState) + public WebResponseContent automation(string ExtendedState, string LocalIP) { try { - //鏍规嵁int.TryParse(AppSettings.Get("DepartmentID")璇诲彇鍒板綋鍓嶆槸杞ㄩ亾鍑狅紝鎵�鏈変汉閮藉彧鑳芥搷浣滃綋鍓� - if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid)) + ////鏍规嵁int.TryParse(AppSettings.Get("DepartmentID")璇诲彇鍒板綋鍓嶆槸杞ㄩ亾鍑狅紝鎵�鏈変汉閮藉彧鑳芥搷浣滃綋鍓� + //if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid)) + //{ + // return new WebResponseContent { Status = false, Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" }; + //}; + + //var devices = GetDevicesByDeptId(deid); + //鍏堟煡璇㈣澶噄p閰嶇疆琛紙Dt_CustomIPaddress锛夛紝鐪嬫槸鍚︽湁閰嶇疆锛屾病鏈夊氨鎻愮ず浠栭厤缃� + var customip=_cunstomip.QueryData(x=>x.IPaddress==LocalIP).FirstOrDefault(); + if (customip == null) { - return new WebResponseContent { Status = false, Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" }; - }; + return new WebResponseContent { Status = false, Message = "浣犺繕娌℃湁閰嶇疆璇ヨ建閬撶珯鐨処P鍦板潃,璇峰厛閰嶇疆鍦ㄦ搷浣�" }; + } + var deid = customip.StationID; var devices = GetDevicesByDeptId(deid); - - + + //鎵惧埌Dt_Parameters涓殑鏈�鏂颁竴鏉℃暟鎹� var para = BaseDal.QueryData().Where(x => x.Deptid == deid).OrderByDescending(x => x.CreateDate).FirstOrDefault(); @@ -206,14 +217,16 @@ /// <param name="ExtendedState">浼�/缂╃姸鎬�</param> /// <returns></returns> /// - public WebResponseContent ManualOperation(string position, string ExtendedState) + public WebResponseContent ManualOperation(string position, string ExtendedState, string LocalIP) { try { - if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid)) + var customip = _cunstomip.QueryData(x => x.IPaddress == LocalIP).FirstOrDefault(); + if (customip == null) { - return new WebResponseContent { Status = true, Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" }; + return new WebResponseContent { Status = false, Message = "浣犺繕娌℃湁閰嶇疆璇ヨ建閬撶珯鐨処P鍦板潃,璇峰厛閰嶇疆鍦ㄦ搷浣�" }; } + var deid = customip.StationID; var devices = GetDevicesByDeptId(deid); //淇╀釜plc宸﹀彸鍚勪竴涓� @@ -365,39 +378,46 @@ /// <summary> - /// 鏍规嵁鐢ㄦ埛娣诲姞閫熷害 + /// 鏍规嵁褰撳墠鏈烘ip鍦板潃鏉ユ坊鍔犻�熷害 /// </summary> /// <param name="entity"></param> /// <returns></returns> - public WebResponseContent AddSpeed(SpeedDTO entity) + public WebResponseContent AddSpeed(SpeedDTO entity,string LocalIP) { try { - // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛 - var user = _user.QueryData(x => x.UserName == entity.account).FirstOrDefault(); - // 鍒ゆ柇锛氬鏋滀笉鏄鐞嗗憳 && Dept_Id 涓虹┖锛屽垯鎻愮ず閿欒 - if (user.UserName != "admin" && user.Dept_Id == null) + // // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛 + // var user = _user.QueryData(x => x.UserName == entity.account).FirstOrDefault(); + //// 鍒ゆ柇锛氬鏋滀笉鏄鐞嗗憳 && Dept_Id 涓虹┖锛屽垯鎻愮ず閿欒 + // if (user.UserName != "admin" && user.Dept_Id == null) + // { + // return new WebResponseContent { Status = false, Message = "浣犵殑璐﹀彿娌℃湁璁剧疆杞ㄩ亾绔欏彿锛屾棤娉曟坊鍔狅紝璇疯仈绯荤鐞嗗憳" }; + // } + + //var dept = user.Dept_Id; + + //// 鑾峰彇閰嶇疆鏂囦欢涓殑 DepartmentID锛堢鐞嗗憳涓撶敤锛� + //if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid)) + //{ + // return new WebResponseContent + // { + // Status = false, + // Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" + // }; + //} + + + //// 鍒ゆ柇鏄惁涓虹鐞嗗憳璐﹀彿 + //bool isAdmin = user?.UserName?.Equals("admin") == true; //濡傛灉褰撳墠鐢ㄦ埛涓嶄负绌猴紝涓旂敤鎴峰悕鏄� "admin"锛屽氨璁や负杩欎釜鐢ㄦ埛鏄鐞嗗憳 + + //鍘昏鍙栧搴旇澶囩殑ip鍦板潃 + var customip = _cunstomip.QueryData(x => x.IPaddress == LocalIP).FirstOrDefault(); + if (customip == null) { - return new WebResponseContent { Status = false, Message = "浣犵殑璐﹀彿娌℃湁璁剧疆杞ㄩ亾绔欏彿锛屾棤娉曟坊鍔狅紝璇疯仈绯荤鐞嗗憳" }; + return new WebResponseContent { Status = false, Message = "浣犺繕娌℃湁閰嶇疆璇ヨ建閬撶珯鐨処P鍦板潃,璇峰厛閰嶇疆鍦ㄦ搷浣�" }; } - - var dept = user.Dept_Id; + var deid = customip.StationID; - // 鑾峰彇閰嶇疆鏂囦欢涓殑 DepartmentID锛堢鐞嗗憳涓撶敤锛� - if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid)) - { - return new WebResponseContent - { - Status = false, - Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" - }; - } - - - // 鍒ゆ柇鏄惁涓虹鐞嗗憳璐﹀彿 - bool isAdmin = user?.UserName?.Equals("admin") == true; //濡傛灉褰撳墠鐢ㄦ埛涓嶄负绌猴紝涓旂敤鎴峰悕鏄� "admin"锛屽氨璁や负杩欎釜鐢ㄦ埛鏄鐞嗗憳 - - // 鏍规嵁鏄惁鏄鐞嗗憳鍐冲畾浣跨敤鍝釜 Deptid var parmet = new Dt_Parameters { ExtendSpeed = entity.ExtendSpeed, @@ -405,8 +425,9 @@ ManualExtend = entity.ManualExtend, ManualRetraction = entity.ManualRetraction, LeftPosition = entity.LeftPosition, - RightPosition = entity.RightPosition, - Deptid = isAdmin ? deid : dept.GetValueOrDefault()//濡傛灉褰撳墠鐢ㄦ埛鏄鐞嗗憳锛屽氨鐢ㄩ厤缃枃浠朵腑鐨� DepartmentID锛屽惁鍒欑敤浼犲叆鐨� entity 鍙傛暟涓殑 Deptid + RightPosition = entity.RightPosition, + //Deptid = isAdmin ? deid : dept.GetValueOrDefault()//濡傛灉褰撳墠鐢ㄦ埛鏄鐞嗗憳锛屽氨鐢ㄩ厤缃枃浠朵腑鐨� DepartmentID锛屽惁鍒欑敤浼犲叆鐨� entity 鍙傛暟涓殑 Deptid + Deptid = deid }; // 娣诲姞鏁版嵁 AddData(parmet); @@ -431,16 +452,24 @@ ///褰撹嚜鍔ㄤ几鍑洪渶瑕佹殏鍋滄椂锛屾殏鍋滄寜閽� /// </summary> /// <returns></returns> - public WebResponseContent PauseButton() + public WebResponseContent PauseButton(string LocalIP) { try { - //鏍规嵁int.TryParse(AppSettings.Get("DepartmentID")璇诲彇鍒板綋鍓嶆槸杞ㄩ亾鍑狅紝鎵�鏈変汉閮藉彧鑳芥搷浣滃綋鍓� - if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid)) + ////鏍规嵁int.TryParse(AppSettings.Get("DepartmentID")璇诲彇鍒板綋鍓嶆槸杞ㄩ亾鍑狅紝鎵�鏈変汉閮藉彧鑳芥搷浣滃綋鍓� + //if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid)) + //{ + // return new WebResponseContent { Status = false, Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" }; + //}; + //var devices = GetDevicesByDeptId(deid); + var customip = _cunstomip.QueryData(x => x.IPaddress == LocalIP).FirstOrDefault(); + if (customip == null) { - return new WebResponseContent { Status = false, Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" }; - }; + return new WebResponseContent { Status = false, Message = "浣犺繕娌℃湁閰嶇疆璇ヨ建閬撶珯鐨処P鍦板潃,璇峰厛閰嶇疆鍦ㄦ搷浣�" }; + } + var deid = customip.StationID; var devices = GetDevicesByDeptId(deid); + try { devices.Value.left.Communicator.Write<bool>("M104", true); @@ -475,15 +504,21 @@ /// 鑾峰彇褰撳墠绋嬪簭鏈�鏂扮殑璀︽儠鏈烘瀯閫熷害 /// </summary> /// <returns></returns> - public WebResponseContent BackfillSpeed() + public WebResponseContent BackfillSpeed(string LocalIP) { try { - if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid)) - { - return new WebResponseContent { Status = false, Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" }; + //if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid)) + //{ + // return new WebResponseContent { Status = false, Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" }; + //} + var customip = _cunstomip.QueryData(x => x.IPaddress == LocalIP).FirstOrDefault(); + if (customip == null) + { + return new WebResponseContent { Status = false, Message = "浣犺繕娌℃湁閰嶇疆璇ヨ建閬撶珯鐨処P鍦板潃,璇峰厛閰嶇疆鍦ㄦ搷浣�" }; } + var deid = customip.StationID; var para = BaseDal.QueryData().Where(x => x.Deptid == deid).OrderByDescending(x => x.CreateDate).FirstOrDefault(); if (para == null) { 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/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" "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/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" index ea650e8..3716884 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/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" +++ "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/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" @@ -7,8 +7,36 @@ "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" }, { - "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_tasks\\ssg\\alarmresetjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\ssg\\alarmresetjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_systemservices\\sys_userservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|solutionrelative:wideseawcs_systemservices\\sys_userservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_facerecognition.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_facerecognition.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_loginhsy.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_loginhsy.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_maintenance.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_maintenance.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_maintenanceteam.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_maintenanceteam.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_parameters.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_parameters.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_server\\controllers\\system\\sys_usercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\system\\sys_usercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_isystemservices\\isys_userservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|solutionrelative:wideseawcs_isystemservices\\isys_userservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -20,10 +48,6 @@ { "AbsoluteMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_telescopicservice\\alarmresethsyserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|solutionrelative:wideseawcs_telescopicservice\\alarmresethsyserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_itelescopicservice\\ialarmresethsyserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|solutionrelative:wideseawcs_itelescopicservice\\ialarmresethsyserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_telescopicservice\\parametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -58,14 +82,6 @@ "RelativeMoniker": "D:0:0:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|solutionrelative:wideseawcs_isystemservices\\isys_logservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_isystemservices\\isys_userservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|solutionrelative:wideseawcs_isystemservices\\isys_userservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_systemservices\\sys_userservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|solutionrelative:wideseawcs_systemservices\\sys_userservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { "AbsoluteMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_telescopicservice\\maintenanceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|solutionrelative:wideseawcs_telescopicservice\\maintenanceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -84,10 +100,6 @@ { "AbsoluteMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_itelescopicservice\\imaintenanceteamservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|solutionrelative:wideseawcs_itelescopicservice\\imaintenanceteamservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_server\\controllers\\system\\sys_usercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\system\\sys_usercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_server\\controllers\\telescopic\\teamcategorycontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -134,10 +146,6 @@ "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\system\\sys_user.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_maintenanceteam.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_maintenanceteam.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { "AbsoluteMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_telescopicservice\\teamcategoryserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|solutionrelative:wideseawcs_telescopicservice\\teamcategoryserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -166,10 +174,6 @@ "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\wmspart\\dt_authorizationrecord.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_parameters.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_parameters.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\system\\sys_role.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\system\\sys_role.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -180,14 +184,6 @@ { "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_dto\\system\\adduserdto.cs||{8B382828-6202-11D1-8870-0000F87579D2}", "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\system\\adduserdto.cs||{8B382828-6202-11D1-8870-0000F87579D2}" - }, - { - "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_loginhsy.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_loginhsy.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_facerecognition.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_facerecognition.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_alarmresethsy.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -228,11 +224,76 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 1, + "SelectedChildIndex": 6, "Children": [ { "$type": "Bookmark", "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "Dt_Maintenance.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Maintenance.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Maintenance.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Maintenance.cs", + "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Maintenance.cs", + "ViewState": "AgIAAAMAAAAAAAAAAADwvxEAAAAjAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-29T07:05:40.797Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "Sys_UserController.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs", + "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs", + "ViewState": "AgIAAOsAAAAAAAAAAAAhwPwAAABAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-19T06:39:37.986Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "Sys_UserService.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "RelativeToolTip": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "ViewState": "AgIAABsBAAAAAAAAAAAkwC4BAAAOAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-09T01:01:25.032Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "Dt_Parameters.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "ViewState": "AgIAAA0AAAAAAAAAAAAMwDsAAAAVAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-11T02:21:27.75Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "Dt_Loginhsy.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", + "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", + "ViewState": "AgIAAAkAAAAAAAAAAAAuwC0AAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-27T06:17:28.152Z", + "EditorCaption": "" }, { "$type": "Document", @@ -242,64 +303,27 @@ "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json", - "ViewState": "AgIAABIAAAAAAAAAAAAAACgAAAAEAAAAAAAAAA==", + "ViewState": "AgIAAAYAAAAAAAAAAAAAACQAAAAeAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", "WhenOpened": "2025-05-08T06:53:56.648Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 3, - "Title": "ActivatorErrorHandlingMiddleware.cs", - "DocumentMoniker": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\f4a38436a364cfd4c348a2509145a42088563c6553d76feb80f60e62d41960cc\\ActivatorErrorHandlingMiddleware.cs", - "ToolTip": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\f4a38436a364cfd4c348a2509145a42088563c6553d76feb80f60e62d41960cc\\ActivatorErrorHandlingMiddleware.cs", - "ViewState": "AgIAAAwAAAAAAAAAAAAAABoAAABgAAAAAQAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-17T03:05:39.596Z", - "EditorCaption": "" - }, - { - "$type": "Document", "DocumentIndex": 2, - "Title": "Program.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Program.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", - "RelativeToolTip": "WIDESEAWCS_Server\\Program.cs", - "ViewState": "AgIAABIAAAAAAAAAAAAWwDAAAAA0AAAAAAAAAA==", + "Title": "Dt_FaceRecognition.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", + "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABIAAAAjAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T06:57:12.123Z", + "WhenOpened": "2025-05-27T06:17:26.652Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, - "Title": "AlarmResetJob.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", - "RelativeToolTip": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", - "ViewState": "AgIAAHgAAAAAAAAAAAAmwIIAAAARAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T06:55:29.934Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 5, - "Title": "IAlarmResetHsyServer.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IAlarmResetHsyServer.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IAlarmResetHsyServer.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IAlarmResetHsyServer.cs", - "RelativeToolTip": "WIDESEAWCS_ITelescopicService\\IAlarmResetHsyServer.cs", - "ViewState": "AgIAABYAAAAAAAAAAAAowCcAAAAlAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-13T07:15:56.706Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 11, "Title": "AlarmResetHsyServer.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\AlarmResetHsyServer.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\AlarmResetHsyServer.cs", @@ -312,7 +336,57 @@ }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 5, + "Title": "Dt_MaintenanceTeam.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", + "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", + "ViewState": "AgIAAAsAAAAAAAAAAAAwwAoAAAA/AAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-27T07:31:17.257Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "ISys_UserService.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "RelativeToolTip": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "ViewState": "AgIAAEMAAAAAAAAAAAAiwFEAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-09T01:01:17.565Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 9, + "Title": "Program.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Program.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", + "RelativeToolTip": "WIDESEAWCS_Server\\Program.cs", + "ViewState": "AgIAABIAAAAAAAAAAAAWwDAAAAA0AAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-08T06:57:12.123Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 10, + "Title": "ActivatorErrorHandlingMiddleware.cs", + "DocumentMoniker": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\f4a38436a364cfd4c348a2509145a42088563c6553d76feb80f60e62d41960cc\\ActivatorErrorHandlingMiddleware.cs", + "ToolTip": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\f4a38436a364cfd4c348a2509145a42088563c6553d76feb80f60e62d41960cc\\ActivatorErrorHandlingMiddleware.cs", + "ViewState": "AgIAAAwAAAAAAAAAAAAAABoAAABgAAAAAQAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-17T03:05:39.596Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 12, "Title": "ParametersService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\ParametersService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\ParametersService.cs", @@ -325,7 +399,7 @@ }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 13, "Title": "IParametersService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IParametersService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IParametersService.cs", @@ -338,7 +412,7 @@ }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 14, "Title": "IPaddressServer.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\IPaddressServer.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\IPaddressServer.cs", @@ -350,7 +424,7 @@ }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 15, "Title": "IIPaddressServer .cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IIPaddressServer .cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IIPaddressServer .cs", @@ -362,7 +436,7 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 16, "Title": "LoginhsyService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\LoginhsyService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\LoginhsyService.cs", @@ -374,7 +448,7 @@ }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 17, "Title": "launchSettings.json", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Properties\\launchSettings.json", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Properties\\launchSettings.json", @@ -386,7 +460,7 @@ }, { "$type": "Document", - "DocumentIndex": 13, + "DocumentIndex": 19, "Title": "ISys_LogService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_LogService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_LogService.cs", @@ -398,7 +472,7 @@ }, { "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 18, "Title": "Sys_LogService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_LogService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_LogService.cs", @@ -410,7 +484,7 @@ }, { "$type": "Document", - "DocumentIndex": 17, + "DocumentIndex": 21, "Title": "MaintenanceTeamService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceTeamService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\MaintenanceTeamService.cs", @@ -422,7 +496,7 @@ }, { "$type": "Document", - "DocumentIndex": 16, + "DocumentIndex": 20, "Title": "MaintenanceService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs", @@ -434,31 +508,7 @@ }, { "$type": "Document", - "DocumentIndex": 15, - "Title": "Sys_UserService.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "RelativeToolTip": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "ViewState": "AgIAAMgDAAAAAAAAAAAowNkDAAARAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-09T01:01:25.032Z" - }, - { - "$type": "Document", - "DocumentIndex": 14, - "Title": "ISys_UserService.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "RelativeToolTip": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "ViewState": "AgIAAE8AAAAAAAAAAAA2wGMAAAAzAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-09T01:01:17.565Z" - }, - { - "$type": "Document", - "DocumentIndex": 18, + "DocumentIndex": 22, "Title": "DepartmentService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\DepartmentService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\DepartmentService.cs", @@ -470,7 +520,7 @@ }, { "$type": "Document", - "DocumentIndex": 19, + "DocumentIndex": 23, "Title": "IMaintenanceService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", @@ -482,7 +532,7 @@ }, { "$type": "Document", - "DocumentIndex": 20, + "DocumentIndex": 24, "Title": "IMaintenanceTeamService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceTeamService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IMaintenanceTeamService.cs", @@ -494,7 +544,7 @@ }, { "$type": "Document", - "DocumentIndex": 22, + "DocumentIndex": 25, "Title": "TeamCategoryController.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\TeamCategoryController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\TeamCategoryController.cs", @@ -506,20 +556,7 @@ }, { "$type": "Document", - "DocumentIndex": 21, - "Title": "Sys_UserController.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs", - "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs", - "ViewState": "AgIAAMUAAAAAAAAAAADgv9QAAAApAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-19T06:39:37.986Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 26, + "DocumentIndex": 29, "Title": "WIDESEAWCS_ITelescopicService.csproj", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj", @@ -531,7 +568,7 @@ }, { "$type": "Document", - "DocumentIndex": 25, + "DocumentIndex": 28, "Title": "WIDESEAWCS_TelescopicService.csproj", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj", @@ -543,7 +580,7 @@ }, { "$type": "Document", - "DocumentIndex": 24, + "DocumentIndex": 27, "Title": "UnitCategoryServer.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\UnitCategoryServer.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\UnitCategoryServer.cs", @@ -555,7 +592,7 @@ }, { "$type": "Document", - "DocumentIndex": 23, + "DocumentIndex": 26, "Title": "Dt_UnitCategory.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\WMSPart\\Dt_UnitCategory.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\WMSPart\\Dt_UnitCategory.cs", @@ -567,7 +604,7 @@ }, { "$type": "Document", - "DocumentIndex": 27, + "DocumentIndex": 30, "Title": "dt_batchinfoService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\dt_batchinfoService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\dt_batchinfoService.cs", @@ -580,7 +617,7 @@ }, { "$type": "Document", - "DocumentIndex": 28, + "DocumentIndex": 31, "Title": "Sys_UserFaceController.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\System\\Sys_UserFaceController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\System\\Sys_UserFaceController.cs", @@ -592,7 +629,7 @@ }, { "$type": "Document", - "DocumentIndex": 30, + "DocumentIndex": 33, "Title": "ParametersController.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", @@ -604,7 +641,7 @@ }, { "$type": "Document", - "DocumentIndex": 29, + "DocumentIndex": 32, "Title": "Sys_UserFaceService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserFaceService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserFaceService.cs", @@ -616,7 +653,7 @@ }, { "$type": "Document", - "DocumentIndex": 31, + "DocumentIndex": 34, "Title": "ITeamCategoryServer.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\ITeamCategoryServer.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\ITeamCategoryServer.cs", @@ -628,7 +665,7 @@ }, { "$type": "Document", - "DocumentIndex": 32, + "DocumentIndex": 35, "Title": "Sys_User.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Sys_User.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\Sys_User.cs", @@ -640,19 +677,7 @@ }, { "$type": "Document", - "DocumentIndex": 33, - "Title": "Dt_MaintenanceTeam.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", - "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", - "ViewState": "AgIAACAAAAAAAAAAAAAgwAoAAAA/AAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-27T07:31:17.257Z" - }, - { - "$type": "Document", - "DocumentIndex": 34, + "DocumentIndex": 36, "Title": "TeamCategoryServer.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\TeamCategoryServer.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\TeamCategoryServer.cs", @@ -664,7 +689,7 @@ }, { "$type": "Document", - "DocumentIndex": 35, + "DocumentIndex": 37, "Title": "AlarmResetHsyController.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\AlarmResetHsyController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\AlarmResetHsyController.cs", @@ -676,7 +701,7 @@ }, { "$type": "Document", - "DocumentIndex": 36, + "DocumentIndex": 38, "Title": "ISys_MenuService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_MenuService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_MenuService.cs", @@ -688,7 +713,7 @@ }, { "$type": "Document", - "DocumentIndex": 37, + "DocumentIndex": 39, "Title": "IUnitCategoryServer.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IUnitCategoryServer.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IUnitCategoryServer.cs", @@ -700,7 +725,7 @@ }, { "$type": "Document", - "DocumentIndex": 38, + "DocumentIndex": 40, "Title": "Dt_TeamCategory.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\WMSPart\\Dt_TeamCategory.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\WMSPart\\Dt_TeamCategory.cs", @@ -712,7 +737,7 @@ }, { "$type": "Document", - "DocumentIndex": 39, + "DocumentIndex": 41, "Title": "AuthorizationRecordController.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\AuthorizationRecordController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\AuthorizationRecordController.cs", @@ -724,7 +749,7 @@ }, { "$type": "Document", - "DocumentIndex": 40, + "DocumentIndex": 42, "Title": "Dt_AuthorizationRecord.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\WMSPart\\Dt_AuthorizationRecord.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\WMSPart\\Dt_AuthorizationRecord.cs", @@ -736,19 +761,7 @@ }, { "$type": "Document", - "DocumentIndex": 41, - "Title": "Dt_Parameters.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "ViewState": "AgIAACwAAAAAAAAAAAArwDsAAAAVAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-11T02:21:27.75Z" - }, - { - "$type": "Document", - "DocumentIndex": 42, + "DocumentIndex": 43, "Title": "Sys_Role.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Sys_Role.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\Sys_Role.cs", @@ -760,7 +773,7 @@ }, { "$type": "Document", - "DocumentIndex": 43, + "DocumentIndex": 44, "Title": "LoginhsyController.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\LoginhsyController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\LoginhsyController.cs", @@ -772,7 +785,7 @@ }, { "$type": "Document", - "DocumentIndex": 44, + "DocumentIndex": 45, "Title": "AddUserDTO.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\System\\AddUserDTO.cs", "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\System\\AddUserDTO.cs", @@ -784,31 +797,7 @@ }, { "$type": "Document", - "DocumentIndex": 45, - "Title": "Dt_Loginhsy.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", - "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", - "ViewState": "AgIAAB4AAAAAAAAAAAAcwBYAAABQAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-27T06:17:28.152Z" - }, - { - "$type": "Document", "DocumentIndex": 46, - "Title": "Dt_FaceRecognition.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", - "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", - "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-27T06:17:26.652Z" - }, - { - "$type": "Document", - "DocumentIndex": 47, "Title": "Dt_AlarmResetHsy.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_AlarmResetHsy.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_AlarmResetHsy.cs", @@ -820,7 +809,7 @@ }, { "$type": "Document", - "DocumentIndex": 48, + "DocumentIndex": 47, "Title": "ILoginhsyService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\ILoginhsyService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\ILoginhsyService.cs", @@ -832,7 +821,7 @@ }, { "$type": "Document", - "DocumentIndex": 49, + "DocumentIndex": 48, "Title": "Sys_TenantService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_TenantService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_TenantService.cs", @@ -844,7 +833,7 @@ }, { "$type": "Document", - "DocumentIndex": 50, + "DocumentIndex": 49, "Title": "SSGOneJob.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\SSGOneJob.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SSG\\SSGOneJob.cs", @@ -856,7 +845,7 @@ }, { "$type": "Document", - "DocumentIndex": 51, + "DocumentIndex": 50, "Title": "FaceRecognitionServer.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\FaceRecognitionServer.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\FaceRecognitionServer.cs", @@ -868,7 +857,7 @@ }, { "$type": "Document", - "DocumentIndex": 52, + "DocumentIndex": 51, "Title": "ISys_TenantService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_TenantService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_TenantService.cs", @@ -880,7 +869,7 @@ }, { "$type": "Document", - "DocumentIndex": 53, + "DocumentIndex": 52, "Title": "Face.cs", "DocumentMoniker": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\b700ba3c32194731a3eaca4d8eaddd483d62abecc7fa3ee9e8c64e80596c22fa\\Face.cs", "ToolTip": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\b700ba3c32194731a3eaca4d8eaddd483d62abecc7fa3ee9e8c64e80596c22fa\\Face.cs", @@ -890,7 +879,7 @@ }, { "$type": "Document", - "DocumentIndex": 54, + "DocumentIndex": 53, "Title": "index.html", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\index.html", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\index.html", 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/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" "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/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" index 254a632..35f091c 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/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" +++ "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/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" @@ -3,8 +3,40 @@ "WorkspaceRootPath": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\", "Documents": [ { + "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_customipaddress.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_customipaddress.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_maintenance.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_maintenance.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_tasks\\ssg\\alarmresetjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\ssg\\alarmresetjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", + "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" + }, + { "AbsoluteMoniker": "D:0:0:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_systemservices\\sys_userservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|solutionrelative:wideseawcs_systemservices\\sys_userservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_facerecognition.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_facerecognition.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_loginhsy.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_loginhsy.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_maintenanceteam.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_maintenanceteam.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_parameters.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_parameters.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_server\\controllers\\system\\sys_usercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -13,10 +45,6 @@ { "AbsoluteMoniker": "D:0:0:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_isystemservices\\isys_userservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|solutionrelative:wideseawcs_isystemservices\\isys_userservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", - "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" }, { "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -126,10 +154,6 @@ "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\system\\sys_user.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_maintenanceteam.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_maintenanceteam.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { "AbsoluteMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_telescopicservice\\teamcategoryserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|solutionrelative:wideseawcs_telescopicservice\\teamcategoryserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -158,10 +182,6 @@ "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\wmspart\\dt_authorizationrecord.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_parameters.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_parameters.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\system\\sys_role.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\system\\sys_role.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -172,14 +192,6 @@ { "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_dto\\system\\adduserdto.cs||{8B382828-6202-11D1-8870-0000F87579D2}", "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\system\\adduserdto.cs||{8B382828-6202-11D1-8870-0000F87579D2}" - }, - { - "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_loginhsy.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_loginhsy.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_facerecognition.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\telescopic\\dt_facerecognition.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\shensuogannew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_model\\models\\telescopic\\dt_alarmresethsy.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -220,7 +232,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 5, + "SelectedChildIndex": 1, "Children": [ { "$type": "Bookmark", @@ -228,79 +240,90 @@ }, { "$type": "Document", - "DocumentIndex": 4, - "Title": "Program.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Program.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", - "RelativeToolTip": "WIDESEAWCS_Server\\Program.cs", - "ViewState": "AgIAABIAAAAAAAAAAAAWwDAAAAA0AAAAAAAAAA==", + "DocumentIndex": 0, + "Title": "Dt_CustomIPaddress.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_CustomIPaddress.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_CustomIPaddress.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_CustomIPaddress.cs", + "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_CustomIPaddress.cs", + "ViewState": "AgIAAAAAAAAAAAAAAADwvxUAAAAwAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T06:57:12.123Z", + "WhenOpened": "2025-08-01T03:06:07.691Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 2, - "Title": "ISys_UserService.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "RelativeToolTip": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "ViewState": "AgIAAEMAAAAAAAAAAAAiwFEAAAAAAAAAAAAAAA==", + "Title": "AlarmResetJob.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", + "RelativeToolTip": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", + "ViewState": "AgIAACUAAAAAAAAAAAAUwDYAAAAPAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-09T01:01:17.565Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 6, - "Title": "AlarmResetHsyServer.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\AlarmResetHsyServer.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\AlarmResetHsyServer.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\AlarmResetHsyServer.cs", - "RelativeToolTip": "WIDESEAWCS_TelescopicService\\AlarmResetHsyServer.cs", - "ViewState": "AgIAACEAAAAAAAAAAAAYwCUAAAAsAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-13T07:15:59.329Z", + "WhenOpened": "2025-08-01T03:02:41.806Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 1, + "Title": "Dt_Maintenance.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Maintenance.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Maintenance.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Maintenance.cs", + "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Maintenance.cs", + "ViewState": "AgIAACgAAAAAAAAAAAAmwDgAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-29T07:05:40.797Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 9, "Title": "Sys_UserController.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs", "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs", "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs", - "ViewState": "AgIAAOgAAAAAAAAAAIA2wP4AAAAoAAAAAAAAAA==", + "ViewState": "AgIAAOsAAAAAAAAAAAAhwPwAAABAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-19T06:39:37.986Z", - "EditorCaption": "" + "WhenOpened": "2025-05-19T06:39:37.986Z" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 4, "Title": "Sys_UserService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", "RelativeToolTip": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "ViewState": "AgIAANkDAAAAAAAAAAAewMQDAABHAAAAAAAAAA==", + "ViewState": "AgIAABsBAAAAAAAAAAAkwC4BAAAOAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-09T01:01:25.032Z", - "EditorCaption": "" + "WhenOpened": "2025-05-09T01:01:25.032Z" }, { "$type": "Document", - "DocumentIndex": 5, - "Title": "ActivatorErrorHandlingMiddleware.cs", - "DocumentMoniker": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\f4a38436a364cfd4c348a2509145a42088563c6553d76feb80f60e62d41960cc\\ActivatorErrorHandlingMiddleware.cs", - "ToolTip": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\f4a38436a364cfd4c348a2509145a42088563c6553d76feb80f60e62d41960cc\\ActivatorErrorHandlingMiddleware.cs", - "ViewState": "AgIAAAwAAAAAAAAAAAAAABoAAABgAAAAAQAAAA==", + "DocumentIndex": 8, + "Title": "Dt_Parameters.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "ViewState": "AgIAAA0AAAAAAAAAAAAMwDsAAAAVAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-17T03:05:39.596Z", - "EditorCaption": "" + "WhenOpened": "2025-04-11T02:21:27.75Z" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "Dt_Loginhsy.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", + "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", + "ViewState": "AgIAAAkAAAAAAAAAAAAuwC0AAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-27T06:17:28.152Z" }, { "$type": "Document", @@ -310,14 +333,84 @@ "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json", - "ViewState": "AgIAAAAAAAAAAAAAAAAAABkAAAALAAAAAAAAAA==", + "ViewState": "AgIAAAkAAAAAAAAAAAAAACQAAAAeAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", "WhenOpened": "2025-05-08T06:53:56.648Z", "EditorCaption": "" }, { "$type": "Document", + "DocumentIndex": 5, + "Title": "Dt_FaceRecognition.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", + "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABIAAAAjAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-27T06:17:26.652Z" + }, + { + "$type": "Document", + "DocumentIndex": 13, + "Title": "AlarmResetHsyServer.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\AlarmResetHsyServer.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\AlarmResetHsyServer.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\AlarmResetHsyServer.cs", + "RelativeToolTip": "WIDESEAWCS_TelescopicService\\AlarmResetHsyServer.cs", + "ViewState": "AgIAACEAAAAAAAAAAAAYwCUAAAAsAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-13T07:15:59.329Z" + }, + { + "$type": "Document", "DocumentIndex": 7, + "Title": "Dt_MaintenanceTeam.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", + "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", + "ViewState": "AgIAAAsAAAAAAAAAAAAwwAoAAAA/AAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-27T07:31:17.257Z" + }, + { + "$type": "Document", + "DocumentIndex": 10, + "Title": "ISys_UserService.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "RelativeToolTip": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "ViewState": "AgIAAEMAAAAAAAAAAAAiwFEAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-09T01:01:17.565Z" + }, + { + "$type": "Document", + "DocumentIndex": 11, + "Title": "Program.cs", + "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Program.cs", + "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", + "RelativeToolTip": "WIDESEAWCS_Server\\Program.cs", + "ViewState": "AgIAABIAAAAAAAAAAAAWwDAAAAA0AAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-08T06:57:12.123Z" + }, + { + "$type": "Document", + "DocumentIndex": 12, + "Title": "ActivatorErrorHandlingMiddleware.cs", + "DocumentMoniker": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\f4a38436a364cfd4c348a2509145a42088563c6553d76feb80f60e62d41960cc\\ActivatorErrorHandlingMiddleware.cs", + "ToolTip": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\f4a38436a364cfd4c348a2509145a42088563c6553d76feb80f60e62d41960cc\\ActivatorErrorHandlingMiddleware.cs", + "ViewState": "AgIAAAwAAAAAAAAAAAAAABoAAABgAAAAAQAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-17T03:05:39.596Z" + }, + { + "$type": "Document", + "DocumentIndex": 14, "Title": "ParametersService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\ParametersService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\ParametersService.cs", @@ -325,12 +418,11 @@ "RelativeToolTip": "WIDESEAWCS_TelescopicService\\ParametersService.cs", "ViewState": "AgIAAD4AAAAAAAAAAAAAwC4AAAAXAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-14T05:58:48.782Z", - "EditorCaption": "" + "WhenOpened": "2025-06-14T05:58:48.782Z" }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 15, "Title": "IParametersService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IParametersService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IParametersService.cs", @@ -338,12 +430,11 @@ "RelativeToolTip": "WIDESEAWCS_ITelescopicService\\IParametersService.cs", "ViewState": "AgIAABAAAAAAAAAAAAAQwBYAAAAlAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-08T02:55:53.764Z", - "EditorCaption": "" + "WhenOpened": "2025-04-08T02:55:53.764Z" }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 16, "Title": "IPaddressServer.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\IPaddressServer.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\IPaddressServer.cs", @@ -355,7 +446,7 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 17, "Title": "IIPaddressServer .cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IIPaddressServer .cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IIPaddressServer .cs", @@ -367,7 +458,7 @@ }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 18, "Title": "LoginhsyService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\LoginhsyService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\LoginhsyService.cs", @@ -379,7 +470,7 @@ }, { "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 19, "Title": "launchSettings.json", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Properties\\launchSettings.json", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Properties\\launchSettings.json", @@ -391,7 +482,7 @@ }, { "$type": "Document", - "DocumentIndex": 14, + "DocumentIndex": 21, "Title": "ISys_LogService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_LogService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_LogService.cs", @@ -403,7 +494,7 @@ }, { "$type": "Document", - "DocumentIndex": 13, + "DocumentIndex": 20, "Title": "Sys_LogService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_LogService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_LogService.cs", @@ -415,7 +506,7 @@ }, { "$type": "Document", - "DocumentIndex": 16, + "DocumentIndex": 23, "Title": "MaintenanceTeamService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceTeamService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\MaintenanceTeamService.cs", @@ -427,7 +518,7 @@ }, { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 22, "Title": "MaintenanceService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs", @@ -439,7 +530,7 @@ }, { "$type": "Document", - "DocumentIndex": 17, + "DocumentIndex": 24, "Title": "DepartmentService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\DepartmentService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\DepartmentService.cs", @@ -451,7 +542,7 @@ }, { "$type": "Document", - "DocumentIndex": 18, + "DocumentIndex": 25, "Title": "IMaintenanceService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", @@ -463,7 +554,7 @@ }, { "$type": "Document", - "DocumentIndex": 19, + "DocumentIndex": 26, "Title": "IMaintenanceTeamService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceTeamService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IMaintenanceTeamService.cs", @@ -475,7 +566,7 @@ }, { "$type": "Document", - "DocumentIndex": 20, + "DocumentIndex": 27, "Title": "TeamCategoryController.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\TeamCategoryController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\TeamCategoryController.cs", @@ -487,7 +578,7 @@ }, { "$type": "Document", - "DocumentIndex": 24, + "DocumentIndex": 31, "Title": "WIDESEAWCS_ITelescopicService.csproj", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj", @@ -499,7 +590,7 @@ }, { "$type": "Document", - "DocumentIndex": 23, + "DocumentIndex": 30, "Title": "WIDESEAWCS_TelescopicService.csproj", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj", @@ -511,7 +602,7 @@ }, { "$type": "Document", - "DocumentIndex": 22, + "DocumentIndex": 29, "Title": "UnitCategoryServer.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\UnitCategoryServer.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\UnitCategoryServer.cs", @@ -523,7 +614,7 @@ }, { "$type": "Document", - "DocumentIndex": 21, + "DocumentIndex": 28, "Title": "Dt_UnitCategory.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\WMSPart\\Dt_UnitCategory.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\WMSPart\\Dt_UnitCategory.cs", @@ -535,7 +626,7 @@ }, { "$type": "Document", - "DocumentIndex": 25, + "DocumentIndex": 32, "Title": "dt_batchinfoService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\dt_batchinfoService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\dt_batchinfoService.cs", @@ -543,12 +634,11 @@ "RelativeToolTip": "WIDESEAWCS_SystemServices\\dt_batchinfoService.cs", "ViewState": "AgIAAAcAAAAAAAAAAAAowBIAAAA+AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-15T07:03:00.795Z", - "EditorCaption": "" + "WhenOpened": "2025-06-15T07:03:00.795Z" }, { "$type": "Document", - "DocumentIndex": 26, + "DocumentIndex": 33, "Title": "Sys_UserFaceController.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\System\\Sys_UserFaceController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\System\\Sys_UserFaceController.cs", @@ -560,7 +650,7 @@ }, { "$type": "Document", - "DocumentIndex": 28, + "DocumentIndex": 35, "Title": "ParametersController.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", @@ -572,7 +662,7 @@ }, { "$type": "Document", - "DocumentIndex": 27, + "DocumentIndex": 34, "Title": "Sys_UserFaceService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserFaceService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserFaceService.cs", @@ -584,7 +674,7 @@ }, { "$type": "Document", - "DocumentIndex": 29, + "DocumentIndex": 36, "Title": "ITeamCategoryServer.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\ITeamCategoryServer.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\ITeamCategoryServer.cs", @@ -596,7 +686,7 @@ }, { "$type": "Document", - "DocumentIndex": 30, + "DocumentIndex": 37, "Title": "Sys_User.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Sys_User.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\Sys_User.cs", @@ -608,19 +698,7 @@ }, { "$type": "Document", - "DocumentIndex": 31, - "Title": "Dt_MaintenanceTeam.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", - "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs", - "ViewState": "AgIAACAAAAAAAAAAAAAgwAoAAAA/AAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-27T07:31:17.257Z" - }, - { - "$type": "Document", - "DocumentIndex": 32, + "DocumentIndex": 38, "Title": "TeamCategoryServer.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\TeamCategoryServer.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\TeamCategoryServer.cs", @@ -632,7 +710,7 @@ }, { "$type": "Document", - "DocumentIndex": 33, + "DocumentIndex": 39, "Title": "AlarmResetHsyController.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\AlarmResetHsyController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\AlarmResetHsyController.cs", @@ -644,7 +722,7 @@ }, { "$type": "Document", - "DocumentIndex": 34, + "DocumentIndex": 40, "Title": "ISys_MenuService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_MenuService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_MenuService.cs", @@ -656,7 +734,7 @@ }, { "$type": "Document", - "DocumentIndex": 35, + "DocumentIndex": 41, "Title": "IUnitCategoryServer.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IUnitCategoryServer.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IUnitCategoryServer.cs", @@ -668,7 +746,7 @@ }, { "$type": "Document", - "DocumentIndex": 36, + "DocumentIndex": 42, "Title": "Dt_TeamCategory.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\WMSPart\\Dt_TeamCategory.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\WMSPart\\Dt_TeamCategory.cs", @@ -680,7 +758,7 @@ }, { "$type": "Document", - "DocumentIndex": 37, + "DocumentIndex": 43, "Title": "AuthorizationRecordController.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\AuthorizationRecordController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\AuthorizationRecordController.cs", @@ -692,7 +770,7 @@ }, { "$type": "Document", - "DocumentIndex": 38, + "DocumentIndex": 44, "Title": "Dt_AuthorizationRecord.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\WMSPart\\Dt_AuthorizationRecord.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\WMSPart\\Dt_AuthorizationRecord.cs", @@ -704,19 +782,7 @@ }, { "$type": "Document", - "DocumentIndex": 39, - "Title": "Dt_Parameters.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "ViewState": "AgIAACwAAAAAAAAAAAArwDsAAAAVAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-11T02:21:27.75Z" - }, - { - "$type": "Document", - "DocumentIndex": 40, + "DocumentIndex": 45, "Title": "Sys_Role.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Sys_Role.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\Sys_Role.cs", @@ -728,7 +794,7 @@ }, { "$type": "Document", - "DocumentIndex": 41, + "DocumentIndex": 46, "Title": "LoginhsyController.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\LoginhsyController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\LoginhsyController.cs", @@ -740,7 +806,7 @@ }, { "$type": "Document", - "DocumentIndex": 42, + "DocumentIndex": 47, "Title": "AddUserDTO.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\System\\AddUserDTO.cs", "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\System\\AddUserDTO.cs", @@ -752,31 +818,7 @@ }, { "$type": "Document", - "DocumentIndex": 43, - "Title": "Dt_Loginhsy.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", - "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs", - "ViewState": "AgIAAB4AAAAAAAAAAAAcwBYAAABQAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-27T06:17:28.152Z" - }, - { - "$type": "Document", - "DocumentIndex": 44, - "Title": "Dt_FaceRecognition.cs", - "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", - "ToolTip": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", - "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_FaceRecognition.cs", - "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-27T06:17:26.652Z" - }, - { - "$type": "Document", - "DocumentIndex": 45, + "DocumentIndex": 48, "Title": "Dt_AlarmResetHsy.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_AlarmResetHsy.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_AlarmResetHsy.cs", @@ -788,7 +830,7 @@ }, { "$type": "Document", - "DocumentIndex": 46, + "DocumentIndex": 49, "Title": "ILoginhsyService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\ILoginhsyService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\ILoginhsyService.cs", @@ -800,7 +842,7 @@ }, { "$type": "Document", - "DocumentIndex": 47, + "DocumentIndex": 50, "Title": "Sys_TenantService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_TenantService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_TenantService.cs", @@ -812,7 +854,7 @@ }, { "$type": "Document", - "DocumentIndex": 48, + "DocumentIndex": 51, "Title": "SSGOneJob.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\SSGOneJob.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SSG\\SSGOneJob.cs", @@ -824,7 +866,7 @@ }, { "$type": "Document", - "DocumentIndex": 49, + "DocumentIndex": 52, "Title": "FaceRecognitionServer.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\FaceRecognitionServer.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\FaceRecognitionServer.cs", @@ -836,7 +878,7 @@ }, { "$type": "Document", - "DocumentIndex": 50, + "DocumentIndex": 53, "Title": "ISys_TenantService.cs", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_TenantService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_TenantService.cs", @@ -848,7 +890,7 @@ }, { "$type": "Document", - "DocumentIndex": 51, + "DocumentIndex": 54, "Title": "Face.cs", "DocumentMoniker": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\b700ba3c32194731a3eaca4d8eaddd483d62abecc7fa3ee9e8c64e80596c22fa\\Face.cs", "ToolTip": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\b700ba3c32194731a3eaca4d8eaddd483d62abecc7fa3ee9e8c64e80596c22fa\\Face.cs", @@ -858,7 +900,7 @@ }, { "$type": "Document", - "DocumentIndex": 52, + "DocumentIndex": 55, "Title": "index.html", "DocumentMoniker": "E:\\ShenSuoGanNew\\\u9879\u76EE\u4EE3\u7801\\\u540E\u7AEF\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\index.html", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\index.html", 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_Model/Models/Telescopic/Dt_CustomIPaddress.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_Model/Models/Telescopic/Dt_CustomIPaddress.cs" index 25334f8..05c63bd 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_Model/Models/Telescopic/Dt_CustomIPaddress.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_Model/Models/Telescopic/Dt_CustomIPaddress.cs" @@ -21,6 +21,9 @@ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鑷畾涔塱p鍦板潃鐨勪腑鏂囧悕瀛�")] public string Addressname { get; set; } + [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "杞ㄩ亾绔欎笓灞瀒d")] + public int? StationID { get; set; } + } } 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_Model/Models/Telescopic/Dt_Maintenance.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_Model/Models/Telescopic/Dt_Maintenance.cs" index 1b274bd..1f202f9 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_Model/Models/Telescopic/Dt_Maintenance.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_Model/Models/Telescopic/Dt_Maintenance.cs" @@ -55,6 +55,9 @@ [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "ip鍦板潃")] public string IPAddress { get; set; } + [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "杞ㄩ亾绔欎笓灞瀒d")] + public int? StationID { get; set; } + /// <summary> /// 妫�淇姸鎬� 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_Tasks/SSG/AlarmResetJob.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_Tasks/SSG/AlarmResetJob.cs" index 7f130dc..486d13f 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_Tasks/SSG/AlarmResetJob.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_Tasks/SSG/AlarmResetJob.cs" @@ -52,30 +52,30 @@ public Task Execute(IJobExecutionContext context) { - //try - //{ + try + { - // //鑾峰彇璁惧鍙� - // // 鑾峰彇鍏ㄩ儴璁惧閰嶇疆 - // OtherDevice serialPortDevice = (OtherDevice)context.JobDetail.JobDataMap.Get("JobParams"); + //鑾峰彇璁惧鍙� + // 鑾峰彇鍏ㄩ儴璁惧閰嶇疆 + //OtherDevice serialPortDevice = (OtherDevice)context.JobDetail.JobDataMap.Get("JobParams"); - // if (serialPortDevice != null) - // { - // HandleAlarm(serialPortDevice); - // } + //if (serialPortDevice != null) + //{ + // HandleAlarm(serialPortDevice); + //} + //鍙 + var alarmInfo = _alarmResetHsyServer.GetWebSocketInfo(); + _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alarmInfo)); - // var alarmInfo = _alarmResetHsyServer.GetWebSocketInfo(); - // _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alarmInfo)); + } + catch (Exception ex) + { - //} - //catch (Exception ex) - //{ - - // Console.WriteLine("閿欒淇℃伅锛�" + ex.Message); - // Console.WriteLine(ex.StackTrace); - //} - return Task.CompletedTask; + Console.WriteLine("閿欒淇℃伅锛�" + ex.Message); + Console.WriteLine(ex.StackTrace); + } + return Task.CompletedTask; } private void HandleAlarm(OtherDevice device) { -- Gitblit v1.9.3