From 1dcc7b63a20daad7c7060f18878d8e8dbaad02de Mon Sep 17 00:00:00 2001
From: qiuyao <qiuyao@hnkhzn.com>
Date: 星期一, 28 四月 2025 16:41:31 +0800
Subject: [PATCH] 解决冲突
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
index 9a6cab0..2fabccf 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
@@ -14,6 +14,7 @@
using Microsoft.AspNetCore.Http;
using Newtonsoft.Json;
using WIDESEAWCS_Common;
+using FaceAI;
namespace WIDESEAWCS_SystemServices
{
@@ -129,6 +130,9 @@
}
var faceResult = BaiDuFaceHelper.FaceSearch(loginInfo.path, groupId);
+
+
+
if (faceResult != null && faceResult.error_code == 0)
{
var bestMatch = faceResult.result.user_list.OrderByDescending(u => u.score).FirstOrDefault();
@@ -230,6 +234,53 @@
return content;
}
+ /// <summary>
+ /// 1:N 浜鸿劯鎼滅储鎺ュ彛
+ /// </summary>
+ /// <param name="image">鍥剧墖淇℃伅(**鎬绘暟鎹ぇ灏忓簲灏忎簬10M**)锛屽浘鐗囦笂浼犳柟寮忔牴鎹甶mage_type鏉ュ垽鏂�</param>
+ /// <param name="imageType">鍥剧墖绫诲瀷 <br> **BASE64**:鍥剧墖鐨刡ase64鍊硷紝base64缂栫爜鍚庣殑鍥剧墖鏁版嵁锛岀紪鐮佸悗鐨勫浘鐗囧ぇ灏忎笉瓒呰繃2M锛� <br>**URL**:鍥剧墖鐨� URL鍦板潃( 鍙兘鐢变簬缃戠粶绛夊師鍥犲鑷翠笅杞藉浘鐗囨椂闂磋繃闀�)锛� <br>**FACE_TOKEN**: 浜鸿劯鍥剧墖鐨勫敮涓�鏍囪瘑锛岃皟鐢ㄤ汉鑴告娴嬫帴鍙ｆ椂锛屼細涓烘瘡涓汉鑴稿浘鐗囪祴浜堜竴涓敮涓�鐨凢ACE_TOKEN锛屽悓涓�寮犲浘鐗囧娆℃娴嬪緱鍒扮殑FACE_TOKEN鏄悓涓�涓��</param>
+ /// <param name="groupIdList">浠庢寚瀹氱殑group涓繘琛屾煡鎵� 鐢ㄩ�楀彿鍒嗛殧锛�**涓婇檺20涓�**</param>
+ /// </param>
+ /// <return>JObject</return>
+ ///
+ public string FaceSearch(string image, string imageType, string groupIdList, string userId)
+ {
+ string result = "";
+ switch (imageType)
+ {
+ case "base64":
+ //result = FaceCompare.FaceIdentifyByBuffer(image, groupIdList, userId);
+ break;
+ case "url":
+ result = FaceCompare.FaceIdentify(image, groupIdList, userId);
+ break;
+ case "token":
+ result = FaceCompare.FaceIdentifyByFeature(image, groupIdList, userId);
+ break;
+ default:
+ break;
+ }
+ return result;
+ }
+
+ /// <summary>
+ /// 閫氳繃鐗瑰緛鍊兼瘮瀵癸紙1:1锛� 瀵逛汉鑴哥壒寰佸�艰繘琛屾瘮杈冿紝鍙繑鍥炰汉鑴哥壒寰佺浉浼煎垎鍊硷紙鐧惧垎鍒讹級
+ /// </summary>
+ /// <param name="file1">浼犲浘鐗囪矾寰�</param>
+ /// <param name="file2">浼犲浘鐗囪矾寰�</param>
+ /// <returns></returns>
+ public string FaceCompareFeature(string file1, string file2)
+ {
+ try
+ {
+ string result = FaceCompare.FaceCompareFeature(file1, file2);
+ return result;
+ }
+ catch (Exception e)
+ {
+ throw e;
+ }
+ }
public override WebResponseContent UpdateData(SaveModel saveModel)
{
UpdateIgnoreColOnExecute = x =>
--
Gitblit v1.9.3