From a5cd28ab9fd03a958d0bcc697816962e26e45914 Mon Sep 17 00:00:00 2001 From: yanjinhui <3306209981@qq.com> Date: 星期五, 09 五月 2025 10:36:21 +0800 Subject: [PATCH] 注释了人脸识别 --- project/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/AddUserDTO.cs | 10 project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml | 17 + project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs | 102 +++-- project/后台管理/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json | 98 ++++- project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/AddUserDTO.cs | 10 project/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json | 272 +++++++++------ project/后台管理/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json | 104 ++++- project/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json | 250 ++++++++----- project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs | 110 +++--- 9 files changed, 608 insertions(+), 365 deletions(-) diff --git a/project/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json b/project/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json index 7096629..178d9fa 100644 --- a/project/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json +++ b/project/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json @@ -3,8 +3,40 @@ "WorkspaceRootPath": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\", "Documents": [ { + "AbsoluteMoniker": "D:0:0:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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}" + }, + { + "AbsoluteMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_itelescopicservice\\imaintenanceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|solutionrelative:wideseawcs_itelescopicservice\\imaintenanceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_server\\controllers\\telescopic\\alarmresethsycontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\telescopic\\alarmresethsycontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_server\\controllers\\telescopic\\parameterscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -17,26 +49,6 @@ { "AbsoluteMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_itelescopicservice\\iparametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|solutionrelative:wideseawcs_itelescopicservice\\iparametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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:\\ssg\\shensuogankongzhi\\project\\wcs\\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:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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}" }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\b700ba3c32194731a3eaca4d8eaddd483d62abecc7fa3ee9e8c64e80596c22fa\\Face.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -57,21 +69,8 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 0, + "SelectedChildIndex": 3, "Children": [ - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "Program.cs", - "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Program.cs", - "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", - "RelativeToolTip": "WIDESEAWCS_Server\\Program.cs", - "ViewState": "AgIAAGMAAAAAAAAAAAAQwHYAAAACAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T07:25:06.65Z", - "EditorCaption": "" - }, { "$type": "Bookmark", "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" @@ -79,32 +78,123 @@ { "$type": "Document", "DocumentIndex": 1, - "Title": "ParametersController.cs", - "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", - "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", - "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAABoAAAA6AAAAAAAAAA==", + "Title": "AddUserDTO.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "RelativeToolTip": "WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAswAwAAAAWAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T07:19:58.201Z", + "WhenOpened": "2025-05-09T01:17:12.476Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 11, - "Title": "Dt_Parameters.cs", - "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", + "DocumentIndex": 5, + "Title": "IMaintenanceService.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", + "RelativeToolTip": "WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", + "ViewState": "AgIAABAAAAAAAAAAAAA2wBwAAAAuAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T07:18:16.062Z", + "WhenOpened": "2025-05-09T00:56:14.859Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "Sys_UserService.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "RelativeToolTip": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "ViewState": "AgIAADQCAAAAAAAAAAAkwEMCAAAPAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-08T07:04:00.184Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 3, + "Title": "ISys_UserService.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "RelativeToolTip": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "ViewState": "AgIAACoAAAAAAAAAAAAqwAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-08T07:03:56.602Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "MaintenanceService.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs", + "RelativeToolTip": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs", + "ViewState": "AgIAAGQAAAAAAAAAAAAnwKcAAAAhAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-07T08:11:35.497Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "appsettings.json", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", + "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", + "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json", + "ViewState": "AgIAABIAAAAAAAAAAAAAAAsAAAA9AAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", + "WhenOpened": "2025-05-08T06:57:37.7Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "AlarmResetJob.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", + "RelativeToolTip": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", + "ViewState": "AgIAAGkAAAAAAAAAAAAcwHYAAAANAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-08T06:55:40.547Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "Program.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Program.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", + "RelativeToolTip": "WIDESEAWCS_Server\\Program.cs", + "ViewState": "AgIAAGQAAAAAAAAAAAAnwHYAAAACAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-08T07:25:06.65Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "AlarmResetHsyController.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\AlarmResetHsyController.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\AlarmResetHsyController.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\AlarmResetHsyController.cs", + "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\Telescopic\\AlarmResetHsyController.cs", + "ViewState": "AgIAACYAAAAAAAAAAAAAADUAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-08T08:52:27.181Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 11, "Title": "IParametersService.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IParametersService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IParametersService.cs", @@ -112,51 +202,35 @@ "RelativeToolTip": "WIDESEAWCS_ITelescopicService\\IParametersService.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAB8AAABQAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T07:15:50.346Z", - "EditorCaption": "" + "WhenOpened": "2025-05-08T07:15:50.346Z" }, { "$type": "Document", - "DocumentIndex": 4, - "Title": "Sys_UserService.cs", - "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "RelativeToolTip": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "ViewState": "AgIAAAkDAAAAAAAAAAAowEwDAAAgAAAAAAAAAA==", + "DocumentIndex": 14, + "Title": "Dt_Parameters.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T07:04:00.184Z", - "EditorCaption": "" + "WhenOpened": "2025-05-08T07:18:16.062Z" }, { "$type": "Document", - "DocumentIndex": 6, - "Title": "ISys_UserService.cs", - "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "RelativeToolTip": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "ViewState": "AgIAADwAAAAAAAAAAAAUwAAAAAAAAAAAAAAAAA==", + "DocumentIndex": 9, + "Title": "ParametersController.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", + "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABoAAAA6AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T07:03:56.602Z", - "EditorCaption": "" + "WhenOpened": "2025-05-08T07:19:58.201Z" }, { "$type": "Document", - "DocumentIndex": 5, - "Title": "AlarmResetJob.cs", - "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", - "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", - "RelativeToolTip": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", - "ViewState": "AgIAAHMAAAAAAAAAAAAUwI8AAAAkAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T06:55:40.547Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 10, "Title": "ParametersService.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\ParametersService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\ParametersService.cs", @@ -164,37 +238,11 @@ "RelativeToolTip": "WIDESEAWCS_TelescopicService\\ParametersService.cs", "ViewState": "AgIAAIIAAAAAAAAAAAAkwG0AAABvAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-08T00:57:10.872Z", - "EditorCaption": "" + "WhenOpened": "2025-04-08T00:57:10.872Z" }, { "$type": "Document", - "DocumentIndex": 7, - "Title": "appsettings.json", - "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", - "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", - "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", - "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json", - "ViewState": "AgIAAAAAAAAAAAAAAAAAACAAAAAXAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-05-08T06:57:37.7Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 8, - "Title": "MaintenanceService.cs", - "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs", - "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs", - "RelativeToolTip": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs", - "ViewState": "AgIAAPsBAAAAAAAAAAAAAM4AAAAJAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-07T08:11:35.497Z" - }, - { - "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 12, "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", @@ -204,7 +252,7 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 13, "Title": "index.html", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\index.html", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\index.html", diff --git a/project/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json b/project/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json index 21249fa..3cdbdea 100644 --- a/project/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json +++ b/project/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json @@ -3,26 +3,6 @@ "WorkspaceRootPath": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_server\\controllers\\telescopic\\parameterscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\telescopic\\parameterscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_telescopicservice\\parametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|solutionrelative:wideseawcs_telescopicservice\\parametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_itelescopicservice\\iparametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|solutionrelative:wideseawcs_itelescopicservice\\iparametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { "AbsoluteMoniker": "D:0:0:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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}" }, @@ -35,8 +15,40 @@ "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:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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}" + }, + { + "AbsoluteMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_itelescopicservice\\imaintenanceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|solutionrelative:wideseawcs_itelescopicservice\\imaintenanceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\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:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_server\\controllers\\telescopic\\alarmresethsycontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\telescopic\\alarmresethsycontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_server\\controllers\\telescopic\\parameterscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\telescopic\\parameterscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_telescopicservice\\parametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|solutionrelative:wideseawcs_telescopicservice\\parametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\wcs\\wideseawcs_server\\wideseawcs_itelescopicservice\\iparametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|solutionrelative:wideseawcs_itelescopicservice\\iparametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\b700ba3c32194731a3eaca4d8eaddd483d62abecc7fa3ee9e8c64e80596c22fa\\Face.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -57,7 +69,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 6, + "SelectedChildIndex": 2, "Children": [ { "$type": "Bookmark", @@ -65,33 +77,124 @@ }, { "$type": "Document", + "DocumentIndex": 5, + "Title": "IMaintenanceService.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", + "RelativeToolTip": "WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", + "ViewState": "AgIAABAAAAAAAAAAAAA2wBwAAAAuAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-09T00:56:14.859Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "Sys_UserService.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "RelativeToolTip": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "ViewState": "AgIAAA0CAAAAAAAAAAAkwEMCAAAPAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-08T07:04:00.184Z", + "EditorCaption": "" + }, + { + "$type": "Document", "DocumentIndex": 1, + "Title": "ISys_UserService.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "RelativeToolTip": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "ViewState": "AgIAADkAAAAAAAAAAAAzwAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-08T07:03:56.602Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "MaintenanceService.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs", + "RelativeToolTip": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs", + "ViewState": "AgIAAGQAAAAAAAAAAAAnwKcAAAAhAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-07T08:11:35.497Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "appsettings.json", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", + "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", + "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json", + "ViewState": "AgIAABIAAAAAAAAAAAAAACMAAAAkAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", + "WhenOpened": "2025-05-08T06:57:37.7Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "AddUserDTO.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "RelativeToolTip": "WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAswAwAAAAWAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-09T01:17:12.476Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "AlarmResetJob.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", + "RelativeToolTip": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", + "ViewState": "AgIAAGkAAAAAAAAAAAAcwHYAAAANAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-08T06:55:40.547Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, "Title": "Program.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Program.cs", "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", "RelativeToolTip": "WIDESEAWCS_Server\\Program.cs", - "ViewState": "AgIAAHIAAAAAAAAAAAAQwHYAAAACAAAAAAAAAA==", + "ViewState": "AgIAAGQAAAAAAAAAAAAnwHYAAAACAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-08T07:25:06.65Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 11, - "Title": "Dt_Parameters.cs", - "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", - "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", + "DocumentIndex": 8, + "Title": "AlarmResetHsyController.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\AlarmResetHsyController.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\AlarmResetHsyController.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\AlarmResetHsyController.cs", + "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\Telescopic\\AlarmResetHsyController.cs", + "ViewState": "AgIAACYAAAAAAAAAAAAAADUAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T07:18:16.062Z", + "WhenOpened": "2025-05-08T08:52:27.181Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 11, "Title": "IParametersService.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IParametersService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IParametersService.cs", @@ -99,51 +202,23 @@ "RelativeToolTip": "WIDESEAWCS_ITelescopicService\\IParametersService.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAB8AAABQAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T07:15:50.346Z", - "EditorCaption": "" + "WhenOpened": "2025-05-08T07:15:50.346Z" }, { "$type": "Document", - "DocumentIndex": 5, - "Title": "Sys_UserService.cs", - "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "RelativeToolTip": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "ViewState": "AgIAAAkDAAAAAAAAAAAowEwDAAAgAAAAAAAAAA==", + "DocumentIndex": 14, + "Title": "Dt_Parameters.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", + "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T07:04:00.184Z", - "EditorCaption": "" + "WhenOpened": "2025-05-08T07:18:16.062Z" }, { "$type": "Document", - "DocumentIndex": 6, - "Title": "ISys_UserService.cs", - "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "RelativeToolTip": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", - "ViewState": "AgIAADwAAAAAAAAAAAAUwAAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T07:03:56.602Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "AlarmResetJob.cs", - "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", - "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", - "RelativeToolTip": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", - "ViewState": "AgIAAE4AAAAAAAAAAAAcwC0AAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T06:55:40.547Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 9, "Title": "ParametersController.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", @@ -151,12 +226,11 @@ "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAABoAAAA6AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T07:19:58.201Z", - "EditorCaption": "" + "WhenOpened": "2025-05-08T07:19:58.201Z" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 10, "Title": "ParametersService.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\ParametersService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\ParametersService.cs", @@ -164,37 +238,11 @@ "RelativeToolTip": "WIDESEAWCS_TelescopicService\\ParametersService.cs", "ViewState": "AgIAAIIAAAAAAAAAAAAkwG0AAABvAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-08T00:57:10.872Z", - "EditorCaption": "" + "WhenOpened": "2025-04-08T00:57:10.872Z" }, { "$type": "Document", - "DocumentIndex": 7, - "Title": "appsettings.json", - "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", - "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", - "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", - "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json", - "ViewState": "AgIAAAAAAAAAAAAAAAAAACAAAAAXAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-05-08T06:57:37.7Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 8, - "Title": "MaintenanceService.cs", - "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs", - "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs", - "RelativeToolTip": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs", - "ViewState": "AgIAAPsBAAAAAAAAAAAAAM4AAAAJAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-07T08:11:35.497Z" - }, - { - "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 12, "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", @@ -204,7 +252,7 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 13, "Title": "index.html", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\index.html", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\index.html", diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/AddUserDTO.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/AddUserDTO.cs index 9391b1f..119da60 100644 --- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/AddUserDTO.cs +++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/AddUserDTO.cs @@ -44,6 +44,16 @@ public string?path { get; set; } + /// <summary> + /// 鐝粍 + /// </summary> + public string userteam { get; set; } + + /// <summary> + /// 鍗″彿 + /// </summary> + public int carnuber { get; set; } + ///// <summary> ///// 鍥剧墖token ///// </summary> diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml new file mode 100644 index 0000000..e62ed4a --- /dev/null +++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml @@ -0,0 +1,17 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<!-- +https://go.microsoft.com/fwlink/?LinkID=208121. +--> +<Project> + <PropertyGroup> + <DeleteExistingFiles>false</DeleteExistingFiles> + <ExcludeApp_Data>false</ExcludeApp_Data> + <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish> + <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration> + <LastUsedPlatform>Any CPU</LastUsedPlatform> + <PublishProvider>FileSystem</PublishProvider> + <PublishUrl>E:\鍙戝竷鏂囦欢\鍗曟満鐗�</PublishUrl> + <WebPublishMethod>FileSystem</WebPublishMethod> + <_TargetId>Folder</_TargetId> + </PropertyGroup> +</Project> \ No newline at end of file diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs index 97fcd6f..da37b8e 100644 --- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs +++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs @@ -521,23 +521,25 @@ { return new WebResponseContent { Status = false, Message = "璐﹀彿閲嶅锛岃閲嶆柊褰曞叆" }; } - var face = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault(); - var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo - { - ImgPath = addUserDTO.path, - user_id = addUserDTO.username, - group_id = face // 杩欓噷搴旇濉櫨搴︿汉鑴稿簱鍒嗙粍 - // group_id = baiduResult.result.log_id - }); + + //浜鸿劯璇嗗埆鍏堟敞閲婃帀鍚庢湡寮�鍚� + //var face = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault(); + //var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo + //{ + // ImgPath = addUserDTO.path, + // user_id = addUserDTO.username, + // group_id = face // 杩欓噷搴旇濉櫨搴︿汉鑴稿簱鍒嗙粍 + // // group_id = baiduResult.result.log_id + //}); - // 鍒ゆ柇鐧惧害杩斿洖鏄惁鎴愬姛 - if (baiduResult == null || baiduResult.error_code != 0) - { - return new WebResponseContent { Status = false, Data = "浜鸿劯娉ㄥ唽澶辫触锛�" + baiduResult.error_msg }; + //// 鍒ゆ柇鐧惧害杩斿洖鏄惁鎴愬姛 + //if (baiduResult == null || baiduResult.error_code != 0) + //{ + // return new WebResponseContent { Status = false, Data = "浜鸿劯娉ㄥ唽澶辫触锛�" + baiduResult.error_msg }; - } + //} // 鍒涘缓鐢ㄦ埛鏁版嵁 var sys = new Sys_User @@ -545,13 +547,15 @@ UserName = addUserDTO.username, UserTrueName = addUserDTO.usertruename, HeadImageUrl = addUserDTO.path, - Log_id = baiduResult.log_id, - Face_token = baiduResult.result.face_token, + //Log_id = baiduResult.log_id, + //Face_token = baiduResult.result.face_token, PhoneNo = addUserDTO.phoneno, Role_Id = addUserDTO.roleid, RoleName = addUserDTO.rolename, Enable = addUserDTO.enable, UserPwd = "j79rYYvCz4vdhcboB1Ausg==", + Userteam=addUserDTO.userteam, + CardNumber=addUserDTO.carnuber, CreateDate = DateTime.Now }; BaseDal.AddData(sys); @@ -599,32 +603,36 @@ sys.PhoneNo = addUserDTO.phoneno; sys.Role_Id = addUserDTO.roleid; sys.RoleName = addUserDTO.rolename; + sys.CardNumber = addUserDTO.carnuber; + sys.Userteam = addUserDTO.userteam; sys.Enable = addUserDTO.enable; + //濡傛灉浜鸿劯璇嗗埆娣诲姞浜嗚繖閲屽氨娉ㄩ噴鎺� + sys.HeadImageUrl = addUserDTO.path; // 4. 鏌ヨ浜鸿劯搴撳垎缁� ID var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault(); // 5. 鍒ゆ柇鏄惁闇�瑕佹洿鏂颁汉鑴镐俊鎭� - if (!string.Equals(sys.HeadImageUrl,addUserDTO.path)) // 鏈夋柊鍥剧墖鎵嶅鐞嗕汉鑴告敞鍐� - { - var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo - { - ImgPath = addUserDTO.path, - user_id = sys.UserName, - group_id = faceGroupID - }); + //if (!string.Equals(sys.HeadImageUrl,addUserDTO.path)) // 鏈夋柊鍥剧墖鎵嶅鐞嗕汉鑴告敞鍐� + //{ + // var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo + // { + // ImgPath = addUserDTO.path, + // user_id = sys.UserName, + // group_id = faceGroupID + // }); - // 6. 鍒ゆ柇鐧惧害 API 鏄惁鎴愬姛 - if (baiduResult == null || baiduResult.error_code != 0) - { - return new WebResponseContent { Status = false, Message = "浜鸿劯鏇存柊澶辫触锛�" + baiduResult.error_msg }; - } + // // 6. 鍒ゆ柇鐧惧害 API 鏄惁鎴愬姛 + // if (baiduResult == null || baiduResult.error_code != 0) + // { + // return new WebResponseContent { Status = false, Message = "浜鸿劯鏇存柊澶辫触锛�" + baiduResult.error_msg }; + // } - // 7. 鏇存柊浜鸿劯鐩稿叧瀛楁 - sys.Log_id = baiduResult.log_id; - sys.HeadImageUrl = addUserDTO.path; - sys.Face_token = baiduResult.result.face_token; - } + // // 7. 鏇存柊浜鸿劯鐩稿叧瀛楁 + // sys.Log_id = baiduResult.log_id; + // sys.HeadImageUrl = addUserDTO.path; + // sys.Face_token = baiduResult.result.face_token; + //} // 8. 鏇存柊鏁版嵁搴� BaseDal.UpdateData(sys); @@ -652,18 +660,18 @@ { // 2. 鏌ヨ浜鸿劯搴撳垎缁� ID - var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault(); + //var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault(); - WIDESEAWCS_Common.DeleteUserImg deleteUserImg = new WIDESEAWCS_Common.DeleteUserImg(); - deleteUserImg.group_id = faceGroupID; - deleteUserImg.user_id = account; + //WIDESEAWCS_Common.DeleteUserImg deleteUserImg = new WIDESEAWCS_Common.DeleteUserImg(); + //deleteUserImg.group_id = faceGroupID; + //deleteUserImg.user_id = account; - string apiResult = BaiDuFaceHelper.DeleteUser(deleteUserImg);//鍙缁檛oken鍜宭og_id + //string apiResult = BaiDuFaceHelper.DeleteUser(deleteUserImg);//鍙缁檛oken鍜宭og_id - // 2. 瑙f瀽杩斿洖缁撴灉锛屽垽鏂垹闄ゆ槸鍚︽垚鍔� - dynamic resultObj = JsonConvert.DeserializeObject(apiResult); - if (resultObj.error_code == 0) - { + //// 2. 瑙f瀽杩斿洖缁撴灉锛屽垽鏂垹闄ゆ槸鍚︽垚鍔� + //dynamic resultObj = JsonConvert.DeserializeObject(apiResult); + //if (resultObj.error_code == 0) + //{ // 鐧惧害鍒犻櫎鎴愬姛鍚庯紝鍒犻櫎鏁版嵁搴撲腑鐨勭敤鎴� var user = BaseDal.QueryData(x => x.UserName == account); if (user != null) @@ -671,11 +679,11 @@ BaseDal.DeleteData(user); } return WebResponseContent.Instance.OK("鐢ㄦ埛鍒犻櫎鎴愬姛"); - } - else - { - return WebResponseContent.Instance.Error("鐧惧害 API 鍒犻櫎澶辫触锛�" + resultObj.error_msg); - } + //} + //else + //{ + // return WebResponseContent.Instance.Error("鐧惧害 API 鍒犻櫎澶辫触锛�" + resultObj.error_msg); + //} } catch (Exception ex) { diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" index 5f088eb..a3545da 100644 --- "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" +++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" @@ -3,16 +3,28 @@ "WorkspaceRootPath": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|e:\\ssg\\shensuogankongzhi\\project\\\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:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|e:\\ssg\\shensuogankongzhi\\project\\\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:\\ssg\\shensuogankongzhi\\project\\\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:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\ssg\\shensuogankongzhi\\project\\\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:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\\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}" + }, + { + "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_itelescopicservice\\imaintenanceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -21,10 +33,6 @@ { "AbsoluteMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_telescopicservice\\parametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|solutionrelative:wideseawcs_telescopicservice\\parametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\ssg\\shensuogankongzhi\\project\\\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:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_itelescopicservice\\iparametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -44,6 +52,10 @@ { "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\ssg\\shensuogankongzhi\\project\\\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:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|e:\\ssg\\shensuogankongzhi\\project\\\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}" } ], "DocumentGroupContainers": [ @@ -53,7 +65,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 3, + "SelectedChildIndex": 2, "Children": [ { "$type": "Bookmark", @@ -61,20 +73,59 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 13, + "Title": "AddUserDTO.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "RelativeToolTip": "WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-09T01:20:36.401Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "Sys_UserService.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "RelativeToolTip": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "ViewState": "AgIAANYBAAAAAAAAAAAwwPwBAABEAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-09T01:01:25.032Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "ISys_UserService.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "RelativeToolTip": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "ViewState": "AgIAAB0AAAAAAAAAAAAiwDUAAAAMAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-09T01:01:17.565Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, "Title": "MaintenanceService.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs", "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs", "RelativeToolTip": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs", - "ViewState": "AgIAAFkAAAAAAAAAAAAiwHEAAAARAAAAAAAAAA==", + "ViewState": "AgIAAIUAAAAAAAAAAAD4v5QAAABbAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-08T07:22:27.758Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 6, "Title": "IMaintenanceService.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", @@ -82,51 +133,50 @@ "RelativeToolTip": "WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", "ViewState": "AgIAABgAAAAAAAAAAAAcwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T07:22:25.211Z", - "EditorCaption": "" + "WhenOpened": "2025-05-08T07:22:25.211Z" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 5, "Title": "Program.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Program.cs", "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", "RelativeToolTip": "WIDESEAWCS_Server\\Program.cs", - "ViewState": "AgIAAGMAAAAAAAAAAAAAAHUAAAArAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAHcAAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-08T06:57:12.123Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 3, "Title": "AlarmResetJob.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", "RelativeToolTip": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", - "ViewState": "AgIAABAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAA==", + "ViewState": "AgIAABMAAAAAAAAAAAAgwCMAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-08T06:55:29.934Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 2, "Title": "appsettings.json", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAALAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABIAAAAJAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", "WhenOpened": "2025-05-08T06:53:56.648Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 8, "Title": "IParametersService.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IParametersService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IParametersService.cs", @@ -138,7 +188,7 @@ }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 7, "Title": "ParametersService.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\ParametersService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\ParametersService.cs", @@ -146,12 +196,11 @@ "RelativeToolTip": "WIDESEAWCS_TelescopicService\\ParametersService.cs", "ViewState": "AgIAAAwAAAAAAAAAAAAAABMAAABZAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-08T00:57:10.872Z", - "EditorCaption": "" + "WhenOpened": "2025-04-08T00:57:10.872Z" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 9, "Title": "ParametersController.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", @@ -163,7 +212,7 @@ }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 10, "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", @@ -173,7 +222,7 @@ }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 11, "Title": "index.html", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\index.html", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\index.html", @@ -185,7 +234,7 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 12, "Title": "Dt_Parameters.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", @@ -193,8 +242,7 @@ "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", "ViewState": "AgIAAAsAAAAAAAAAAAAwwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-11T02:21:27.75Z", - "EditorCaption": "" + "WhenOpened": "2025-04-11T02:21:27.75Z" } ] } diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" index 5bef869..a3545da 100644 --- "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" +++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" @@ -3,20 +3,28 @@ "WorkspaceRootPath": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\ssg\\shensuogankongzhi\\project\\\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:\\ssg\\shensuogankongzhi\\project\\\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:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|e:\\ssg\\shensuogankongzhi\\project\\\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:\\ssg\\shensuogankongzhi\\project\\\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:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\ssg\\shensuogankongzhi\\project\\\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:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\\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}" + }, + { + "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u540E\u53F0\u7BA1\u7406\\wideseawcs_server\\wideseawcs_itelescopicservice\\imaintenanceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -44,6 +52,10 @@ { "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\ssg\\shensuogankongzhi\\project\\\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:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|e:\\ssg\\shensuogankongzhi\\project\\\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}" } ], "DocumentGroupContainers": [ @@ -53,7 +65,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 4, + "SelectedChildIndex": 2, "Children": [ { "$type": "Bookmark", @@ -61,20 +73,59 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 13, + "Title": "AddUserDTO.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "RelativeToolTip": "WIDESEAWCS_DTO\\System\\AddUserDTO.cs", + "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-09T01:20:36.401Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "Sys_UserService.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "RelativeToolTip": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "ViewState": "AgIAANYBAAAAAAAAAAAwwPwBAABEAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-09T01:01:25.032Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "ISys_UserService.cs", + "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "RelativeToolTip": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs", + "ViewState": "AgIAAB0AAAAAAAAAAAAiwDUAAAAMAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-09T01:01:17.565Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, "Title": "MaintenanceService.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs", "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs", "RelativeToolTip": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs", - "ViewState": "AgIAAFkAAAAAAAAAAAAiwHEAAAARAAAAAAAAAA==", + "ViewState": "AgIAAIUAAAAAAAAAAAD4v5QAAABbAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-08T07:22:27.758Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 6, "Title": "IMaintenanceService.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", @@ -82,31 +133,30 @@ "RelativeToolTip": "WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs", "ViewState": "AgIAABgAAAAAAAAAAAAcwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-08T07:22:25.211Z", - "EditorCaption": "" + "WhenOpened": "2025-05-08T07:22:25.211Z" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 5, "Title": "Program.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Program.cs", "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", "RelativeToolTip": "WIDESEAWCS_Server\\Program.cs", - "ViewState": "AgIAAAkAAAAAAAAAAAAAAHcAAAARAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAHcAAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-08T06:57:12.123Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 3, "Title": "AlarmResetJob.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", "RelativeToolTip": "WIDESEAWCS_Tasks\\SSG\\AlarmResetJob.cs", - "ViewState": "AgIAABUAAAAAAAAAAAAkwEMAAABUAAAAAAAAAA==", + "ViewState": "AgIAABMAAAAAAAAAAAAgwCMAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-08T06:55:29.934Z", "EditorCaption": "" @@ -119,14 +169,14 @@ "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAALAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABIAAAAJAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", "WhenOpened": "2025-05-08T06:53:56.648Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 8, "Title": "IParametersService.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IParametersService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IParametersService.cs", @@ -138,7 +188,7 @@ }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 7, "Title": "ParametersService.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\ParametersService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\ParametersService.cs", @@ -146,12 +196,11 @@ "RelativeToolTip": "WIDESEAWCS_TelescopicService\\ParametersService.cs", "ViewState": "AgIAAAwAAAAAAAAAAAAAABMAAABZAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-08T00:57:10.872Z", - "EditorCaption": "" + "WhenOpened": "2025-04-08T00:57:10.872Z" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 9, "Title": "ParametersController.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs", @@ -163,7 +212,7 @@ }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 10, "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", @@ -173,7 +222,7 @@ }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 11, "Title": "index.html", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\index.html", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\index.html", @@ -185,7 +234,7 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 12, "Title": "Dt_Parameters.cs", "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u540E\u53F0\u7BA1\u7406\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", @@ -193,8 +242,7 @@ "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs", "ViewState": "AgIAAAsAAAAAAAAAAAAwwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-11T02:21:27.75Z", - "EditorCaption": "" + "WhenOpened": "2025-04-11T02:21:27.75Z" } ] } diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/AddUserDTO.cs" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/AddUserDTO.cs" index 9391b1f..119da60 100644 --- "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/AddUserDTO.cs" +++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/AddUserDTO.cs" @@ -44,6 +44,16 @@ public string?path { get; set; } + /// <summary> + /// 鐝粍 + /// </summary> + public string userteam { get; set; } + + /// <summary> + /// 鍗″彿 + /// </summary> + public int carnuber { get; set; } + ///// <summary> ///// 鍥剧墖token ///// </summary> diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs" index 580ee29..7bd5718 100644 --- "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs" +++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs" @@ -520,23 +520,23 @@ { return new WebResponseContent { Status = false, Message = "璐﹀彿閲嶅锛岃閲嶆柊褰曞叆" }; } - var face = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault(); - var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo - { - ImgPath = addUserDTO.path, - user_id = addUserDTO.username, - group_id = face // 杩欓噷搴旇濉櫨搴︿汉鑴稿簱鍒嗙粍 - // group_id = baiduResult.result.log_id - }); + //var face = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault(); + //var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo + //{ + // ImgPath = addUserDTO.path, + // user_id = addUserDTO.username, + // group_id = face // 杩欓噷搴旇濉櫨搴︿汉鑴稿簱鍒嗙粍 + // // group_id = baiduResult.result.log_id + //}); - // 鍒ゆ柇鐧惧害杩斿洖鏄惁鎴愬姛 - if (baiduResult == null || baiduResult.error_code != 0) - { - return new WebResponseContent { Status = false, Data = "浜鸿劯娉ㄥ唽澶辫触锛�" + baiduResult.error_msg }; + //// 鍒ゆ柇鐧惧害杩斿洖鏄惁鎴愬姛 + //if (baiduResult == null || baiduResult.error_code != 0) + //{ + // return new WebResponseContent { Status = false, Data = "浜鸿劯娉ㄥ唽澶辫触锛�" + baiduResult.error_msg }; - } + //} // 鍒涘缓鐢ㄦ埛鏁版嵁 var sys = new Sys_User @@ -544,13 +544,15 @@ UserName = addUserDTO.username, UserTrueName = addUserDTO.usertruename, HeadImageUrl = addUserDTO.path, - Log_id = baiduResult.log_id, - Face_token = baiduResult.result.face_token, + // Log_id = baiduResult.log_id, + // Face_token = baiduResult.result.face_token, PhoneNo = addUserDTO.phoneno, Role_Id = addUserDTO.roleid, RoleName = addUserDTO.rolename, Enable = addUserDTO.enable, UserPwd = "j79rYYvCz4vdhcboB1Ausg==", + Userteam = addUserDTO.userteam, + CardNumber = addUserDTO.carnuber, CreateDate = DateTime.Now }; BaseDal.AddData(sys); @@ -583,7 +585,7 @@ } // 2. 妫�鏌ヨ处鍙锋槸鍚︿慨鏀癸紝骞跺垽鏂槸鍚﹂噸澶�//StringComparison.OrdinalIgnoreCase锛氳〃绀哄拷鐣ュぇ灏忓啓杩涜姣旇緝锛屾瘮濡� "admin" 鍜� "ADMIN" 涔熻涓烘槸鐩哥瓑鐨� - if (!string.Equals(sys.UserName ,addUserDTO.username)) + if (!string.Equals(sys.UserName, addUserDTO.username)) { var existUser = userList.FirstOrDefault(a => a.UserName == addUserDTO.username); if (existUser != null) @@ -598,32 +600,36 @@ sys.PhoneNo = addUserDTO.phoneno; sys.Role_Id = addUserDTO.roleid; sys.RoleName = addUserDTO.rolename; + sys.CardNumber = addUserDTO.carnuber; + sys.Userteam = addUserDTO.userteam; sys.Enable = addUserDTO.enable; + //濡傛灉浜鸿劯璇嗗埆娣诲姞浜嗚繖閲屽氨娉ㄩ噴鎺� + sys.HeadImageUrl = addUserDTO.path; - // 4. 鏌ヨ浜鸿劯搴撳垎缁� ID - var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault(); + //// 4. 鏌ヨ浜鸿劯搴撳垎缁� ID + //var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault(); - // 5. 鍒ゆ柇鏄惁闇�瑕佹洿鏂颁汉鑴镐俊鎭� - if (!string.Equals(sys.HeadImageUrl,addUserDTO.path)) // 鏈夋柊鍥剧墖鎵嶅鐞嗕汉鑴告敞鍐� - { - var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo - { - ImgPath = addUserDTO.path, - user_id = sys.UserName, - group_id = faceGroupID - }); + //// 5. 鍒ゆ柇鏄惁闇�瑕佹洿鏂颁汉鑴镐俊鎭� + //if (!string.Equals(sys.HeadImageUrl,addUserDTO.path)) // 鏈夋柊鍥剧墖鎵嶅鐞嗕汉鑴告敞鍐� + //{ + // var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo + // { + // ImgPath = addUserDTO.path, + // user_id = sys.UserName, + // group_id = faceGroupID + // }); - // 6. 鍒ゆ柇鐧惧害 API 鏄惁鎴愬姛 - if (baiduResult == null || baiduResult.error_code != 0) - { - return new WebResponseContent { Status = false, Message = "浜鸿劯鏇存柊澶辫触锛�" + baiduResult.error_msg }; - } + // // 6. 鍒ゆ柇鐧惧害 API 鏄惁鎴愬姛 + // if (baiduResult == null || baiduResult.error_code != 0) + // { + // return new WebResponseContent { Status = false, Message = "浜鸿劯鏇存柊澶辫触锛�" + baiduResult.error_msg }; + // } - // 7. 鏇存柊浜鸿劯鐩稿叧瀛楁 - sys.Log_id = baiduResult.log_id; - sys.HeadImageUrl = addUserDTO.path; - sys.Face_token = baiduResult.result.face_token; - } + // // 7. 鏇存柊浜鸿劯鐩稿叧瀛楁 + // sys.Log_id = baiduResult.log_id; + // sys.HeadImageUrl = addUserDTO.path; + // sys.Face_token = baiduResult.result.face_token; + //} // 8. 鏇存柊鏁版嵁搴� BaseDal.UpdateData(sys); @@ -650,19 +656,19 @@ try { - // 2. 鏌ヨ浜鸿劯搴撳垎缁� ID - var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault(); + //// 2. 鏌ヨ浜鸿劯搴撳垎缁� ID + //var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault(); - WIDESEAWCS_Common.DeleteUserImg deleteUserImg = new WIDESEAWCS_Common.DeleteUserImg(); - deleteUserImg.group_id = faceGroupID; - deleteUserImg.user_id = account; + //WIDESEAWCS_Common.DeleteUserImg deleteUserImg = new WIDESEAWCS_Common.DeleteUserImg(); + //deleteUserImg.group_id = faceGroupID; + //deleteUserImg.user_id = account; - string apiResult = BaiDuFaceHelper.DeleteUser(deleteUserImg);//鍙缁檛oken鍜宭og_id + //string apiResult = BaiDuFaceHelper.DeleteUser(deleteUserImg);//鍙缁檛oken鍜宭og_id - // 2. 瑙f瀽杩斿洖缁撴灉锛屽垽鏂垹闄ゆ槸鍚︽垚鍔� - dynamic resultObj = JsonConvert.DeserializeObject(apiResult); - if (resultObj.error_code == 0) - { + //// 2. 瑙f瀽杩斿洖缁撴灉锛屽垽鏂垹闄ゆ槸鍚︽垚鍔� + //dynamic resultObj = JsonConvert.DeserializeObject(apiResult); + //if (resultObj.error_code == 0) + //{ // 鐧惧害鍒犻櫎鎴愬姛鍚庯紝鍒犻櫎鏁版嵁搴撲腑鐨勭敤鎴� var user = BaseDal.QueryData(x => x.UserName == account); if (user != null) @@ -670,11 +676,11 @@ BaseDal.DeleteData(user); } return WebResponseContent.Instance.OK("鐢ㄦ埛鍒犻櫎鎴愬姛"); - } - else - { - return WebResponseContent.Instance.Error("鐧惧害 API 鍒犻櫎澶辫触锛�" + resultObj.error_msg); - } + //} + //else + //{ + // return WebResponseContent.Instance.Error("鐧惧害 API 鍒犻櫎澶辫触锛�" + resultObj.error_msg); + //} } catch (Exception ex) { -- Gitblit v1.9.3