111
yanjinhui
2025-03-28 2d4e07b5d61490d3c3cfeb398d3d6e4b6f8be9bb
111
已添加1个文件
已修改11个文件
878 ■■■■■ 文件已修改
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json 410 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Telescopic/PaginationDTO.cs 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/ILoginhsyService.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceTeamService.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/WIDESEAWCS_ITelescopicService.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/LoginhsyController.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceTeamController.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/LoginhsyService.cs 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs 164 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json
@@ -3,6 +3,7 @@
  "WorkspaceRootPath": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\",
  "Documents": [
    {
<<<<<<< Updated upstream
      "AbsoluteMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\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}"
    },
@@ -13,12 +14,21 @@
    {
      "AbsoluteMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\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:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\controllers\\telescopic\\loginhsycontroller.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\\loginhsycontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\controllers\\telescopic\\maintenanceteamcontroller.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\\maintenanceteamcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
>>>>>>> Stashed changes
    },
    {
      "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\controllers\\telescopic\\maintenancecontroller.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\\maintenancecontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
<<<<<<< Updated upstream
      "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\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}"
    },
@@ -31,6 +41,8 @@
      "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}"
    },
    {
=======
>>>>>>> Stashed changes
      "AbsoluteMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_telescopicservice\\maintenanceteamservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|solutionrelative:wideseawcs_telescopicservice\\maintenanceteamservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
@@ -39,8 +51,77 @@
      "RelativeMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|solutionrelative:wideseawcs_telescopicservice\\parametersservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
<<<<<<< Updated upstream
      "AbsoluteMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\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:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\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:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\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:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\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:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\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:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_telescopicservice\\loginhsyservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{1B1C16CA-8989-4590-BAF6-B55DCC330218}|WIDESEAWCS_TelescopicService\\WIDESEAWCS_TelescopicService.csproj|solutionrelative:wideseawcs_telescopicservice\\loginhsyservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\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:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\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:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_itelescopicservice\\iloginhsyservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}|WIDESEAWCS_ITelescopicService\\WIDESEAWCS_ITelescopicService.csproj|solutionrelative:wideseawcs_itelescopicservice\\iloginhsyservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_dto\\telescopic\\maintenancedto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\telescopic\\maintenancedto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_dto\\telescopic\\paginationdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\telescopic\\paginationdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_dto\\stackercarnetaskdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\stackercarnetaskdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\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:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\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:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\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:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\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:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\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:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\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}"
>>>>>>> Stashed changes
    },
    {
      "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u4F38\u7F29\u6746\\shensuogankongzhi\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
@@ -114,7 +195,11 @@
      "DocumentGroups": [
        {
          "DockedWidth": 200,
<<<<<<< Updated upstream
          "SelectedChildIndex": 5,
=======
          "SelectedChildIndex": 6,
>>>>>>> Stashed changes
          "Children": [
            {
              "$type": "Bookmark",
@@ -127,31 +212,73 @@
            {
              "$type": "Document",
              "DocumentIndex": 3,
<<<<<<< Updated upstream
=======
              "Title": "MaintenanceTeamService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceTeamService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\MaintenanceTeamService.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceTeamService.cs",
              "RelativeToolTip": "WIDESEAWCS_TelescopicService\\MaintenanceTeamService.cs",
              "ViewState": "AgIAABMAAAAAAAAAAAAYwB0AAABTAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T06:30:19.033Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "Title": "ParametersService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\ParametersService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\ParametersService.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\ParametersService.cs",
              "RelativeToolTip": "WIDESEAWCS_TelescopicService\\ParametersService.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAA8AAABAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T06:38:06.251Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 2,
>>>>>>> Stashed changes
              "Title": "MaintenanceController.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\MaintenanceController.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\MaintenanceController.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\MaintenanceController.cs",
              "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\Telescopic\\MaintenanceController.cs",
<<<<<<< Updated upstream
              "ViewState": "AgIAABMAAAAAAAAAAAAQwCUAAAA7AAAAAAAAAA==",
=======
              "ViewState": "AgIAAA4AAAAAAAAAAIA6wBwAAAAzAAAAAAAAAA==",
>>>>>>> Stashed changes
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T03:45:36.643Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
<<<<<<< Updated upstream
              "DocumentIndex": 5,
=======
              "DocumentIndex": 1,
>>>>>>> Stashed changes
              "Title": "MaintenanceTeamController.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\MaintenanceTeamController.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\MaintenanceTeamController.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\MaintenanceTeamController.cs",
              "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\Telescopic\\MaintenanceTeamController.cs",
<<<<<<< Updated upstream
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAfAAAAAAAAAA==",
=======
              "ViewState": "AgIAAAEAAAAAAAAAAAAAABwAAAAJAAAAAAAAAA==",
>>>>>>> Stashed changes
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T06:36:01.612Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
<<<<<<< Updated upstream
              "DocumentIndex": 2,
              "Title": "IMaintenanceService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs",
@@ -161,37 +288,185 @@
              "ViewState": "AgIAAAkAAAAAAAAAAAAAACIAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T03:25:02.597Z",
=======
              "DocumentIndex": 0,
              "Title": "LoginhsyController.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\LoginhsyController.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\LoginhsyController.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\LoginhsyController.cs",
              "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\Telescopic\\LoginhsyController.cs",
              "ViewState": "AgIAAAYAAAAAAAAAAAAlwBwAAAAJAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T06:24:01.767Z",
>>>>>>> Stashed changes
              "EditorCaption": ""
            },
            {
              "$type": "Document",
<<<<<<< Updated upstream
              "DocumentIndex": 0,
=======
              "DocumentIndex": 5,
>>>>>>> Stashed changes
              "Title": "MaintenanceService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceService.cs",
              "RelativeToolTip": "WIDESEAWCS_TelescopicService\\MaintenanceService.cs",
<<<<<<< Updated upstream
              "ViewState": "AgIAABAAAAAAAAAAAAAywHYAAABeAAAAAAAAAA==",
=======
              "ViewState": "AgIAAI8AAAAAAAAAAAAzwNUAAABVAAAAAAAAAA==",
>>>>>>> Stashed changes
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T03:28:25.695Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
<<<<<<< Updated upstream
              "DocumentIndex": 1,
=======
              "DocumentIndex": 6,
              "Title": "IMaintenanceService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs",
              "RelativeToolTip": "WIDESEAWCS_ITelescopicService\\IMaintenanceService.cs",
              "ViewState": "AgIAAA4AAAAAAAAAAAAwwCsAAABQAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T03:25:02.597Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 7,
>>>>>>> Stashed changes
              "Title": "Dt_Maintenance.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Maintenance.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Maintenance.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Maintenance.cs",
              "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Maintenance.cs",
<<<<<<< Updated upstream
              "ViewState": "AgIAABYAAAAAAAAAAAAQwC8AAAA5AAAAAAAAAA==",
=======
              "ViewState": "AgIAABgAAAAAAAAAAAAYwCIAAABHAAAAAAAAAA==",
>>>>>>> Stashed changes
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T02:33:32.419Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
<<<<<<< Updated upstream
              "DocumentIndex": 6,
=======
              "DocumentIndex": 8,
              "Title": "Dt_MaintenanceTeam.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs",
              "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_MaintenanceTeam.cs",
              "ViewState": "AgIAABMAAAAAAAAAAADgvxgAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T02:36:39.311Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 9,
              "Title": "LoginhsyService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\LoginhsyService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_TelescopicService\\LoginhsyService.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\LoginhsyService.cs",
              "RelativeToolTip": "WIDESEAWCS_TelescopicService\\LoginhsyService.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAABsAAAAPAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T06:33:28.725Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 10,
              "Title": "IParametersService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IParametersService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IParametersService.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IParametersService.cs",
              "RelativeToolTip": "WIDESEAWCS_ITelescopicService\\IParametersService.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAAnAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T06:37:45.031Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 11,
              "Title": "IMaintenanceTeamService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceTeamService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\IMaintenanceTeamService.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IMaintenanceTeamService.cs",
              "RelativeToolTip": "WIDESEAWCS_ITelescopicService\\IMaintenanceTeamService.cs",
              "ViewState": "AgIAAAkAAAAAAAAAAAAqwBYAAABOAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T06:30:25.645Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 12,
              "Title": "ILoginhsyService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\ILoginhsyService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_ITelescopicService\\ILoginhsyService.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\ILoginhsyService.cs",
              "RelativeToolTip": "WIDESEAWCS_ITelescopicService\\ILoginhsyService.cs",
              "ViewState": "AgIAAAgAAAAAAAAAAAAqwBYAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T06:23:09.679Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 13,
              "Title": "MaintenanceDto.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\Telescopic\\MaintenanceDto.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\Telescopic\\MaintenanceDto.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\Telescopic\\MaintenanceDto.cs",
              "RelativeToolTip": "WIDESEAWCS_DTO\\Telescopic\\MaintenanceDto.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAADwvwwAAAABAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-27T03:44:05.248Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 14,
              "Title": "PaginationDTO.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\Telescopic\\PaginationDTO.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\Telescopic\\PaginationDTO.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\Telescopic\\PaginationDTO.cs",
              "RelativeToolTip": "WIDESEAWCS_DTO\\Telescopic\\PaginationDTO.cs",
              "ViewState": "AgIAABUAAAAAAAAAAAAYwBgAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-27T09:11:21.746Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 15,
              "Title": "StackerCarneTaskDTO.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\StackerCarneTaskDTO.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\StackerCarneTaskDTO.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\StackerCarneTaskDTO.cs",
              "RelativeToolTip": "WIDESEAWCS_DTO\\StackerCarneTaskDTO.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAADwvwsAAAAFAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-27T03:44:04.213Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 16,
>>>>>>> Stashed changes
              "Title": "ParametersController.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Telescopic\\ParametersController.cs",
@@ -204,7 +479,114 @@
            },
            {
              "$type": "Document",
<<<<<<< Updated upstream
              "DocumentIndex": 4,
=======
              "DocumentIndex": 17,
              "Title": "Dt_Parameters.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs",
              "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Parameters.cs",
              "ViewState": "AgIAABYAAAAAAAAAAAAQwBcAAAAvAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T02:54:42.85Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 18,
              "Title": "Dt_Loginhsy.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs",
              "RelativeToolTip": "WIDESEAWCS_Model\\Models\\Telescopic\\Dt_Loginhsy.cs",
              "ViewState": "AgIAAAYAAAAAAAAAAAAAAB4AAAAYAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T02:59:54.583Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 19,
              "Title": "Sys_UserController.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs",
              "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\System\\Sys_UserController.cs",
              "ViewState": "AgIAABUAAAAAAAAAAADwv4EAAAARAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-27T02:36:47.44Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 20,
              "Title": "ISys_UserService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\ISys_UserService.cs",
              "RelativeToolTip": "WIDESEAWCS_ISystemServices\\ISys_UserService.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAADwvxQAAABDAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-27T02:45:16.14Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 21,
              "Title": "Sys_UserService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserService.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_UserService.cs",
              "RelativeToolTip": "WIDESEAWCS_SystemServices\\Sys_UserService.cs",
              "ViewState": "AgIAAJMAAAAAAAAAAAAIwMgAAABCAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-20T03:30:17.942Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 22,
              "Title": "appsettings.json",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
              "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAsAAAA9AAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
              "WhenOpened": "2025-03-18T03:15:08.029Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 23,
              "Title": "RouterController.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\BasicInfo\\RouterController.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\BasicInfo\\RouterController.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\BasicInfo\\RouterController.cs",
              "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\BasicInfo\\RouterController.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-26T06:43:25.659Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 24,
              "Title": "Sys_User.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Sys_User.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\Sys_User.cs",
              "ToolTip": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Sys_User.cs",
              "RelativeToolTip": "WIDESEAWCS_Model\\Models\\System\\Sys_User.cs",
              "ViewState": "AgIAABYAAAAAAAAAAAAywCgAAAAeAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-18T02:54:53.62Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 25,
>>>>>>> Stashed changes
              "Title": "Program.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Program.cs",
@@ -217,6 +599,7 @@
            },
            {
              "$type": "Document",
<<<<<<< Updated upstream
              "DocumentIndex": 7,
              "Title": "MaintenanceTeamService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\MaintenanceTeamService.cs",
@@ -270,6 +653,9 @@
            {
              "$type": "Document",
              "DocumentIndex": 12,
=======
              "DocumentIndex": 27,
>>>>>>> Stashed changes
              "Title": "LocationStatusChangeRecordController.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\WMSPart\\LocationStatusChangeRecordController.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\WMSPart\\LocationStatusChangeRecordController.cs",
@@ -282,7 +668,11 @@
            },
            {
              "$type": "Document",
<<<<<<< Updated upstream
              "DocumentIndex": 11,
=======
              "DocumentIndex": 26,
>>>>>>> Stashed changes
              "Title": "LocationInfoController.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\WMSPart\\LocationInfoController.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\WMSPart\\LocationInfoController.cs",
@@ -295,6 +685,7 @@
            },
            {
              "$type": "Document",
<<<<<<< Updated upstream
              "DocumentIndex": 13,
              "Title": "LoginhsyService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TelescopicService\\LoginhsyService.cs",
@@ -322,6 +713,9 @@
            {
              "$type": "Document",
              "DocumentIndex": 15,
=======
              "DocumentIndex": 28,
>>>>>>> Stashed changes
              "Title": "LocationInfoService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_WMSPart\\LocationInfoService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_WMSPart\\LocationInfoService.cs",
@@ -334,7 +728,11 @@
            },
            {
              "$type": "Document",
<<<<<<< Updated upstream
              "DocumentIndex": 16,
=======
              "DocumentIndex": 29,
>>>>>>> Stashed changes
              "Title": "ILocationInfoService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_IWMSPart\\ILocationInfoService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_IWMSPart\\ILocationInfoService.cs",
@@ -347,7 +745,11 @@
            },
            {
              "$type": "Document",
<<<<<<< Updated upstream
              "DocumentIndex": 17,
=======
              "DocumentIndex": 30,
>>>>>>> Stashed changes
              "Title": "ILocationStatusChangeRecordService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_IWMSPart\\ILocationStatusChangeRecordService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_IWMSPart\\ILocationStatusChangeRecordService.cs",
@@ -360,6 +762,7 @@
            },
            {
              "$type": "Document",
<<<<<<< Updated upstream
              "DocumentIndex": 18,
              "Title": "IParametersService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITelescopicService\\IParametersService.cs",
@@ -439,6 +842,9 @@
            {
              "$type": "Document",
              "DocumentIndex": 24,
=======
              "DocumentIndex": 31,
>>>>>>> Stashed changes
              "Title": "StockInfo_HtyService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_WMSPart\\StockInfo_HtyService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_WMSPart\\StockInfo_HtyService.cs",
@@ -451,7 +857,11 @@
            },
            {
              "$type": "Document",
<<<<<<< Updated upstream
              "DocumentIndex": 25,
=======
              "DocumentIndex": 32,
>>>>>>> Stashed changes
              "Title": "LocationStatusChangeRecordService.cs",
              "DocumentMoniker": "E:\\\u4F38\u7F29\u6746\\ShenSuoGanKongZhi\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_WMSPart\\LocationStatusChangeRecordService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_WMSPart\\LocationStatusChangeRecordService.cs",
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Telescopic/PaginationDTO.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace WIDESEAWCS_DTO.Telescopic
{
    public class PaginationDTO
    {
        /// <summary>
        /// ç¬¬å‡ é¡µ
        /// </summary>
        public int pageIndex { get; set; }
        /// <summary>
        /// ä¸€é¡µå¤šå°‘个数据
        /// </summary>
        public int pageSize { get; set; }
        /// <summary>
        /// æ¨¡ç³ŠæŸ¥è¯¢çš„字段
        /// </summary>
        public string? searchKeyword { get; set; }
        /// <summary>
        /// å¼€å§‹æ—¶é—´
        /// </summary>
        public DateTime ?startDate { get; set; }
        /// <summary>
        /// ç»“束时间
        /// </summary>
        public DateTime? endDate { get; set; }
        /// <summary>
        /// çŠ¶æ€
        /// </summary>
        public int ? status {  get; set; }
    }
}
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/ILoginhsyService.cs
@@ -5,6 +5,7 @@
using System.Threading.Tasks;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_DTO.Telescopic;
using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_ITelescopicService
@@ -12,6 +13,23 @@
    public interface ILoginhsyService : IService<Dt_Loginhsy>
    {
        IRepository<Dt_Loginhsy> Repository { get; }
<<<<<<< Updated upstream
=======
        /// <summary>
        /// ç™»å…¥è®°å½•
        /// </summary>
        /// <returns></returns>
        WebResponseContent LoginRecord(PaginationDTO pagination);
        /// <summary>
        /// é€€å‡ºæ—¶é—´
        /// </summary>
        /// <returns></returns>
        WebResponseContent OutLoginTime(int id);
>>>>>>> Stashed changes
    }
    
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs
@@ -6,6 +6,7 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_DTO.Telescopic;
using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_ITelescopicService
@@ -18,13 +19,21 @@
       /// è®¾ç½®æ£€ä¿®æƒé™
       /// </summary>
       /// <returns></returns>
<<<<<<< Updated upstream
        WebResponseContent ShowMaintence();
=======
        WebResponseContent ShowMaintence(PaginationDTO pagination);
>>>>>>> Stashed changes
        /// <summary>
        /// åœ¨æ£€ä¿®äººå‘˜ç›‘控
        /// </summary>
        /// <returns></returns>
<<<<<<< Updated upstream
        WebResponseContent PersonnelMonitoring(bool ispossible);
=======
        WebResponseContent PersonnelMonitoring(PaginationDTO pagination);
>>>>>>> Stashed changes
        /// <summary>
        /// æ›´æ”¹çŠ¶æ€ï¼Œè¿è¡Œè¿›å…¥æ£€ä¿®
@@ -35,6 +44,15 @@
        WebResponseContent ChangeTasState(int id);
<<<<<<< Updated upstream
=======
        /// <summary>
        /// æ£€ä¿®æ“ä½œè®°å½•
        /// </summary>
        /// <returns></returns>
        WebResponseContent MaintenanceOperationRecord(PaginationDTO pagination);
>>>>>>> Stashed changes
    }
   
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceTeamService.cs
@@ -5,6 +5,7 @@
using System.Threading.Tasks;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_DTO.Telescopic;
using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_ITelescopicService
@@ -12,5 +13,17 @@
    public interface IMaintenanceTeamService : IService<Dt_MaintenanceTeam>
    {
        IRepository<Dt_MaintenanceTeam> Repository { get; }
<<<<<<< Updated upstream
=======
        /// <summary>
        /// æ£€ä¿®è®¾ç½®è®°å½•
        /// </summary>
        /// <returns></returns>
        WebResponseContent MaintenanceSettingRecord(PaginationDTO pagination);
>>>>>>> Stashed changes
    }
}
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/WIDESEAWCS_ITelescopicService.csproj
@@ -7,6 +7,7 @@
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\WIDESEAWCS_DTO\WIDESEAWCS_DTO.csproj" />
    <ProjectReference Include="..\WIDESEAWCS_Model\WIDESEAWCS_Model.csproj" />
  </ItemGroup>
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/LoginhsyController.cs
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEAWCS_Core.BaseController;
using WIDESEAWCS_DTO.Telescopic;
using WIDESEAWCS_ITelescopicService;
using WIDESEAWCS_IWMSPart;
using WIDESEAWCS_Model.Models;
@@ -14,5 +15,30 @@
        public LoginhsyController(ILoginhsyService service) : base(service)
        {
        }
<<<<<<< Updated upstream
=======
        /// <summary>
        /// ç™»å…¥è®°å½•
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("LoginRecord"),AllowAnonymous]
        public WebResponseContent LoginRecord([FromBody]PaginationDTO pagination)
        {
            return Service.LoginRecord(pagination);
        }
        /// <summary>
        /// ç»™æŽ¨å‡ºæ—¶é—´
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        [HttpPost, Route("OutLoginTime"), AllowAnonymous]
        public WebResponseContent OutLoginTime(int id)
        {
            return Service.OutLoginTime(id);
        }
>>>>>>> Stashed changes
    }
}
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs
@@ -3,6 +3,7 @@
using Microsoft.AspNetCore.Mvc;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseController;
using WIDESEAWCS_DTO.Telescopic;
using WIDESEAWCS_ITelescopicService;
using WIDESEAWCS_IWMSPart;
using WIDESEAWCS_Model.Models;
@@ -22,10 +23,17 @@
        /// æŸ¥çœ‹æ£€ä¿®ç®¡ç†
        /// </summary>
        /// <returns></returns>
<<<<<<< Updated upstream
        [HttpGet,Route("ShowMaintence"),AllowAnonymous]
        public WebResponseContent ShowMaintence()
        {
            return Service.ShowMaintence();
=======
        [HttpPost,Route("ShowMaintence"),AllowAnonymous]
        public WebResponseContent ShowMaintence([FromBody] PaginationDTO pagination)
        {
            return Service.ShowMaintence(pagination);
>>>>>>> Stashed changes
        }
        /// <summary>
@@ -33,9 +41,15 @@
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("PersonnelMonitoring"), AllowAnonymous]
<<<<<<< Updated upstream
        public WebResponseContent PersonnelMonitoring(bool ispossible)
        {
            return Service.PersonnelMonitoring(ispossible);
=======
        public WebResponseContent PersonnelMonitoring([FromBody] PaginationDTO pagination)
        {
            return Service.PersonnelMonitoring(pagination);
>>>>>>> Stashed changes
        }
@@ -60,5 +74,19 @@
        {
            return Service.ChangeTasState(id);
        }
<<<<<<< Updated upstream
=======
        /// <summary>
        /// æ£€ä¿®æ“ä½œè®°å½•
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("MaintenanceOperationRecord"), AllowAnonymous]
        public WebResponseContent MaintenanceOperationRecord([FromBody] PaginationDTO pagination)
        {
            return Service.MaintenanceOperationRecord(pagination);
        }
>>>>>>> Stashed changes
    }
}
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceTeamController.cs
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEAWCS_Core.BaseController;
using WIDESEAWCS_DTO.Telescopic;
using WIDESEAWCS_ITelescopicService;
using WIDESEAWCS_IWMSPart;
using WIDESEAWCS_Model.Models;
@@ -13,6 +14,21 @@
    {
        public MaintenanceTeamController(IMaintenanceService service) : base(service)
        {
<<<<<<< Updated upstream
=======
        }
        /// <summary>
        /// æ£€ä¿®è®¾ç½®è®°å½•
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("MaintenanceSettingRecord"), AllowAnonymous]
        public WebResponseContent MaintenanceSettingRecord([FromBody] PaginationDTO pagination )
        {
            return Service.MaintenanceSettingRecord(pagination);
>>>>>>> Stashed changes
        }
    }
}
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/LoginhsyService.cs
@@ -7,6 +7,7 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_DTO.Telescopic;
using WIDESEAWCS_ITelescopicService;
using WIDESEAWCS_Model.Models;
@@ -29,6 +30,82 @@
        //    return base.GetPageData(options);
        //}
<<<<<<< Updated upstream
=======
        public WebResponseContent LoginRecord(PaginationDTO pagination)
        {
            try
            {
                int totalCount = 0;
                var sys = _user.Db.Queryable<Sys_User>();
                var main = Db.Queryable<Dt_Loginhsy>();
                var query = sys.InnerJoin<Dt_Loginhsy>((a, b) => a.UserName == b.UserName);
                if (!string.IsNullOrEmpty(pagination.searchKeyword))
                {
                    query = query.Where((a, b) =>
                        a.UserTrueName.Contains(pagination.searchKeyword) ||
                        a.Userteam.Contains(pagination.searchKeyword) ||
                        b.OpCenten.Contains(pagination.searchKeyword)
                    );
                }
                if (pagination.startDate.HasValue && pagination.endDate.HasValue)
                {
                    query = query.Where((a, b) => b.LoginTiem >= pagination.startDate.Value && b.LoginTiem <= pagination.endDate.Value);//登入时间
                }
                var result=query
                .Select((a, b) => new
                {
                    a.User_Id,
                    a.UserTrueName,
                    a.Userteam,
                    a.HeadImageUrl,
                    b.LoginTiem,
                    b.OutTiem,
                    b.OpCenten,
                }).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
                return new WebResponseContent
                {
                    Status = true,
                    Data = new
                    {
                        TotalCount = totalCount,//总数
                        PageIndex = pagination.pageIndex,//页数
                        PageSize = pagination.pageSize,//一页多少个数据
                        Items = result
                    }
                };
            }
            catch (Exception ex)
            {
                return new WebResponseContent { Status = true, Message = "错误" + ex };
            }
        }
        public WebResponseContent OutLoginTime(int id)
        {
            try
            {
                var log = BaseDal.QueryFirst(x => x.ID == id);
                if (log==null)
                {
                    return new WebResponseContent { Status = false, Message = "失败" };
                }
                log.OutTiem = DateTime.Now;
                BaseDal.UpdateData(log);
                return new WebResponseContent { Status = true, Data = log.OutTiem };
            }
            catch (Exception ex)
            {
                return new WebResponseContent { Status = false, Message = "错误信息"+ex };
            }
        }
>>>>>>> Stashed changes
    }
   
}
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
@@ -9,6 +9,12 @@
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_ITelescopicService;
using WIDESEAWCS_Model.Models;
<<<<<<< Updated upstream
=======
using WIDESEAWCS_DTO;
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using WIDESEAWCS_DTO.Telescopic;
>>>>>>> Stashed changes
namespace WIDESEAWCS_TelescopicService
{
@@ -21,14 +27,19 @@
        {
            _user = user;
        }
<<<<<<< Updated upstream
        public WebResponseContent ShowMaintence()
=======
        public WebResponseContent ShowMaintence(PaginationDTO pagination)
>>>>>>> Stashed changes
        {
            try
            {
                var sys = _user.QueryData();
                var main = BaseDal.QueryData();
<<<<<<< Updated upstream
                var result = sys.Join(main,
                    u => u.UserName,
                    m => m.UserAccount,
@@ -42,6 +53,39 @@
                        m.IsPossible,
                    });
                return new WebResponseContent { Status = true, Data = result };
=======
                var query = sys.InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount);
                if (!string.IsNullOrEmpty(pagination.searchKeyword))
                {
                    query = query.Where((a, b) =>
                       a.UserTrueName.Contains(pagination.searchKeyword) ||
                         a.UserName.Contains(pagination.searchKeyword) ||
                        a.CardNumber.ToString().Contains(pagination.searchKeyword)||
                         a.Userteam.Contains(pagination.searchKeyword)
                    );
                }
                    var result= query .Select((a, b) => new
                            {
                               b.ID,
                               a.UserTrueName,
                               a.UserName,
                               a.CardNumber,
                               a.Userteam,
                               a.HeadImageUrl,
                               b.IsPossible
                           }).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
                return new WebResponseContent
                {
                    Status = true,
                    Data = new
                    {
                        TotalCount = totalCount,//总数
                        PageIndex = pagination.pageIndex,//页数
                        PageSize = pagination.pageSize,//一页多少个数据
                        Items = result
                    }
                };
>>>>>>> Stashed changes
            }
            catch (Exception ex)
            {
@@ -50,13 +94,28 @@
            }
        }
<<<<<<< Updated upstream
        public WebResponseContent PersonnelMonitoring(bool ispossible)
=======
        /// <summary>
        /// æ¨¡ç³ŠæŸ¥è¯¢
        /// </summary>
        /// <param name="pageIndex"></param>
        /// <param name="pageSize"></param>
        /// <param name="searchKeyword"></param>
        /// <returns></returns>
        public WebResponseContent PersonnelMonitoring(PaginationDTO pagination)
>>>>>>> Stashed changes
        {
            try
            {
                var sys = _user.QueryData();
                var main = BaseDal.QueryData();
<<<<<<< Updated upstream
                var result = sys.Join(main,
                    u => u.UserName,
                    m => m.UserAccount,
@@ -70,6 +129,48 @@
                        m.IsPossible,
                    }).Where(x=>x.IsPossible== ispossible);
                return new WebResponseContent { Status = true, Data = result };
=======
                var query = sys.InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount)
                               .Where((a, b) => b.IsPossible == "true"); // å…ˆç­›é€‰ IsPossible ä¸º true çš„æ•°æ®
                // å¦‚果提供了搜索关键字,则进行模糊查询
                if (!string.IsNullOrEmpty(pagination.searchKeyword))
                {
                    query = query.Where((a, b) =>
                        a.UserTrueName.Contains(pagination.searchKeyword) ||   // æŒ‰çœŸå®žå§“名模糊搜索
                        a.Userteam.Contains(pagination.searchKeyword));        // æŒ‰ç”¨æˆ·ç­ç»„模糊搜索
                }
                // å¦‚果提供了 status å‚数,则按状态筛选
                if (pagination.status.HasValue)//等价if(status!=null)
                {
                    query = query.Where((a, b) => b.MaintenanceStatus == pagination.status.Value);
                }
                var result = query
                    .Select((a, b) => new
                    {
                        a.UserTrueName,
                        a.Userteam,
                        a.HeadImageUrl,
                        b.MaintenanceStatus,
                        b.MaintenanceDate,
                        b.IsPossible,
                    })
                    .ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount); // åˆ†é¡µ
                return new WebResponseContent
                {
                    Status = true,
                    Data = new
                    {
                        TotalCount = totalCount, // æ€»æ•°
                        PageIndex = pagination.pageIndex,   // å½“前页码
                        PageSize = pagination.pageSize,     // æ¯é¡µæ•°æ®é‡
                        Items = result
                    }
                };
>>>>>>> Stashed changes
            }
            catch (Exception ex)
            {
@@ -134,6 +235,69 @@
        }
        /// <summary>
<<<<<<< Updated upstream
=======
        /// æ£€ä¿®æ“ä½œè®°å½•
        /// </summary>
        /// <param name="pageIndex">页数</param>
        /// <param name="pageSize">一页多少个数据</param>
        /// <returns></returns>
        public WebResponseContent MaintenanceOperationRecord(PaginationDTO pagination)
        {
            try
            {
                int totalCount = 0;
                var sys = _user.Db.Queryable<Sys_User>();
                var main = Db.Queryable<Dt_Maintenance>();
                var query = sys.InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount);
                if (!string.IsNullOrEmpty(pagination.searchKeyword))
                {
                    query = query.Where((a, b) =>
                        a.UserTrueName.Contains(pagination.searchKeyword)||
                        a.Userteam.Contains(pagination.searchKeyword)||
                        a.HeadImageUrl.Contains(pagination.searchKeyword)
                    );
                }
                if (pagination.startDate.HasValue && pagination.endDate.HasValue)
                {
                    query = query.Where((a, b) => b.MaintenancStartTime >= pagination.startDate.Value && b.MaintenancStartTime <= pagination.endDate.Value);
                }
                var result = query.Select((a, b) => new
                {
                    a.UserTrueName,
                    a.Userteam,
                    a.HeadImageUrl,
                    b.MaintenancStartTime,
                    b.MaintenancEendTime,
                }).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
                return new WebResponseContent
                {
                    Status = true,
                    Data = new
                    {
                        TotalCount = totalCount,//总数
                        PageIndex = pagination.pageIndex,//页数
                        PageSize = pagination.pageSize,//一页多少个数据
                        Items = result
                    }
                };
            }
            catch (Exception ex)
            {
                return new WebResponseContent { Status = false, Message = "错误信息:" + ex.Message };
            }
        }
        /// <summary>
>>>>>>> Stashed changes
        /// çŠ¶æ€æžšä¸¾
        /// </summary>
        private enum Maint
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs
@@ -5,6 +5,7 @@
using System.Threading.Tasks;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_DTO.Telescopic;
using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_ITelescopicService
@@ -19,5 +20,67 @@
        }
<<<<<<< Updated upstream
=======
        /// <summary>
        /// æ£€ä¿®è®¾ç½®è®°å½•
        /// </summary>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent MaintenanceSettingRecord(PaginationDTO pagination)
        {
            try
            {
                int totalCount = 0;
                var sys = _user.Db.Queryable<Sys_User>();
                var main = Db.Queryable<Dt_MaintenanceTeam>();
                var query = sys.InnerJoin<Dt_MaintenanceTeam>((a, b) => a.UserTrueName == b.OperatorName);
                if (!string .IsNullOrEmpty(pagination.searchKeyword))
                {
                    query = query.Where((a, b) =>
                       b.OperatorName.Contains(pagination.searchKeyword) ||
                       b.TeamName.Contains(pagination.searchKeyword) ||
                       b.Modifier.Contains(pagination.searchKeyword)
                   );
                }
                if (pagination.startDate.HasValue&&pagination.endDate.HasValue)
                {
                    query = query.Where((a, b) => b.DistributionTime >= pagination.startDate && b.DistributionTime <= pagination.endDate);
                }
                var result=query
                .Select((a, b) => new
                {
                    a.User_Id,
                    b.OperatorName,
                    b.TeamName,
                    a.HeadImageUrl,
                    b.DistributionTime,
                    b.Modifier,
                }).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
                return new WebResponseContent
                {
                    Status = true,
                    Data = new
                    {
                        TotalCount = totalCount,//总数
                        PageIndex = pagination.pageIndex,//页数
                        PageSize = pagination.pageSize,//一页多少个数据
                        Items = result
                    }
                };
            }
            catch (Exception ex)
            {
                return new WebResponseContent { Status = false,Message="错误信息:"+ex.Message };
            }
        }
>>>>>>> Stashed changes
    }
}