From 69b4b758498b839aedbd82f7d4dee9d879ba65fe Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 12 六月 2025 09:17:53 +0800
Subject: [PATCH] 修改开始检修和查看检修人员接口
---
project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/IPaddressServer.cs | 24 +
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj | 2
project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj | 1
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs | 6
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/IPaddressController .cs | 29 +
project/人脸识别插件/FaceSdkX64/FaceSdkX64.sln | 26 -
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs | 8
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserFaceService.cs | 2
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_CustomIPaddress.cs | 26 +
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs | 14
project/人脸识别插件/FaceSdkX64/.vs/FaceSdkX64/v17/DocumentLayout.json | 248 +---------
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IIPaddressServer .cs | 19
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs | 205 ++++++--
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs | 1
project/人脸识别插件/FaceSdkX64/.vs/FaceSdkX64/v17/DocumentLayout.backup.json | 224 +--------
project/人脸识别插件/FaceSdkX64/FaceSdkX64Register/FrmRegister.cs | 6
project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs | 9
project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs | 14
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server.sln | 62 ++
project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs | 1
project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IIPaddressServer .cs | 19
project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/IPaddressController .cs | 29 +
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/IPaddressServer.cs | 24 +
project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_CustomIPaddress.cs | 26 +
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs | 13
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 4
project/人脸识别插件/FaceSdkX64/UpgradeLog.htm | 276 ++++++++++++
27 files changed, 807 insertions(+), 511 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IIPaddressServer .cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IIPaddressServer .cs
new file mode 100644
index 0000000..4ab61c3
--- /dev/null
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IIPaddressServer .cs
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseRepository;
+using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_DTO.Telescopic;
+using WIDESEAWCS_Model.Models;
+
+namespace WIDESEAWCS_ITaskInfoService
+{
+ public interface IIPaddressServer : IService<Dt_CustomIPaddress>
+ {
+ IRepository<Dt_CustomIPaddress> Repository { get; }
+
+ }
+}
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs
index d8acad0..a0799f5 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs
@@ -33,7 +33,7 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- WebResponseContent RunOperation(int id, string LocalIP);
+ WebResponseContent RunOperation(int id, string account, string LocalIP);
WebResponseContent ChangeTasState(int id);
@@ -59,10 +59,10 @@
/// </summary>
/// <param name="id">鐢ㄦ埛id</param>
/// <returns></returns>
- WebResponseContent StopMaintenanceTask(string account);
+ WebResponseContent StopMaintenanceTask(string account,string LocalIP);
/// <summary>
- /// 灞曠ず寮�濮嬫淇汉鍛�
+ /// 灞曠ず寮�濮嬫淇汉鍛�(鍓嶇娌℃湁浣跨敤鍒�)
/// </summary>
/// <param name="status">妫�淇姸鎬�</param>
/// <returns></returns>
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_CustomIPaddress.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_CustomIPaddress.cs
new file mode 100644
index 0000000..25334f8
--- /dev/null
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_CustomIPaddress.cs
@@ -0,0 +1,26 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_Core.DB.Models;
+using WIDESEAWCS_Core.Tenants;
+
+namespace WIDESEAWCS_Model.Models
+{
+ [SugarTable("Dt_CustomIPaddress", "鑷畾涔塱p鍦板潃"), MultiTenant]
+ public class Dt_CustomIPaddress:BaseEntity
+ {
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int ID { get; set; }
+
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "IP鍦板潃")]
+ public string IPaddress { get; set; }
+
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鑷畾涔塱p鍦板潃鐨勪腑鏂囧悕瀛�")]
+ public string Addressname { get; set; }
+
+
+ }
+}
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs
index 9c22702..5fd8ffa 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs
@@ -56,6 +56,14 @@
public int MaintenanceStatus{ get; set; }
/// <summary>
+ /// ip鍦板潃
+ /// </summary>
+ [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "ip鍦板潃")]
+ public string IPAddress { get; set; }
+
+
+
+ /// <summary>
/// 妫�淇紑濮嬫椂闂�
/// </summary>
[SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "妫�淇紑濮嬫椂闂�")]
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server.sln b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server.sln
index 19bc2a0..cf97f96 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server.sln
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server.sln
@@ -54,130 +54,192 @@
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}.Debug|x64.ActiveCfg = Debug|x64
{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}.Debug|x64.Build.0 = Debug|x64
+ {487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}.Debug|x86.ActiveCfg = Debug|x86
+ {487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}.Debug|x86.Build.0 = Debug|x86
{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}.Release|Any CPU.Build.0 = Release|Any CPU
{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}.Release|x64.ActiveCfg = Release|x64
{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}.Release|x64.Build.0 = Release|x64
+ {487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}.Release|x86.ActiveCfg = Release|x86
+ {487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}.Release|x86.Build.0 = Release|x86
{294E4915-0241-4C8C-BA99-7588B945863A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{294E4915-0241-4C8C-BA99-7588B945863A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{294E4915-0241-4C8C-BA99-7588B945863A}.Debug|x64.ActiveCfg = Debug|x64
{294E4915-0241-4C8C-BA99-7588B945863A}.Debug|x64.Build.0 = Debug|x64
+ {294E4915-0241-4C8C-BA99-7588B945863A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {294E4915-0241-4C8C-BA99-7588B945863A}.Debug|x86.Build.0 = Debug|Any CPU
{294E4915-0241-4C8C-BA99-7588B945863A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{294E4915-0241-4C8C-BA99-7588B945863A}.Release|Any CPU.Build.0 = Release|Any CPU
{294E4915-0241-4C8C-BA99-7588B945863A}.Release|x64.ActiveCfg = Release|x64
{294E4915-0241-4C8C-BA99-7588B945863A}.Release|x64.Build.0 = Release|x64
+ {294E4915-0241-4C8C-BA99-7588B945863A}.Release|x86.ActiveCfg = Release|Any CPU
+ {294E4915-0241-4C8C-BA99-7588B945863A}.Release|x86.Build.0 = Release|Any CPU
{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}.Debug|x64.ActiveCfg = Debug|x64
{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}.Debug|x64.Build.0 = Debug|x64
+ {7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}.Debug|x86.Build.0 = Debug|Any CPU
{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}.Release|Any CPU.Build.0 = Release|Any CPU
{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}.Release|x64.ActiveCfg = Release|x64
{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}.Release|x64.Build.0 = Release|x64
+ {7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}.Release|x86.ActiveCfg = Release|Any CPU
+ {7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}.Release|x86.Build.0 = Release|Any CPU
{C2D3D138-9109-481B-8BEB-A27597890B2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C2D3D138-9109-481B-8BEB-A27597890B2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2D3D138-9109-481B-8BEB-A27597890B2C}.Debug|x64.ActiveCfg = Debug|x64
{C2D3D138-9109-481B-8BEB-A27597890B2C}.Debug|x64.Build.0 = Debug|x64
+ {C2D3D138-9109-481B-8BEB-A27597890B2C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {C2D3D138-9109-481B-8BEB-A27597890B2C}.Debug|x86.Build.0 = Debug|Any CPU
{C2D3D138-9109-481B-8BEB-A27597890B2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C2D3D138-9109-481B-8BEB-A27597890B2C}.Release|Any CPU.Build.0 = Release|Any CPU
{C2D3D138-9109-481B-8BEB-A27597890B2C}.Release|x64.ActiveCfg = Release|x64
{C2D3D138-9109-481B-8BEB-A27597890B2C}.Release|x64.Build.0 = Release|x64
+ {C2D3D138-9109-481B-8BEB-A27597890B2C}.Release|x86.ActiveCfg = Release|Any CPU
+ {C2D3D138-9109-481B-8BEB-A27597890B2C}.Release|x86.Build.0 = Release|Any CPU
{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}.Debug|x64.ActiveCfg = Debug|x64
{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}.Debug|x64.Build.0 = Debug|x64
+ {9FBC654C-51DE-422D-9E1E-6A38268DE1E2}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {9FBC654C-51DE-422D-9E1E-6A38268DE1E2}.Debug|x86.Build.0 = Debug|Any CPU
{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}.Release|Any CPU.Build.0 = Release|Any CPU
{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}.Release|x64.ActiveCfg = Release|x64
{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}.Release|x64.Build.0 = Release|x64
+ {9FBC654C-51DE-422D-9E1E-6A38268DE1E2}.Release|x86.ActiveCfg = Release|Any CPU
+ {9FBC654C-51DE-422D-9E1E-6A38268DE1E2}.Release|x86.Build.0 = Release|Any CPU
{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}.Debug|x64.ActiveCfg = Debug|x64
{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}.Debug|x64.Build.0 = Debug|x64
+ {9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}.Debug|x86.Build.0 = Debug|Any CPU
{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}.Release|Any CPU.Build.0 = Release|Any CPU
{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}.Release|x64.ActiveCfg = Release|x64
{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}.Release|x64.Build.0 = Release|x64
+ {9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}.Release|x86.ActiveCfg = Release|Any CPU
+ {9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}.Release|x86.Build.0 = Release|Any CPU
{A14242DD-DA06-4DC3-8598-1761AA7C76D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A14242DD-DA06-4DC3-8598-1761AA7C76D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A14242DD-DA06-4DC3-8598-1761AA7C76D1}.Debug|x64.ActiveCfg = Debug|x64
{A14242DD-DA06-4DC3-8598-1761AA7C76D1}.Debug|x64.Build.0 = Debug|x64
+ {A14242DD-DA06-4DC3-8598-1761AA7C76D1}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A14242DD-DA06-4DC3-8598-1761AA7C76D1}.Debug|x86.Build.0 = Debug|Any CPU
{A14242DD-DA06-4DC3-8598-1761AA7C76D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A14242DD-DA06-4DC3-8598-1761AA7C76D1}.Release|Any CPU.Build.0 = Release|Any CPU
{A14242DD-DA06-4DC3-8598-1761AA7C76D1}.Release|x64.ActiveCfg = Release|x64
{A14242DD-DA06-4DC3-8598-1761AA7C76D1}.Release|x64.Build.0 = Release|x64
+ {A14242DD-DA06-4DC3-8598-1761AA7C76D1}.Release|x86.ActiveCfg = Release|Any CPU
+ {A14242DD-DA06-4DC3-8598-1761AA7C76D1}.Release|x86.Build.0 = Release|Any CPU
{7279A2AE-8D1F-4E66-A73A-01AF7927A336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7279A2AE-8D1F-4E66-A73A-01AF7927A336}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7279A2AE-8D1F-4E66-A73A-01AF7927A336}.Debug|x64.ActiveCfg = Debug|x64
{7279A2AE-8D1F-4E66-A73A-01AF7927A336}.Debug|x64.Build.0 = Debug|x64
+ {7279A2AE-8D1F-4E66-A73A-01AF7927A336}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7279A2AE-8D1F-4E66-A73A-01AF7927A336}.Debug|x86.Build.0 = Debug|Any CPU
{7279A2AE-8D1F-4E66-A73A-01AF7927A336}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7279A2AE-8D1F-4E66-A73A-01AF7927A336}.Release|Any CPU.Build.0 = Release|Any CPU
{7279A2AE-8D1F-4E66-A73A-01AF7927A336}.Release|x64.ActiveCfg = Release|x64
{7279A2AE-8D1F-4E66-A73A-01AF7927A336}.Release|x64.Build.0 = Release|x64
+ {7279A2AE-8D1F-4E66-A73A-01AF7927A336}.Release|x86.ActiveCfg = Release|Any CPU
+ {7279A2AE-8D1F-4E66-A73A-01AF7927A336}.Release|x86.Build.0 = Release|Any CPU
{83F18A31-5983-4587-A0B2-414BF70E50B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{83F18A31-5983-4587-A0B2-414BF70E50B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{83F18A31-5983-4587-A0B2-414BF70E50B5}.Debug|x64.ActiveCfg = Debug|x64
{83F18A31-5983-4587-A0B2-414BF70E50B5}.Debug|x64.Build.0 = Debug|x64
+ {83F18A31-5983-4587-A0B2-414BF70E50B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {83F18A31-5983-4587-A0B2-414BF70E50B5}.Debug|x86.Build.0 = Debug|Any CPU
{83F18A31-5983-4587-A0B2-414BF70E50B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{83F18A31-5983-4587-A0B2-414BF70E50B5}.Release|Any CPU.Build.0 = Release|Any CPU
{83F18A31-5983-4587-A0B2-414BF70E50B5}.Release|x64.ActiveCfg = Release|x64
{83F18A31-5983-4587-A0B2-414BF70E50B5}.Release|x64.Build.0 = Release|x64
+ {83F18A31-5983-4587-A0B2-414BF70E50B5}.Release|x86.ActiveCfg = Release|Any CPU
+ {83F18A31-5983-4587-A0B2-414BF70E50B5}.Release|x86.Build.0 = Release|Any CPU
{8C2CC25B-DE5D-433E-A550-63864C7A716D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8C2CC25B-DE5D-433E-A550-63864C7A716D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8C2CC25B-DE5D-433E-A550-63864C7A716D}.Debug|x64.ActiveCfg = Debug|x64
{8C2CC25B-DE5D-433E-A550-63864C7A716D}.Debug|x64.Build.0 = Debug|x64
+ {8C2CC25B-DE5D-433E-A550-63864C7A716D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {8C2CC25B-DE5D-433E-A550-63864C7A716D}.Debug|x86.Build.0 = Debug|Any CPU
{8C2CC25B-DE5D-433E-A550-63864C7A716D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8C2CC25B-DE5D-433E-A550-63864C7A716D}.Release|Any CPU.Build.0 = Release|Any CPU
{8C2CC25B-DE5D-433E-A550-63864C7A716D}.Release|x64.ActiveCfg = Release|x64
{8C2CC25B-DE5D-433E-A550-63864C7A716D}.Release|x64.Build.0 = Release|x64
+ {8C2CC25B-DE5D-433E-A550-63864C7A716D}.Release|x86.ActiveCfg = Release|Any CPU
+ {8C2CC25B-DE5D-433E-A550-63864C7A716D}.Release|x86.Build.0 = Release|Any CPU
{FFAB2C76-1C9E-4006-95C8-A0B2AA53139D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FFAB2C76-1C9E-4006-95C8-A0B2AA53139D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FFAB2C76-1C9E-4006-95C8-A0B2AA53139D}.Debug|x64.ActiveCfg = Debug|x64
{FFAB2C76-1C9E-4006-95C8-A0B2AA53139D}.Debug|x64.Build.0 = Debug|x64
+ {FFAB2C76-1C9E-4006-95C8-A0B2AA53139D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FFAB2C76-1C9E-4006-95C8-A0B2AA53139D}.Debug|x86.Build.0 = Debug|Any CPU
{FFAB2C76-1C9E-4006-95C8-A0B2AA53139D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FFAB2C76-1C9E-4006-95C8-A0B2AA53139D}.Release|Any CPU.Build.0 = Release|Any CPU
{FFAB2C76-1C9E-4006-95C8-A0B2AA53139D}.Release|x64.ActiveCfg = Release|x64
{FFAB2C76-1C9E-4006-95C8-A0B2AA53139D}.Release|x64.Build.0 = Release|x64
+ {FFAB2C76-1C9E-4006-95C8-A0B2AA53139D}.Release|x86.ActiveCfg = Release|Any CPU
+ {FFAB2C76-1C9E-4006-95C8-A0B2AA53139D}.Release|x86.Build.0 = Release|Any CPU
{ADD3F3A3-CDFF-4854-B8C9-058FBDA2CFD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ADD3F3A3-CDFF-4854-B8C9-058FBDA2CFD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ADD3F3A3-CDFF-4854-B8C9-058FBDA2CFD4}.Debug|x64.ActiveCfg = Debug|x64
{ADD3F3A3-CDFF-4854-B8C9-058FBDA2CFD4}.Debug|x64.Build.0 = Debug|x64
+ {ADD3F3A3-CDFF-4854-B8C9-058FBDA2CFD4}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {ADD3F3A3-CDFF-4854-B8C9-058FBDA2CFD4}.Debug|x86.Build.0 = Debug|Any CPU
{ADD3F3A3-CDFF-4854-B8C9-058FBDA2CFD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ADD3F3A3-CDFF-4854-B8C9-058FBDA2CFD4}.Release|Any CPU.Build.0 = Release|Any CPU
{ADD3F3A3-CDFF-4854-B8C9-058FBDA2CFD4}.Release|x64.ActiveCfg = Release|x64
{ADD3F3A3-CDFF-4854-B8C9-058FBDA2CFD4}.Release|x64.Build.0 = Release|x64
+ {ADD3F3A3-CDFF-4854-B8C9-058FBDA2CFD4}.Release|x86.ActiveCfg = Release|Any CPU
+ {ADD3F3A3-CDFF-4854-B8C9-058FBDA2CFD4}.Release|x86.Build.0 = Release|Any CPU
{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}.Debug|x64.ActiveCfg = Debug|x64
{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}.Debug|x64.Build.0 = Debug|x64
+ {B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}.Debug|x86.Build.0 = Debug|Any CPU
{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}.Release|Any CPU.Build.0 = Release|Any CPU
{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}.Release|x64.ActiveCfg = Release|x64
{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}.Release|x64.Build.0 = Release|x64
+ {B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}.Release|x86.ActiveCfg = Release|Any CPU
+ {B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}.Release|x86.Build.0 = Release|Any CPU
{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}.Debug|x64.ActiveCfg = Debug|x64
{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}.Debug|x64.Build.0 = Debug|x64
+ {4784950F-D89F-4F0A-9FFD-E8F44589AC2A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {4784950F-D89F-4F0A-9FFD-E8F44589AC2A}.Debug|x86.Build.0 = Debug|Any CPU
{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}.Release|Any CPU.Build.0 = Release|Any CPU
{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}.Release|x64.ActiveCfg = Release|x64
{4784950F-D89F-4F0A-9FFD-E8F44589AC2A}.Release|x64.Build.0 = Release|x64
+ {4784950F-D89F-4F0A-9FFD-E8F44589AC2A}.Release|x86.ActiveCfg = Release|Any CPU
+ {4784950F-D89F-4F0A-9FFD-E8F44589AC2A}.Release|x86.Build.0 = Release|Any CPU
{1B1C16CA-8989-4590-BAF6-B55DCC330218}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B1C16CA-8989-4590-BAF6-B55DCC330218}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B1C16CA-8989-4590-BAF6-B55DCC330218}.Debug|x64.ActiveCfg = Debug|x64
{1B1C16CA-8989-4590-BAF6-B55DCC330218}.Debug|x64.Build.0 = Debug|x64
+ {1B1C16CA-8989-4590-BAF6-B55DCC330218}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {1B1C16CA-8989-4590-BAF6-B55DCC330218}.Debug|x86.Build.0 = Debug|Any CPU
{1B1C16CA-8989-4590-BAF6-B55DCC330218}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1B1C16CA-8989-4590-BAF6-B55DCC330218}.Release|Any CPU.Build.0 = Release|Any CPU
{1B1C16CA-8989-4590-BAF6-B55DCC330218}.Release|x64.ActiveCfg = Release|x64
{1B1C16CA-8989-4590-BAF6-B55DCC330218}.Release|x64.Build.0 = Release|x64
+ {1B1C16CA-8989-4590-BAF6-B55DCC330218}.Release|x86.ActiveCfg = Release|Any CPU
+ {1B1C16CA-8989-4590-BAF6-B55DCC330218}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/IPaddressController .cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/IPaddressController .cs
new file mode 100644
index 0000000..167d68e
--- /dev/null
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/IPaddressController .cs
@@ -0,0 +1,29 @@
+锘縰sing Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseController;
+using WIDESEAWCS_DTO.TaskInfo;
+using WIDESEAWCS_DTO.Telescopic;
+using WIDESEAWCS_ITaskInfoService;
+using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_TaskInfoService;
+using WIDESEAWCS_TelescopicService;
+
+
+namespace WIDESEAWCS_Server.Controllers.SerialPort
+{
+ [Route("api/[controller]")]
+ [ApiController]
+ public class IPaddressController : ApiBaseController<IIPaddressServer, Dt_CustomIPaddress>
+ {
+ public IPaddressController(IIPaddressServer service) : base(service)
+ {
+
+ }
+
+
+
+ }
+}
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs
index 06a69fe..49807d5 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs
@@ -49,11 +49,11 @@
/// <param name="id"></param>
/// <returns></returns>
[HttpPost, Route("RunOperation"), AllowAnonymous]
- public WebResponseContent RunOperation(int id, string LocalIP)
+ public WebResponseContent RunOperation(int id, string account, string LocalIP)
{
var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip
- var reslut = userIp.Replace("::ffff:", " ");
- return Service.RunOperation(id, LocalIP);
+ var reslut = userIp.Replace("::ffff:", "");
+ return Service.RunOperation(id,account, LocalIP);
}
/// <summary>
@@ -103,8 +103,8 @@
public WebResponseContent StartMaintenceTask(string account)
{
var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip
- var reslut = userIp.Replace("::ffff:", " ");
- return Service.StartMaintenceTask(account, reslut);
+ var reslut = userIp.Replace("::ffff:", "");
+ return Service.StartMaintenceTask(account, userIp);
}
@@ -116,7 +116,9 @@
[HttpPost, Route("StopMaintenanceTask")]
public WebResponseContent StopMaintenanceTask(string account)
{
- return Service.StopMaintenanceTask(account);
+ var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip
+ var reslut = userIp.Replace("::ffff:", "");
+ return Service.StopMaintenanceTask(account, userIp);
}
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj
index ebb02c6..c4075f3 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<GenerateDocumentationFile>False</GenerateDocumentationFile>
- <Platforms>AnyCPU;x64</Platforms>
+ <Platforms>AnyCPU;x64;x86</Platforms>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
index 8526bd9..ed480d8 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
@@ -32,8 +32,8 @@
},
"ApiName": "WIDESEA",
"ExpMinutes": 120,
- "QuartzJobAutoStart": true,
- "LogDeubgEnable": true, //鏄惁璁板綍璋冭瘯鏃ュ織
+ "QuartzJobAutoStart": false,
+ "LogDeubgEnable": false, //鏄惁璁板綍璋冭瘯鏃ュ織
"PrintSql": false, //鎵撳嵃SQL璇彞
"LogAOPEnable": false, //鏄惁璁板綍AOP鏃ュ織
"WebSocketEnable": true,
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserFaceService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserFaceService.cs
index 29a41ce..9fd656b 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserFaceService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserFaceService.cs
@@ -111,6 +111,8 @@
};
}
+ string str = Environment.CurrentDirectory;
+
byte[] data = Convert.FromBase64String(model.Base64Image);
string basePath = AppDomain.CurrentDomain.BaseDirectory + "Record\\";
if (!Directory.Exists(basePath))
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs
index 9b18838..8f4080e 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs
@@ -227,6 +227,7 @@
ID = user.UserId,
RoleId = user.RoleId,
depid = disbled.Dept_Id,
+ IsLeader = disbled.IsLeader,
});
}
else
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/IPaddressServer.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/IPaddressServer.cs
new file mode 100644
index 0000000..7d1e507
--- /dev/null
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/IPaddressServer.cs
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseRepository;
+using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_ITaskInfoService;
+using WIDESEAWCS_Model.Models;
+
+namespace WIDESEAWCS_TelescopicService
+{
+ public class IPaddressServer : ServiceBase<Dt_CustomIPaddress, IRepository<Dt_CustomIPaddress>>, IIPaddressServer
+ {
+ public IRepository<Dt_CustomIPaddress> Repository => BaseDal;
+ public IPaddressServer(IRepository<Dt_CustomIPaddress> BaseDal) : base(BaseDal)
+ {
+
+ }
+
+
+ }
+}
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
index a99fa9d..bd567dd 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
@@ -15,6 +15,7 @@
using WIDESEAWCS_DTO.Telescopic;
using SqlSugar.DistributedSystem.Snowflake;
using System.IO;
+using System.Net;
namespace WIDESEAWCS_TelescopicService
{
@@ -22,14 +23,16 @@
{
public IRepository<Dt_Maintenance> Repository => BaseDal;
public readonly IRepository<Dt_MaintenanceTeam> _team;
+ private readonly IRepository<Dt_CustomIPaddress> _ipaddress;
private readonly IRepository<Sys_User> _user;
+
- public MaintenanceService(IRepository<Dt_Maintenance> BaseDal, IRepository<Sys_User> user, IRepository<Dt_MaintenanceTeam> team) : base(BaseDal)
+ public MaintenanceService(IRepository<Dt_CustomIPaddress>ipaddress,IRepository<Dt_Maintenance> BaseDal, IRepository<Sys_User> user, IRepository<Dt_MaintenanceTeam> team) : base(BaseDal)
{
_user = user;
_team = team;
-
+ _ipaddress = ipaddress;
}
@@ -117,59 +120,101 @@
/// <param name="pageSize"></param>
/// <param name="searchKeyword"></param>
/// <returns></returns>
+ //public WebResponseContent PersonnelMonitoring(PaginationDTO pagination)
+ //{
+ // try
+ // {
+ // int totalCount = 0;
+ // var sys = _user.Db.Queryable<Sys_User>();
+
+
+ // var query = sys.InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount)
+ // .RightJoin<Dt_CustomIPaddress>((a,b,c)=>b.IPAddress==c.IPaddress)
+ // .Where((a, b) => b.MaintenanceStatus==1); // 灞曠ず杩愯妫�淇殑
+
+ // // 鎼滅储鍏抽敭瀛�
+ // if (!string.IsNullOrEmpty(pagination.searchKeyword))
+ // {
+ // query = query.Where((a, b) =>
+ // a.UserTrueName.Contains(pagination.searchKeyword) ||
+ // a.Userteam.Contains(pagination.searchKeyword));
+ // }
+
+ // var result = query
+ // .Select((a, b,c) => new
+ // {
+ // b.UserAccount,//璐﹀彿
+ // a.UserTrueName,
+ // a.Userteam,//鐝粍
+ // a.Unit,//鍗曚綅
+ // a.RoleName,//瑙掕壊鍚嶇О
+ // //b.IPAddress,//绔欏彴
+ // IPAddress = c.Addressname ?? b.IPAddress, // 浼樺厛鏄剧ず鑷畾涔夊悕绉�
+ // b.ID,//id
+ // b.MaintenanceStatus,//妫�淇姸鎬�
+ // b.CreateDate,//鏃ユ湡
+ // b.MaintenancStartTime,//寮�濮嬫椂闂�
+ // })
+ // .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, Data = ex.Message };
+ // }
+ //}
public WebResponseContent PersonnelMonitoring(PaginationDTO pagination)
{
try
{
int totalCount = 0;
- var sys = _user.Db.Queryable<Sys_User>();
+ var query = _user.Db.Queryable<Dt_Maintenance>()
+ .Where(b => b.MaintenanceStatus == 1)
+ .InnerJoin<Sys_User>((b, a) => b.UserAccount == a.UserName)
+ .LeftJoin<Dt_CustomIPaddress>((b, a, c) => b.IPAddress == c.IPaddress);
- var query = sys.InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount)
- .Where((a, b) => b.MaintenanceStatus==1); // 灞曠ず杩愯妫�淇殑
-
- // 鎼滅储鍏抽敭瀛�
if (!string.IsNullOrEmpty(pagination.searchKeyword))
{
- query = query.Where((a, b) =>
+ query = query.Where((b, a, c) =>
a.UserTrueName.Contains(pagination.searchKeyword) ||
a.Userteam.Contains(pagination.searchKeyword));
}
- //// 鐘舵�佸弬鏁�
- //if (pagination.status.HasValue) //澶氫紶涓�涓姸鎬�
- //{
- // query = query.Where((a, b) => b.MaintenanceStatus == pagination.status.Value);
- //}
-
- var result = query
- .Select((a, b) => new
- {
- a.UserTrueName,
- a.Userteam,//鐝粍
- a.Unit,//鍗曚綅
- b.ID,//id
- b.MaintenanceStatus,//妫�淇姸鎬�
- b.CreateDate,//鏃ユ湡
- b.MaintenancStartTime,//寮�濮嬫椂闂�
- })
- .ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
+ var result = query.Select((b, a, c) => new
+ {
+ b.UserAccount,
+ a.UserTrueName,
+ a.Userteam,
+ a.Unit,
+ a.RoleName,
+ IPAddress = c.Addressname ?? b.IPAddress ?? "鏃營P",
+ b.ID,
+ b.MaintenanceStatus,
+ b.CreateDate,
+ b.MaintenancStartTime
+ }).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
return new WebResponseContent
{
Status = true,
- Data = new
- {
- TotalCount = totalCount,
- PageIndex = pagination.pageIndex,
- PageSize = pagination.pageSize,
- Items = result
- }
+ Data = new { totalCount, pagination.pageIndex, pagination.pageSize, result }
};
}
catch (Exception ex)
{
- return new WebResponseContent { Status = false, Data = ex.Message };
+ return new WebResponseContent { Status = false, Message = ex.Message };
}
}
@@ -178,43 +223,62 @@
/// <summary>
- /// 鏇存柊鐘舵�佸己鍒朵笅绾匡紙娣诲姞浜嗘淇褰曪級
+ /// 鏇存柊鐘舵�佸己鍒朵笅绾匡紙娣诲姞浜嗘淇褰�
/// </summary>
- /// <param name="id"></param>
- /// <param name="ispossible"></param>
+ /// <param name="id">瑕佸己鍒惰皝涓嬬嚎</param>
+ /// <param name="account">鐧诲叆浜哄憳璐﹀彿</param>
+ /// <param name="LocalIP">鍦板潃ip</param>
/// <returns></returns>
- public WebResponseContent RunOperation(int id,string LocalIP)
+ public WebResponseContent RunOperation(int id, string account, string LocalIP)
{
try
{
- var user = BaseDal.QueryData();//妫�淇〃
-
- var maint = user.Where(x => x.ID == id).FirstOrDefault(); //鍦ㄦ淇〃涓厛鎵惧埌璇ョ敤鎴�
- var sysuer = _user.QueryData(x => x.UserName == maint.UserAccount).FirstOrDefault();
- if (maint == null ||sysuer==null)
+ // 1. 鏌ユ壘鐩爣鐢ㄦ埛锛堣琚己鍒朵笅绾跨殑浜猴級
+ var maint = BaseDal.QueryData().FirstOrDefault(x => x.ID == id);
+ var sysuer = _user.QueryData(x => x.UserName == maint.UserAccount).FirstOrDefault();//user琛�
+ if (maint == null || sysuer==null)
{
return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌璇ョ敤鎴�" };
}
- maint.MaintenanceStatus = 0;//鏀瑰彉鐘舵�佸己鍒朵笅绾�
+
+
+ // 2. 鏌ユ壘褰撳墠鐧诲綍鐢ㄦ埛锛堟墽琛屾搷浣滅殑浜猴級
+ var currentUser = _user.QueryData(x => x.UserName == account).FirstOrDefault();
+ if (currentUser == null)
+ {
+ return new WebResponseContent { Status = false, Message = "褰撳墠鐧诲綍鐢ㄦ埛鏃犳晥" };
+ }
+
+ // 3. 鏉冮檺妫�鏌ワ細褰撳墠鐢ㄦ埛鏄� admin 鎴� 褰撳墠鐢ㄦ埛鏄粍闀匡紙IsLeader == 1锛�
+ bool isAdmin = account == "admin";
+ bool isLeader = currentUser.IsLeader == 1; // 鍋囪 Sys_User 琛ㄦ湁 IsLeader 瀛楁
+
+ if (!isAdmin && !isLeader)
+ {
+ return new WebResponseContent { Status = false, Message = "浣犳病鏈夋潈闄愬己鍒朵笅绾�" };
+ }
+
+ // 4. 鎵ц寮哄埗涓嬬嚎
+ maint.MaintenanceStatus = 0; // 鏀瑰彉鐘舵�佷负涓嬬嚎
BaseDal.UpdateData(maint);
- //鎻掑叆璁板綍琛�
- var recording = new Dt_MaintenanceTeam //娣诲姞璁板綍
+
+ // 5. 璁板綍鎿嶄綔鏃ュ織
+ var recording = new Dt_MaintenanceTeam
{
Account = maint.UserAccount,
MaintenanceStatus = 0,
- OperatorName = sysuer.UserTrueName,
- TeamName = sysuer.RoleName,
+ OperatorName = sysuer.UserTrueName, // 鎿嶄綔浜哄鍚�
+ TeamName = sysuer.RoleName, // 鎿嶄綔浜鸿鑹�
DistributionTime = DateTime.Now,
IPAddress = LocalIP,
};
_team.AddData(recording);
- return new WebResponseContent { Status = true,Message="寮哄埗涓嬬嚎鎴愬姛", Data = recording };
+ return new WebResponseContent { Status = true, Message = "寮哄埗涓嬬嚎鎴愬姛" };
}
catch (Exception ex)
{
-
- return new WebResponseContent { Status = false, Message = "澶辫触锛�" + ex };
+ return new WebResponseContent { Status = false, Message = "澶辫触锛�" + ex.Message };
}
}
@@ -550,11 +614,12 @@
var user = BaseDal.QueryData();//妫�淇〃
var maint = user.Where(x => x.UserAccount == account).FirstOrDefault(); //鍦ㄦ淇〃涓厛鎵惧埌璇ョ敤鎴�
var sysuer = _user.QueryData(x => x.UserName == account).FirstOrDefault();//鍦ㄧ敤鎴疯〃涓壘鍒扮敤鎴�
+
if (maint == null || sysuer == null)
{
return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌璇ョ敤鎴�" };
}
- // 鏌ユ壘璇ョ敤鎴峰湪 _team 琛ㄤ腑鐨勬渶鏂颁竴鏉¤褰�
+ // 鏌ユ壘璇ョ敤鎴峰湪 Dt_MaintenanceTeam 琛ㄤ腑鐨勬渶鏂颁竴鏉¤褰�
var lastRecord = _team.QueryData(x => x.Account == account)
.OrderByDescending(x => x.CreateDate)
.FirstOrDefault();
@@ -570,18 +635,25 @@
bool leaderStarted = user.Any(x => x.IsLeader == 1 && x.MaintenanceStatus == 1); //鍚︽湁婊¤冻鏉′欢 鎵惧埌涓�鏉″氨杩斿洖true MaintenanceStatus锛�0娌℃湁寮�濮嬶紝1寮�濮嬶級
if (!leaderStarted)
{
- return new WebResponseContent { Status = false, Message = "璇风瓑寰呯粍闀垮紑濮嬫淇�" };
+ return new WebResponseContent { Status = false, Message = "璇风瓑寰呬竴绾т汉鍛樺紑濮嬫淇�" };
}
-
- }
- if (true)
- {
}
//濡傛灉婊¤冻涓嬮潰鐨勬潯浠跺氨寮�濮�
maint.MaintenancStartTime = DateTime.Now;//璁板綍寮�濮嬫椂闂�
maint.MaintenanceStatus = 1;//鏇存敼鐘舵��
+ maint.IPAddress = LocalIP;//鏇存敼ip鍦板潃
BaseDal.UpdateData(maint);
+ var address = _ipaddress.QueryData(x=>x.IPaddress== LocalIP).FirstOrDefault();
+ var addressIp = "";
+ if (address!=null) //鎵惧埌浜�
+ {
+ addressIp = address.Addressname;
+ }
+ else
+ {
+ addressIp = LocalIP;
+ }
//鎻掑叆璁板綍琛�
var recording = new Dt_MaintenanceTeam //娣诲姞璁板綍
{
@@ -590,7 +662,7 @@
OperatorName = sysuer.UserTrueName,
TeamName = sysuer.RoleName,
DistributionTime = DateTime.Now,
- IPAddress = LocalIP,
+ IPAddress = addressIp,
};
_team.AddData(recording);
@@ -607,7 +679,7 @@
/// </summary>
/// <param name="account"></param>
/// <returns></returns>
- public WebResponseContent StopMaintenanceTask(string account)
+ public WebResponseContent StopMaintenanceTask(string account,string LocalIP)
{
try
{
@@ -651,6 +723,20 @@
}
}
}
+ //if (LocalIP!=maint.IPAddress)
+ //{
+ // return new WebResponseContent { Status = false, Message = "鎿嶄綔璁惧涓嶅悓锛岃鍥炲埌鍘熸湰璁惧鍐嶇偣鍑荤粨鏉熸淇�" };
+ //}
+ var address = _ipaddress.QueryData(x => x.IPaddress == LocalIP).FirstOrDefault();
+ var addressIp = "";
+ if (address != null) //鎵惧埌浜�
+ {
+ addressIp = address.Addressname;
+ }
+ else
+ {
+ addressIp = LocalIP;
+ }
// 鏇存柊褰撳墠鐢ㄦ埛鐨勬淇姸鎬�
maint.MaintenancEendTime = DateTime.Now; // 璁板綍缁撴潫鏃堕棿
@@ -664,6 +750,7 @@
MaintenanceStatus = 0,
OperatorName = sysuer.UserTrueName,
TeamName = sysuer.RoleName,
+ IPAddress = addressIp,
EndTime = DateTime.Now,
};
_team.AddData(recording);
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs
index 54adc25..494b910 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs
@@ -16,6 +16,7 @@
{
public IRepository<Dt_MaintenanceTeam> Repository => BaseDal;
private readonly IRepository<Sys_User> _user;
+
public MaintenanceTeamService(IRepository<Dt_MaintenanceTeam> BaseDal,IRepository<Sys_User> user, IRepository<Dt_Maintenance> mainServer) : base(BaseDal)
@@ -40,8 +41,12 @@
var main = Db.Queryable<Dt_MaintenanceTeam>();
+
+ var query = sys.InnerJoin<Dt_MaintenanceTeam>((a, b) => a.UserTrueName == b.OperatorName)
+ ;
+
+
//妯＄硦鏌ヨ
- var query = sys.InnerJoin<Dt_MaintenanceTeam>((a, b) => a.UserTrueName == b.OperatorName);
if (!string .IsNullOrEmpty(pagination.searchKeyword))
{
@@ -105,11 +110,13 @@
a.User_Id,
a.Dept_Id,//杞ㄩ亾绔�
a.IsLeader,//鏄惁鏄彮闀�
- a.RoleName,
a.Role_Id,
+ a.RoleName,//瑙掕壊鍚嶇О
+ a.Unit,//鍗曚綅
b.IPAddress,//鐢佃剳ip鍦板潃
b.OperatorName,
- b.TeamName,
+ b.TeamName,//鐝粍
+ b.MaintenanceStatus,//妫�淇姸鎬�
b.Creater,
a.HeadImageUrl,
b.DistributionTime,
diff --git "a/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/.vs/FaceSdkX64/v17/DocumentLayout.backup.json" "b/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/.vs/FaceSdkX64/v17/DocumentLayout.backup.json"
index ffe1ae3..697bb33 100644
--- "a/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/.vs/FaceSdkX64/v17/DocumentLayout.backup.json"
+++ "b/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/.vs/FaceSdkX64/v17/DocumentLayout.backup.json"
@@ -1,62 +1,22 @@
{
"Version": 1,
- "WorkspaceRootPath": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\",
+ "WorkspaceRootPath": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\facesdkx64register.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|",
- "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\facesdkx64register.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|"
- },
- {
- "AbsoluteMoniker": "D:0:0:{6D18B477-E291-4014-B992-9266DA280C6B}|FaceSdkX64Service\\FaceSdkX64Service.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64service\\th_faces.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{6D18B477-E291-4014-B992-9266DA280C6B}|FaceSdkX64Service\\FaceSdkX64Service.csproj|solutionrelative:facesdkx64service\\th_faces.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\frmregister.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\facesdkx64\\facesdkx64register\\frmregister.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\frmregister.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{6D18B477-E291-4014-B992-9266DA280C6B}|FaceSdkX64Service\\FaceSdkX64Service.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64service\\httpserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{6D18B477-E291-4014-B992-9266DA280C6B}|FaceSdkX64Service\\FaceSdkX64Service.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\facesdkx64\\facesdkx64service\\httpserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{6D18B477-E291-4014-B992-9266DA280C6B}|FaceSdkX64Service\\FaceSdkX64Service.csproj|solutionrelative:facesdkx64service\\httpserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{6D18B477-E291-4014-B992-9266DA280C6B}|FaceSdkX64Service\\FaceSdkX64Service.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64service\\chs_capture.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{6D18B477-E291-4014-B992-9266DA280C6B}|FaceSdkX64Service\\FaceSdkX64Service.csproj|solutionrelative:facesdkx64service\\chs_capture.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
+ "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\facesdkx64\\facesdkx64register\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
"RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
},
{
- "AbsoluteMoniker": "D:0:0:{A1CAC745-A3C3-42B5-9826-4358006B3CBD}|FaceSdkX64\\FaceSdkX64.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64\\frmfacecheck.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{A1CAC745-A3C3-42B5-9826-4358006B3CBD}|FaceSdkX64\\FaceSdkX64.csproj|solutionrelative:facesdkx64\\frmfacecheck.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|F:\\\u6D4B\u8BD5\\FaceSdkX64\\facesdkx64register\\frmregister.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
- "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\frmregister.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\properties\\resources.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\properties\\resources.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\properties\\resources.resx||{81828910-B8B3-4D2B-99A3-067027C180C1}",
- "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\properties\\resources.resx||{81828910-B8B3-4D2B-99A3-067027C180C1}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\myopaquelayer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\myopaquelayer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\opaquecommand.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\opaquecommand.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{A1CAC745-A3C3-42B5-9826-4358006B3CBD}|FaceSdkX64\\FaceSdkX64.csproj|F:\\\u6D4B\u8BD5\\FaceSdkX64\\facesdkx64\\frmfacecheck.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
- "RelativeMoniker": "D:0:0:{A1CAC745-A3C3-42B5-9826-4358006B3CBD}|FaceSdkX64\\FaceSdkX64.csproj|solutionrelative:facesdkx64\\frmfacecheck.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
- },
- {
- "AbsoluteMoniker": "D:0:0:{A1CAC745-A3C3-42B5-9826-4358006B3CBD}|FaceSdkX64\\FaceSdkX64.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64\\facesdkx64.csproj||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|",
- "RelativeMoniker": "D:0:0:{A1CAC745-A3C3-42B5-9826-4358006B3CBD}|FaceSdkX64\\FaceSdkX64.csproj|solutionrelative:facesdkx64\\facesdkx64.csproj||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|"
+ "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\facesdkx64\\facesdkx64register\\facesdkx64register.csproj||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|",
+ "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\facesdkx64register.csproj||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|"
}
],
"DocumentGroupContainers": [
@@ -66,175 +26,59 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 2,
+ "SelectedChildIndex": 1,
"Children": [
{
- "$type": "Document",
- "DocumentIndex": 1,
- "Title": "TH_Faces.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Service\\TH_Faces.cs",
- "RelativeDocumentMoniker": "FaceSdkX64Service\\TH_Faces.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Service\\TH_Faces.cs",
- "RelativeToolTip": "FaceSdkX64Service\\TH_Faces.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAB8AAABCAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-06-08T03:19:03.556Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
- "Title": "CHS_Capture.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Service\\CHS_Capture.cs",
- "RelativeDocumentMoniker": "FaceSdkX64Service\\CHS_Capture.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Service\\CHS_Capture.cs",
- "RelativeToolTip": "FaceSdkX64Service\\CHS_Capture.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-06-08T03:18:57.128Z"
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
},
{
"$type": "Document",
"DocumentIndex": 0,
- "Title": "FaceSdkX64Register.csproj",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\FaceSdkX64Register.csproj",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\FaceSdkX64Register.csproj",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\FaceSdkX64Register.csproj",
- "RelativeToolTip": "FaceSdkX64Register\\FaceSdkX64Register.csproj",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAApAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|",
- "WhenOpened": "2025-06-06T07:14:47.187Z",
+ "Title": "FrmRegister.cs",
+ "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Register\\FrmRegister.cs",
+ "RelativeDocumentMoniker": "FaceSdkX64Register\\FrmRegister.cs",
+ "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Register\\FrmRegister.cs",
+ "RelativeToolTip": "FaceSdkX64Register\\FrmRegister.cs",
+ "ViewState": "AgIAAAEAAACAYGZmZmYkwBsAAAAAAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-06-11T02:21:45.53Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 1,
"Title": "HttpServer.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Service\\HttpServer.cs",
+ "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Service\\HttpServer.cs",
"RelativeDocumentMoniker": "FaceSdkX64Service\\HttpServer.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Service\\HttpServer.cs",
+ "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Service\\HttpServer.cs",
"RelativeToolTip": "FaceSdkX64Service\\HttpServer.cs",
- "ViewState": "AgIAABwAAAAAAAAAAAAQwCIAAAANAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAADwvwkAAAABAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T07:43:03.48Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 8,
- "Title": "Resources.Designer.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\Properties\\Resources.Designer.cs",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\Properties\\Resources.Designer.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\Properties\\Resources.Designer.cs",
- "RelativeToolTip": "FaceSdkX64Register\\Properties\\Resources.Designer.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAEYAAAAJAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T02:18:20.337Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 9,
- "Title": "Resources.resx",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\Properties\\Resources.resx",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\Properties\\Resources.resx",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\Properties\\Resources.resx",
- "RelativeToolTip": "FaceSdkX64Register\\Properties\\Resources.resx",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001005|",
- "WhenOpened": "2025-05-29T02:16:24.157Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 10,
- "Title": "MyOpaqueLayer.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\MyOpaqueLayer.cs",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\MyOpaqueLayer.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\MyOpaqueLayer.cs",
- "RelativeToolTip": "FaceSdkX64Register\\MyOpaqueLayer.cs",
- "ViewState": "AgIAADsAAAAAAAAAAAAYwE0AAAA0AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T02:12:52.072Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 13,
- "Title": "FaceSdkX64",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64\\FaceSdkX64.csproj",
- "RelativeDocumentMoniker": "FaceSdkX64\\FaceSdkX64.csproj",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64\\FaceSdkX64.csproj",
- "RelativeToolTip": "FaceSdkX64\\FaceSdkX64.csproj",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|",
- "WhenOpened": "2025-05-28T08:39:06.348Z"
+ "WhenOpened": "2025-06-11T02:10:18.119Z"
},
{
"$type": "Document",
"DocumentIndex": 2,
- "Title": "FrmRegister.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\FrmRegister.cs",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\FrmRegister.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\FrmRegister.cs",
- "RelativeToolTip": "FaceSdkX64Register\\FrmRegister.cs",
- "ViewState": "AgIAAAgAAAAAAAAAAAAxwCgAAABCAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-28T07:25:57.103Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
"Title": "App.config",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\App.config",
+ "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Register\\App.config",
"RelativeDocumentMoniker": "FaceSdkX64Register\\App.config",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\App.config",
+ "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Register\\App.config",
"RelativeToolTip": "FaceSdkX64Register\\App.config",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAADwvwMAAAAdAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|",
- "WhenOpened": "2025-06-05T01:57:45.621Z"
+ "WhenOpened": "2025-06-11T02:10:14.173Z"
},
{
"$type": "Document",
- "DocumentIndex": 7,
- "Title": "FrmRegister.cs [\u8BBE\u8BA1]",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\FrmRegister.cs",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\FrmRegister.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\FrmRegister.cs [\u8BBE\u8BA1]",
- "RelativeToolTip": "FaceSdkX64Register\\FrmRegister.cs [\u8BBE\u8BA1]",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-28T08:36:25.753Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 6,
- "Title": "FrmFaceCheck.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64\\FrmFaceCheck.cs",
- "RelativeDocumentMoniker": "FaceSdkX64\\FrmFaceCheck.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64\\FrmFaceCheck.cs",
- "RelativeToolTip": "FaceSdkX64\\FrmFaceCheck.cs",
- "ViewState": "AgIAAAoCAAAAAAAAAAAvwAkCAAAbAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-28T06:42:06.783Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 11,
- "Title": "OpaqueCommand.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\OpaqueCommand.cs",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\OpaqueCommand.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\OpaqueCommand.cs",
- "RelativeToolTip": "FaceSdkX64Register\\OpaqueCommand.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAuwBIAAAAUAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T02:23:19.143Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 12,
- "Title": "FrmFaceCheck.cs [\u8BBE\u8BA1]",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64\\FrmFaceCheck.cs",
- "RelativeDocumentMoniker": "FaceSdkX64\\FrmFaceCheck.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64\\FrmFaceCheck.cs [\u8BBE\u8BA1]",
- "RelativeToolTip": "FaceSdkX64\\FrmFaceCheck.cs [\u8BBE\u8BA1]",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-28T06:42:03.078Z"
+ "DocumentIndex": 3,
+ "Title": "FaceSdkX64Register",
+ "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Register\\FaceSdkX64Register.csproj",
+ "RelativeDocumentMoniker": "FaceSdkX64Register\\FaceSdkX64Register.csproj",
+ "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Register\\FaceSdkX64Register.csproj",
+ "RelativeToolTip": "FaceSdkX64Register\\FaceSdkX64Register.csproj",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|",
+ "WhenOpened": "2025-06-11T02:09:55.342Z"
}
]
}
diff --git "a/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/.vs/FaceSdkX64/v17/DocumentLayout.json" "b/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/.vs/FaceSdkX64/v17/DocumentLayout.json"
index aa55d5c..697bb33 100644
--- "a/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/.vs/FaceSdkX64/v17/DocumentLayout.json"
+++ "b/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/.vs/FaceSdkX64/v17/DocumentLayout.json"
@@ -1,66 +1,22 @@
{
"Version": 1,
- "WorkspaceRootPath": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\",
+ "WorkspaceRootPath": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\facesdkx64register.csproj||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|",
- "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\facesdkx64register.csproj||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\facesdkx64register.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|",
- "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\facesdkx64register.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|"
- },
- {
- "AbsoluteMoniker": "D:0:0:{6D18B477-E291-4014-B992-9266DA280C6B}|FaceSdkX64Service\\FaceSdkX64Service.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64service\\th_faces.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{6D18B477-E291-4014-B992-9266DA280C6B}|FaceSdkX64Service\\FaceSdkX64Service.csproj|solutionrelative:facesdkx64service\\th_faces.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\frmregister.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\facesdkx64\\facesdkx64register\\frmregister.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\frmregister.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{6D18B477-E291-4014-B992-9266DA280C6B}|FaceSdkX64Service\\FaceSdkX64Service.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64service\\httpserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{6D18B477-E291-4014-B992-9266DA280C6B}|FaceSdkX64Service\\FaceSdkX64Service.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\facesdkx64\\facesdkx64service\\httpserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{6D18B477-E291-4014-B992-9266DA280C6B}|FaceSdkX64Service\\FaceSdkX64Service.csproj|solutionrelative:facesdkx64service\\httpserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{6D18B477-E291-4014-B992-9266DA280C6B}|FaceSdkX64Service\\FaceSdkX64Service.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64service\\chs_capture.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{6D18B477-E291-4014-B992-9266DA280C6B}|FaceSdkX64Service\\FaceSdkX64Service.csproj|solutionrelative:facesdkx64service\\chs_capture.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
+ "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\facesdkx64\\facesdkx64register\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
"RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
},
{
- "AbsoluteMoniker": "D:0:0:{A1CAC745-A3C3-42B5-9826-4358006B3CBD}|FaceSdkX64\\FaceSdkX64.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64\\frmfacecheck.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{A1CAC745-A3C3-42B5-9826-4358006B3CBD}|FaceSdkX64\\FaceSdkX64.csproj|solutionrelative:facesdkx64\\frmfacecheck.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|F:\\\u6D4B\u8BD5\\FaceSdkX64\\facesdkx64register\\frmregister.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
- "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\frmregister.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\properties\\resources.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\properties\\resources.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\properties\\resources.resx||{81828910-B8B3-4D2B-99A3-067027C180C1}",
- "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\properties\\resources.resx||{81828910-B8B3-4D2B-99A3-067027C180C1}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\myopaquelayer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\myopaquelayer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64register\\opaquecommand.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\opaquecommand.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{A1CAC745-A3C3-42B5-9826-4358006B3CBD}|FaceSdkX64\\FaceSdkX64.csproj|F:\\\u6D4B\u8BD5\\FaceSdkX64\\facesdkx64\\frmfacecheck.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
- "RelativeMoniker": "D:0:0:{A1CAC745-A3C3-42B5-9826-4358006B3CBD}|FaceSdkX64\\FaceSdkX64.csproj|solutionrelative:facesdkx64\\frmfacecheck.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
- },
- {
- "AbsoluteMoniker": "D:0:0:{A1CAC745-A3C3-42B5-9826-4358006B3CBD}|FaceSdkX64\\FaceSdkX64.csproj|f:\\\u6D4B\u8BD5\\facesdkx64\\facesdkx64\\facesdkx64.csproj||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|",
- "RelativeMoniker": "D:0:0:{A1CAC745-A3C3-42B5-9826-4358006B3CBD}|FaceSdkX64\\FaceSdkX64.csproj|solutionrelative:facesdkx64\\facesdkx64.csproj||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|"
+ "AbsoluteMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|e:\\ssg\\shensuogankongzhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\facesdkx64\\facesdkx64register\\facesdkx64register.csproj||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|",
+ "RelativeMoniker": "D:0:0:{EB4DDD28-77FA-427F-A757-8C7C98A6665F}|FaceSdkX64Register\\FaceSdkX64Register.csproj|solutionrelative:facesdkx64register\\facesdkx64register.csproj||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|"
}
],
"DocumentGroupContainers": [
@@ -70,187 +26,59 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 0,
+ "SelectedChildIndex": 1,
"Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+ },
{
"$type": "Document",
"DocumentIndex": 0,
- "Title": "FaceSdkX64Register",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\FaceSdkX64Register.csproj",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\FaceSdkX64Register.csproj",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\FaceSdkX64Register.csproj",
- "RelativeToolTip": "FaceSdkX64Register\\FaceSdkX64Register.csproj",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|",
- "WhenOpened": "2025-06-09T06:11:55.423Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 2,
- "Title": "TH_Faces.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Service\\TH_Faces.cs",
- "RelativeDocumentMoniker": "FaceSdkX64Service\\TH_Faces.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Service\\TH_Faces.cs",
- "RelativeToolTip": "FaceSdkX64Service\\TH_Faces.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAB8AAABCAAAAAAAAAA==",
+ "Title": "FrmRegister.cs",
+ "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Register\\FrmRegister.cs",
+ "RelativeDocumentMoniker": "FaceSdkX64Register\\FrmRegister.cs",
+ "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Register\\FrmRegister.cs",
+ "RelativeToolTip": "FaceSdkX64Register\\FrmRegister.cs",
+ "ViewState": "AgIAAAEAAACAYGZmZmYkwBsAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-06-08T03:19:03.556Z",
+ "WhenOpened": "2025-06-11T02:21:45.53Z",
"EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
- "Title": "CHS_Capture.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Service\\CHS_Capture.cs",
- "RelativeDocumentMoniker": "FaceSdkX64Service\\CHS_Capture.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Service\\CHS_Capture.cs",
- "RelativeToolTip": "FaceSdkX64Service\\CHS_Capture.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-06-08T03:18:57.128Z"
},
{
"$type": "Document",
"DocumentIndex": 1,
- "Title": "FaceSdkX64Register.csproj",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\FaceSdkX64Register.csproj",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\FaceSdkX64Register.csproj",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\FaceSdkX64Register.csproj*",
- "RelativeToolTip": "FaceSdkX64Register\\FaceSdkX64Register.csproj*",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAApAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|",
- "WhenOpened": "2025-06-06T07:14:47.187Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
"Title": "HttpServer.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Service\\HttpServer.cs",
+ "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Service\\HttpServer.cs",
"RelativeDocumentMoniker": "FaceSdkX64Service\\HttpServer.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Service\\HttpServer.cs",
+ "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Service\\HttpServer.cs",
"RelativeToolTip": "FaceSdkX64Service\\HttpServer.cs",
- "ViewState": "AgIAABwAAAAAAAAAAAAQwCIAAAANAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAADwvwkAAAABAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T07:43:03.48Z"
+ "WhenOpened": "2025-06-11T02:10:18.119Z"
},
{
"$type": "Document",
- "DocumentIndex": 9,
- "Title": "Resources.Designer.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\Properties\\Resources.Designer.cs",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\Properties\\Resources.Designer.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\Properties\\Resources.Designer.cs",
- "RelativeToolTip": "FaceSdkX64Register\\Properties\\Resources.Designer.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAEYAAAAJAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T02:18:20.337Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 10,
- "Title": "Resources.resx",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\Properties\\Resources.resx",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\Properties\\Resources.resx",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\Properties\\Resources.resx",
- "RelativeToolTip": "FaceSdkX64Register\\Properties\\Resources.resx",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001005|",
- "WhenOpened": "2025-05-29T02:16:24.157Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 11,
- "Title": "MyOpaqueLayer.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\MyOpaqueLayer.cs",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\MyOpaqueLayer.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\MyOpaqueLayer.cs",
- "RelativeToolTip": "FaceSdkX64Register\\MyOpaqueLayer.cs",
- "ViewState": "AgIAADsAAAAAAAAAAAAYwE0AAAA0AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T02:12:52.072Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 14,
- "Title": "FaceSdkX64",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64\\FaceSdkX64.csproj",
- "RelativeDocumentMoniker": "FaceSdkX64\\FaceSdkX64.csproj",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64\\FaceSdkX64.csproj",
- "RelativeToolTip": "FaceSdkX64\\FaceSdkX64.csproj",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|",
- "WhenOpened": "2025-05-28T08:39:06.348Z"
+ "DocumentIndex": 2,
+ "Title": "App.config",
+ "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Register\\App.config",
+ "RelativeDocumentMoniker": "FaceSdkX64Register\\App.config",
+ "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Register\\App.config",
+ "RelativeToolTip": "FaceSdkX64Register\\App.config",
+ "ViewState": "AgIAAAAAAAAAAAAAAADwvwMAAAAdAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|",
+ "WhenOpened": "2025-06-11T02:10:14.173Z"
},
{
"$type": "Document",
"DocumentIndex": 3,
- "Title": "FrmRegister.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\FrmRegister.cs",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\FrmRegister.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\FrmRegister.cs",
- "RelativeToolTip": "FaceSdkX64Register\\FrmRegister.cs",
- "ViewState": "AgIAAAgAAAAAAAAAAAAxwCgAAABCAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-28T07:25:57.103Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 6,
- "Title": "App.config",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\App.config",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\App.config",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\App.config",
- "RelativeToolTip": "FaceSdkX64Register\\App.config",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|",
- "WhenOpened": "2025-06-05T01:57:45.621Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 8,
- "Title": "FrmRegister.cs [\u8BBE\u8BA1]",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\FrmRegister.cs",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\FrmRegister.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\FrmRegister.cs [\u8BBE\u8BA1]",
- "RelativeToolTip": "FaceSdkX64Register\\FrmRegister.cs [\u8BBE\u8BA1]",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-28T08:36:25.753Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 7,
- "Title": "FrmFaceCheck.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64\\FrmFaceCheck.cs",
- "RelativeDocumentMoniker": "FaceSdkX64\\FrmFaceCheck.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64\\FrmFaceCheck.cs",
- "RelativeToolTip": "FaceSdkX64\\FrmFaceCheck.cs",
- "ViewState": "AgIAAAoCAAAAAAAAAAAvwAkCAAAbAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-28T06:42:06.783Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 12,
- "Title": "OpaqueCommand.cs",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\OpaqueCommand.cs",
- "RelativeDocumentMoniker": "FaceSdkX64Register\\OpaqueCommand.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64Register\\OpaqueCommand.cs",
- "RelativeToolTip": "FaceSdkX64Register\\OpaqueCommand.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAuwBIAAAAUAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T02:23:19.143Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 13,
- "Title": "FrmFaceCheck.cs [\u8BBE\u8BA1]",
- "DocumentMoniker": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64\\FrmFaceCheck.cs",
- "RelativeDocumentMoniker": "FaceSdkX64\\FrmFaceCheck.cs",
- "ToolTip": "F:\\\u6D4B\u8BD5\\FaceSdkX64\\FaceSdkX64\\FrmFaceCheck.cs [\u8BBE\u8BA1]",
- "RelativeToolTip": "FaceSdkX64\\FrmFaceCheck.cs [\u8BBE\u8BA1]",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-28T06:42:03.078Z"
+ "Title": "FaceSdkX64Register",
+ "DocumentMoniker": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Register\\FaceSdkX64Register.csproj",
+ "RelativeDocumentMoniker": "FaceSdkX64Register\\FaceSdkX64Register.csproj",
+ "ToolTip": "E:\\ssg\\ShenSuoGanKongZhi\\project\\\u4EBA\u8138\u8BC6\u522B\u63D2\u4EF6\\FaceSdkX64\\FaceSdkX64Register\\FaceSdkX64Register.csproj",
+ "RelativeToolTip": "FaceSdkX64Register\\FaceSdkX64Register.csproj",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|",
+ "WhenOpened": "2025-06-11T02:09:55.342Z"
}
]
}
diff --git "a/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/FaceSdkX64.sln" "b/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/FaceSdkX64.sln"
index 3e22f9b..94bf334 100644
--- "a/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/FaceSdkX64.sln"
+++ "b/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/FaceSdkX64.sln"
@@ -3,13 +3,9 @@
# Visual Studio Version 17
VisualStudioVersion = 17.14.36109.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FaceSdkX64", "FaceSdkX64\FaceSdkX64.csproj", "{A1CAC745-A3C3-42B5-9826-4358006B3CBD}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FaceSdkX64Register", "FaceSdkX64Register\FaceSdkX64Register.csproj", "{EB4DDD28-77FA-427F-A757-8C7C98A6665F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FaceSdkX64Service", "FaceSdkX64Service\FaceSdkX64Service.csproj", "{6D18B477-E291-4014-B992-9266DA280C6B}"
-EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "FacePlugin", "FacePlugin\FacePlugin.vdproj", "{967F0B76-B20B-D70C-BDE0-80E287558C7D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,18 +17,6 @@
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A1CAC745-A3C3-42B5-9826-4358006B3CBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A1CAC745-A3C3-42B5-9826-4358006B3CBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A1CAC745-A3C3-42B5-9826-4358006B3CBD}.Debug|x64.ActiveCfg = Debug|Any CPU
- {A1CAC745-A3C3-42B5-9826-4358006B3CBD}.Debug|x64.Build.0 = Debug|Any CPU
- {A1CAC745-A3C3-42B5-9826-4358006B3CBD}.Debug|x86.ActiveCfg = Debug|Any CPU
- {A1CAC745-A3C3-42B5-9826-4358006B3CBD}.Debug|x86.Build.0 = Debug|Any CPU
- {A1CAC745-A3C3-42B5-9826-4358006B3CBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A1CAC745-A3C3-42B5-9826-4358006B3CBD}.Release|Any CPU.Build.0 = Release|Any CPU
- {A1CAC745-A3C3-42B5-9826-4358006B3CBD}.Release|x64.ActiveCfg = Release|Any CPU
- {A1CAC745-A3C3-42B5-9826-4358006B3CBD}.Release|x64.Build.0 = Release|Any CPU
- {A1CAC745-A3C3-42B5-9826-4358006B3CBD}.Release|x86.ActiveCfg = Release|Any CPU
- {A1CAC745-A3C3-42B5-9826-4358006B3CBD}.Release|x86.Build.0 = Release|Any CPU
{EB4DDD28-77FA-427F-A757-8C7C98A6665F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB4DDD28-77FA-427F-A757-8C7C98A6665F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB4DDD28-77FA-427F-A757-8C7C98A6665F}.Debug|x64.ActiveCfg = Debug|x64
@@ -57,16 +41,6 @@
{6D18B477-E291-4014-B992-9266DA280C6B}.Release|x64.Build.0 = Release|Any CPU
{6D18B477-E291-4014-B992-9266DA280C6B}.Release|x86.ActiveCfg = Release|Any CPU
{6D18B477-E291-4014-B992-9266DA280C6B}.Release|x86.Build.0 = Release|Any CPU
- {967F0B76-B20B-D70C-BDE0-80E287558C7D}.Debug|Any CPU.ActiveCfg = Debug
- {967F0B76-B20B-D70C-BDE0-80E287558C7D}.Debug|x64.ActiveCfg = Debug
- {967F0B76-B20B-D70C-BDE0-80E287558C7D}.Debug|x64.Build.0 = Debug
- {967F0B76-B20B-D70C-BDE0-80E287558C7D}.Debug|x86.ActiveCfg = Debug
- {967F0B76-B20B-D70C-BDE0-80E287558C7D}.Debug|x86.Build.0 = Debug
- {967F0B76-B20B-D70C-BDE0-80E287558C7D}.Release|Any CPU.ActiveCfg = Release
- {967F0B76-B20B-D70C-BDE0-80E287558C7D}.Release|x64.ActiveCfg = Release
- {967F0B76-B20B-D70C-BDE0-80E287558C7D}.Release|x64.Build.0 = Release
- {967F0B76-B20B-D70C-BDE0-80E287558C7D}.Release|x86.ActiveCfg = Release
- {967F0B76-B20B-D70C-BDE0-80E287558C7D}.Release|x86.Build.0 = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git "a/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/FaceSdkX64Register/FrmRegister.cs" "b/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/FaceSdkX64Register/FrmRegister.cs"
index a9904bb..eac862a 100644
--- "a/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/FaceSdkX64Register/FrmRegister.cs"
+++ "b/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/FaceSdkX64Register/FrmRegister.cs"
@@ -39,6 +39,8 @@
InitializeComponent();
oc = new OpaqueCommand();
CheckForIllegalCrossThreadCalls = false; // 允许跨线程调用控件、
+
+ //MessageBox.Show(Environment.CurrentDirectory);
}
private void FrmRegister_Load(object sender, EventArgs e)
@@ -328,8 +330,10 @@
string strTimeFlag = System.DateTime.Now.ToString("yyyyMMddHHmmss");
string strFolder = Environment.CurrentDirectory + "\\Record";
- if (System.IO.Directory.Exists(strFolder) == false)
+ if (!System.IO.Directory.Exists(strFolder))
System.IO.Directory.CreateDirectory(strFolder);
+ if(!System.IO.Directory.Exists(AppDomain.CurrentDomain.BaseDirectory + "\\Record"))
+ System.IO.Directory.CreateDirectory(AppDomain.CurrentDomain.BaseDirectory + "\\Record");
string strFileName = strFolder + "\\" + strTimeFlag + "_" + nLiveFace.ToString() + "_1.jpg";
if (nNum1 > 0)
diff --git "a/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/UpgradeLog.htm" "b/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/UpgradeLog.htm"
new file mode 100644
index 0000000..ceea3ea
--- /dev/null
+++ "b/project/\344\272\272\350\204\270\350\257\206\345\210\253\346\217\222\344\273\266/FaceSdkX64/UpgradeLog.htm"
@@ -0,0 +1,276 @@
+锘�<!DOCTYPE html>
+<!-- saved from url=(0014)about:internet -->
+ <html xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><meta content="en-us" http-equiv="Content-Language" /><meta content="text/html; charset=utf-16" http-equiv="Content-Type" /><title _locID="ConversionReport0">
+ 杩佺Щ鎶ュ憡
+ </title><style>
+ /* Body style, for the entire document */
+ body
+ {
+ background: #F3F3F4;
+ color: #1E1E1F;
+ font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
+ padding: 0;
+ margin: 0;
+ }
+
+ /* Header1 style, used for the main title */
+ h1
+ {
+ padding: 10px 0px 10px 10px;
+ font-size: 21pt;
+ background-color: #E2E2E2;
+ border-bottom: 1px #C1C1C2 solid;
+ color: #201F20;
+ margin: 0;
+ font-weight: normal;
+ }
+
+ /* Header2 style, used for "Overview" and other sections */
+ h2
+ {
+ font-size: 18pt;
+ font-weight: normal;
+ padding: 15px 0 5px 0;
+ margin: 0;
+ }
+
+ /* Header3 style, used for sub-sections, such as project name */
+ h3
+ {
+ font-weight: normal;
+ font-size: 15pt;
+ margin: 0;
+ padding: 15px 0 5px 0;
+ background-color: transparent;
+ }
+
+ /* Color all hyperlinks one color */
+ a
+ {
+ color: #1382CE;
+ }
+
+ /* Table styles */
+ table
+ {
+ border-spacing: 0 0;
+ border-collapse: collapse;
+ font-size: 10pt;
+ }
+
+ table th
+ {
+ background: #E7E7E8;
+ text-align: left;
+ text-decoration: none;
+ font-weight: normal;
+ padding: 3px 6px 3px 6px;
+ }
+
+ table td
+ {
+ vertical-align: top;
+ padding: 3px 6px 5px 5px;
+ margin: 0px;
+ border: 1px solid #E7E7E8;
+ background: #F7F7F8;
+ }
+
+ /* Local link is a style for hyperlinks that link to file:/// content, there are lots so color them as 'normal' text until the user mouse overs */
+ .localLink
+ {
+ color: #1E1E1F;
+ background: #EEEEED;
+ text-decoration: none;
+ }
+
+ .localLink:hover
+ {
+ color: #1382CE;
+ background: #FFFF99;
+ text-decoration: none;
+ }
+
+ /* Center text, used in the over views cells that contain message level counts */
+ .textCentered
+ {
+ text-align: center;
+ }
+
+ /* The message cells in message tables should take up all avaliable space */
+ .messageCell
+ {
+ width: 100%;
+ }
+
+ /* Padding around the content after the h1 */
+ #content
+ {
+ padding: 0px 12px 12px 12px;
+ }
+
+ /* The overview table expands to width, with a max width of 97% */
+ #overview table
+ {
+ width: auto;
+ max-width: 75%;
+ }
+
+ /* The messages tables are always 97% width */
+ #messages table
+ {
+ width: 97%;
+ }
+
+ /* All Icons */
+ .IconSuccessEncoded, .IconInfoEncoded, .IconWarningEncoded, .IconErrorEncoded
+ {
+ min-width:18px;
+ min-height:18px;
+ background-repeat:no-repeat;
+ background-position:center;
+ }
+
+ /* Success icon encoded */
+ .IconSuccessEncoded
+ {
+ /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+ /* [---XsltValidateInternal-Base64EncodedImage:IconSuccess#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+ background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABcElEQVR4Xq2TsUsCURzHv15g8ZJcBWlyiYYgCIWcb9DFRRwMW5TA2c0/QEFwFkxxUQdxVlBwCYWOi6IhWgQhBLHJUCkhLr/BW8S7gvrAg+N+v8/v+x68Z8MGy+XSCyABQAXgBgHGALoASkIIDWSLeLBetdHryMjd5IxQPWT4rn1c/P7+xxp72Cs9m5SZ0Bq2vPnbPFafK2zDvmNHypdC0BPkLlQhxJsCAhQoZwdZU5mwxh720qGo8MzTxTTKZDPCx2HoVzp6lz0Q9tKhyx0kGs8Ny+TkWRKk8lCROwEduhyg9l/6lunOPSfmH3NUH6uQ0KHLAe7JYvJjevm+DAMGJHToKtigE+vwvIidxLamb8IBY9e+C5LiXREkfho3TSd06HJA13/oh6T51MTsfQbHrsMynQ5dDihFjiK8JJAU9AKIWTp76dCVN7HWHrajmUEGvyF9nkbAE6gLIS7kTUyuf2gscLoJrElZo/Mvj+nPz/kLTmfnEwP3tB0AAAAASUVORK5CYII=);
+ }
+
+ /* Information icon encoded */
+ .IconInfoEncoded
+ {
+ /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+ /* [---XsltValidateInternal-Base64EncodedImage:IconInformation#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+ background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR4Xs2TsUoDQRRF7wwoziokjZUKadInhdhukR9YP8DMX1hYW+QvdsXa/QHBbcXC7W0CamWTQnclFutceIQJwwaWNLlwm5k5d94M76mmaeCrrmsLYOocY12FcxZFUeozCqKqqgYA8uevv1H6VuPxcwlfk5N92KHBxfFeCSAxxswlYAW/Xr989x/mv9gkhtyMDhcAxgzRsp7flj8B/HF1RsMXq+NZMkopaHe7lbKxQUEIGbKsYNoGn969060hZBkQex/W8oRQwsQaW2o3Ago2SVcJUzAgY3N0lTCZZm+zPS8HB51gMmS1DEYyOz9acKO1D8JWTlafKIMxdhvlfdyT94Vv5h7P8Ky7nQzACmhvKq3zk3PjW9asz9D/1oigecsioooAAAAASUVORK5CYII=);
+ }
+
+ /* Warning icon encoded */
+ .IconWarningEncoded
+ {
+ /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+ /* [---XsltValidateInternal-Base64EncodedImage:IconWarning#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+ background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAx0lEQVR4XpWSMQ7CMAxFf4xAyBMLCxMrO8dhaBcuwdCJS3RJBw7SA/QGTCxdWJgiQYWKXJWKIXHIlyw5lqr34tQgEOdcBsCOx5yZK3hCCKdYXneQkh4pEfqzLfu+wVDSyyzFoJjfz9NB+pAF+eizx2Vruts0k15mPgvS6GYvpVtQhB61IB/dk6AF6fS4Ben0uIX5odtFe8Q/eW1KvFeH4e8khT6+gm5B+t3juyDt7n0jpe+CANTd+oTUjN/U3yVaABnSUjFz/gFq44JaVSCXeQAAAABJRU5ErkJggg==);
+ }
+
+ /* Error icon encoded */
+ .IconErrorEncoded
+ {
+ /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+ /* [---XsltValidateInternal-Base64EncodedImage:IconError#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+ background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABQElEQVR4XqWTvUoEQRCE6wYPZUA80AfwAQz23uCMjA7MDRQEIzPBVEyNTQUFIw00vcQTTMzuAh/AxEQQT8HF/3G/oGGnEUGuoNnd6qoZuqltyKEsyzVJq5I6rnUp6SjGeGhESikzzlc1eL7opfuVbrqbU1Zw9NCgtQMaZpY0eNnaaL2fHusvTK5vKu7sjSS1Y4y3QUA6K3e3Mau5UFDyMP7tYF9o8cAHZv68vipoIJg971PZIZ5HiwdvYGGvFVFHmGmZ2MxwmQYPXubPl9Up0tfoMQGetXd6mRbvhBw+boZ6WF7Mbv1+GsHRk0fQmPAH1GfmZirbCfDJ61tw3Px8/8pZsPAG4jlVhcPgZ7adwNWBB68lkRQWFiTgFlbnLY3DGGM7izIJIyT/jjIvEJw6fdJTc6krDzh6aMwMP9bvDH4ADSsa9uSWVJkAAAAASUVORK5CYII=);
+ }
+ </style><script type="text/javascript" language="javascript">
+
+ // Startup
+ // Hook up the the loaded event for the document/window, to linkify the document content
+ var startupFunction = function() { linkifyElement("messages"); };
+
+ if(window.attachEvent)
+ {
+ window.attachEvent('onload', startupFunction);
+ }
+ else if (window.addEventListener)
+ {
+ window.addEventListener('load', startupFunction, false);
+ }
+ else
+ {
+ document.addEventListener('load', startupFunction, false);
+ }
+
+ // Toggles the visibility of table rows with the specified name
+ function toggleTableRowsByName(name)
+ {
+ var allRows = document.getElementsByTagName('tr');
+ for (i=0; i < allRows.length; i++)
+ {
+ var currentName = allRows[i].getAttribute('name');
+ if(!!currentName && currentName.indexOf(name) == 0)
+ {
+ var isVisible = allRows[i].style.display == '';
+ isVisible ? allRows[i].style.display = 'none' : allRows[i].style.display = '';
+ }
+ }
+ }
+
+ function scrollToFirstVisibleRow(name)
+ {
+ var allRows = document.getElementsByTagName('tr');
+ for (i=0; i < allRows.length; i++)
+ {
+ var currentName = allRows[i].getAttribute('name');
+ var isVisible = allRows[i].style.display == '';
+ if(!!currentName && currentName.indexOf(name) == 0 && isVisible)
+ {
+ allRows[i].scrollIntoView(true);
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ // Linkifies the specified text content, replaces candidate links with html links
+ function linkify(text)
+ {
+ if(!text || 0 === text.length)
+ {
+ return text;
+ }
+
+ // Find http, https and ftp links and replace them with hyper links
+ var urlLink = /(http|https|ftp)\:\/\/[a-zA-Z0-9\-\.]+(:[a-zA-Z0-9]*)?\/?([a-zA-Z0-9\-\._\?\,\/\\\+&%\$#\=~;\{\}])*/gi;
+
+ return text.replace(urlLink, '<a href="$&">$&</a>') ;
+ }
+
+ // Linkifies the specified element by ID
+ function linkifyElement(id)
+ {
+ var element = document.getElementById(id);
+ if(!!element)
+ {
+ element.innerHTML = linkify(element.innerHTML);
+ }
+ }
+
+ function ToggleMessageVisibility(projectName)
+ {
+ if(!projectName || 0 === projectName.length)
+ {
+ return;
+ }
+
+ toggleTableRowsByName("MessageRowClass" + projectName);
+ toggleTableRowsByName('MessageRowHeaderShow' + projectName);
+ toggleTableRowsByName('MessageRowHeaderHide' + projectName);
+ }
+
+ function ScrollToFirstVisibleMessage(projectName)
+ {
+ if(!projectName || 0 === projectName.length)
+ {
+ return;
+ }
+
+ // First try the 'Show messages' row
+ if(!scrollToFirstVisibleRow('MessageRowHeaderShow' + projectName))
+ {
+ // Failed to find a visible row for 'Show messages', try an actual message row
+ scrollToFirstVisibleRow('MessageRowClass' + projectName);
+ }
+ }
+ </script></head><body><h1 _locID="ConversionReport">
+ 杩佺Щ鎶ュ憡 - </h1><div id="content"><h2 _locID="OverviewTitle">姒傝堪</h2><div id="overview"><table><tr><th></th><th _locID="ProjectTableHeader">椤圭洰</th><th _locID="PathTableHeader">璺緞</th><th _locID="ErrorsTableHeader">閿欒</th><th _locID="WarningsTableHeader">璀﹀憡</th><th _locID="MessagesTableHeader">娑堟伅</th></tr><tr><td class="IconErrorEncoded" /><td><strong><a href="#FacePlugin">FacePlugin</a></strong></td><td>FacePlugin\FacePlugin.vdproj</td><td class="textCentered"><a href="#FacePluginError">1</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#FaceSdkX64">FaceSdkX64</a></strong></td><td>FaceSdkX64\FaceSdkX64.csproj</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#FaceSdkX64Register">FaceSdkX64Register</a></strong></td><td>FaceSdkX64Register\FaceSdkX64Register.csproj</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#FaceSdkX64Service">FaceSdkX64Service</a></strong></td><td>FaceSdkX64Service\FaceSdkX64Service.csproj</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#Solution"><span _locID="OverviewSolutionSpan">瑙ｅ喅鏂规</span></a></strong></td><td>FaceSdkX64.sln</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#" onclick="ScrollToFirstVisibleMessage('Solution'); return false;">1</a></td></tr></table></div><h2 _locID="SolutionAndProjectsTitle">瑙ｅ喅鏂规鍜岄」鐩�</h2><div id="messages"><a name="FacePlugin" /><h3>FacePlugin</h3><table><tr id="FacePluginHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">娑堟伅</th></tr><tr name="ErrorRowClassFacePlugin"><td class="IconErrorEncoded"><a name="FacePluginError" /></td><td class="messageCell"><strong>FacePlugin\FacePlugin.vdproj:
+ </strong><span>鎵句笉鍒版椤圭洰绫诲瀷鎵�鍩轰簬鐨勫簲鐢ㄧ▼搴忋�傛湁鍏虫洿澶氫俊鎭紝璇峰皾璇曟閾炬帴: 54435603-dbb4-11d2-8724-00a0c9a8b90c</span></td></tr></table><a name="FaceSdkX64" /><h3>FaceSdkX64</h3><table><tr id="FaceSdkX64HeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">娑堟伅</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">FaceSdkX64 鏈褰曚换浣曟秷鎭��
+ </td></tr></table><a name="FaceSdkX64Register" /><h3>FaceSdkX64Register</h3><table><tr id="FaceSdkX64RegisterHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">娑堟伅</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">FaceSdkX64Register 鏈褰曚换浣曟秷鎭��
+ </td></tr></table><a name="FaceSdkX64Service" /><h3>FaceSdkX64Service</h3><table><tr id="FaceSdkX64ServiceHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">娑堟伅</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">FaceSdkX64Service 鏈褰曚换浣曟秷鎭��
+ </td></tr></table><a name="Solution" /><h3 _locID="ProjectDisplayNameHeader">瑙ｅ喅鏂规</h3><table><tr id="SolutionHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">娑堟伅</th></tr><tr name="MessageRowHeaderShowSolution"><td class="IconInfoEncoded" /><td class="messageCell"><a _locID="ShowAdditionalMessages" href="#" name="SolutionMessage" onclick="ToggleMessageVisibility('Solution'); return false;">
+ 鏄剧ず 1 鍏朵粬娑堟伅
+ </a></td></tr><tr name="MessageRowClassSolution" style="display: none"><td class="IconInfoEncoded"><a name="SolutionMessage" /></td><td class="messageCell"><strong>FaceSdkX64.sln:
+ </strong><span>瑙ｅ喅鏂规鏂囦欢涓嶉渶瑕佽縼绉汇��</span></td></tr><tr style="display: none" name="MessageRowHeaderHideSolution"><td class="IconInfoEncoded" /><td class="messageCell"><a _locID="HideAdditionalMessages" href="#" name="SolutionMessage" onclick="ToggleMessageVisibility('Solution'); return false;">
+ 闅愯棌 1 鍏朵粬娑堟伅
+ </a></td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IIPaddressServer .cs" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IIPaddressServer .cs"
new file mode 100644
index 0000000..4ab61c3
--- /dev/null
+++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IIPaddressServer .cs"
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseRepository;
+using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_DTO.Telescopic;
+using WIDESEAWCS_Model.Models;
+
+namespace WIDESEAWCS_ITaskInfoService
+{
+ public interface IIPaddressServer : IService<Dt_CustomIPaddress>
+ {
+ IRepository<Dt_CustomIPaddress> Repository { get; }
+
+ }
+}
diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_CustomIPaddress.cs" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_CustomIPaddress.cs"
new file mode 100644
index 0000000..25334f8
--- /dev/null
+++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_CustomIPaddress.cs"
@@ -0,0 +1,26 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_Core.DB.Models;
+using WIDESEAWCS_Core.Tenants;
+
+namespace WIDESEAWCS_Model.Models
+{
+ [SugarTable("Dt_CustomIPaddress", "鑷畾涔塱p鍦板潃"), MultiTenant]
+ public class Dt_CustomIPaddress:BaseEntity
+ {
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int ID { get; set; }
+
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "IP鍦板潃")]
+ public string IPaddress { get; set; }
+
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鑷畾涔塱p鍦板潃鐨勪腑鏂囧悕瀛�")]
+ public string Addressname { get; set; }
+
+
+ }
+}
diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs"
index a0bc3c7..1b274bd 100644
--- "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs"
+++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs"
@@ -49,11 +49,17 @@
+ /// <summary>
+ /// ip鍦板潃
+ /// </summary>
+ [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "ip鍦板潃")]
+ public string IPAddress { get; set; }
- /// <summary>
- /// 妫�淇姸鎬�
- /// </summary>
- [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "妫�淇姸鎬�")]
+
+ /// <summary>
+ /// 妫�淇姸鎬�
+ /// </summary>
+ [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "妫�淇姸鎬�")]
public int MaintenanceStatus{ get; set; }
/// <summary>
diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/IPaddressController .cs" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/IPaddressController .cs"
new file mode 100644
index 0000000..772f718
--- /dev/null
+++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/IPaddressController .cs"
@@ -0,0 +1,29 @@
+锘縰sing Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseController;
+using WIDESEAWCS_DTO.TaskInfo;
+using WIDESEAWCS_DTO.Telescopic;
+using WIDESEAWCS_ITaskInfoService;
+using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_TaskInfoService;
+using WIDESEAWCS_TelescopicService;
+
+
+namespace WIDESEAWCS_Server.Controllers.SerialPort
+{
+ [Route("api/[controller]")]
+ [ApiController]
+ public class IPaddressController : ApiBaseController<IPaddressServer, Dt_CustomIPaddress>
+ {
+ public IPaddressController(IPaddressServer service) : base(service)
+ {
+
+ }
+
+
+
+ }
+}
diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj"
index 41ef8a0..4a8ebcc 100644
--- "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj"
+++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj"
@@ -6,6 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<GenerateDocumentationFile>False</GenerateDocumentationFile>
<Platforms>AnyCPU;x64</Platforms>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
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 2fa196a..11f6c79 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"
@@ -224,6 +224,7 @@
img = user.HeadImageUrl,
ID = user.UserId,
RoleId = user.RoleId,
+ IsLeader= disbled.IsLeader,
});
}
diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/IPaddressServer.cs" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/IPaddressServer.cs"
new file mode 100644
index 0000000..7d1e507
--- /dev/null
+++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/IPaddressServer.cs"
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseRepository;
+using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_ITaskInfoService;
+using WIDESEAWCS_Model.Models;
+
+namespace WIDESEAWCS_TelescopicService
+{
+ public class IPaddressServer : ServiceBase<Dt_CustomIPaddress, IRepository<Dt_CustomIPaddress>>, IIPaddressServer
+ {
+ public IRepository<Dt_CustomIPaddress> Repository => BaseDal;
+ public IPaddressServer(IRepository<Dt_CustomIPaddress> BaseDal) : base(BaseDal)
+ {
+
+ }
+
+
+ }
+}
diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs"
index 955cb86..32f5b24 100644
--- "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs"
+++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs"
@@ -216,18 +216,15 @@
{
try
{
- if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid))
- {
- return new WebResponseContent { Status = false, Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" };
- }
- var devices = GetDevicesByDeptId(deid);
+
+ var devices = GetDevicesByDeptId(DeptId);
//淇╀釜plc宸﹀彸鍚勪竴涓�
//OtherDevice liftotherDevice = (OtherDevice)Storage.Devices.Find(x => x.DeviceCode == "SSG001");
//OtherDevice rightotherDevice = (OtherDevice)Storage.Devices.Find(x => x.DeviceCode == "SSG002");
//鎵惧埌Dt_Parameters涓殑鏈�鏂颁竴鏉℃暟鎹牴鎹綋鍓嶇殑deid
- var para = BaseDal.QueryData().Where(x => x.Deptid == deid).OrderByDescending(x => x.CreateDate).FirstOrDefault();
+ var para = BaseDal.QueryData().Where(x => x.Deptid == DeptId).OrderByDescending(x => x.CreateDate).FirstOrDefault();
int ext = (int)para.ManualExtend;//宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害
int ret = (int)para.ManualRetraction;//鍙砅LC鎵嬪姩浼稿嚭缂╁洖閫熷害
int liftPosition = (int)para.LeftPosition;//宸︿几鍑轰綅缃�
--
Gitblit v1.9.3