From 3377d0863193a85d13410e062226b488b0abba1d Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 16 Jan 2024 15:22:59 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BA=BA=E8=84=B8=E7=85=A7=E7=89=87?=
 =?UTF-8?q?=E7=9B=B8=E5=90=8C=E4=B8=8D=E4=BA=A7=E7=94=9F=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Implements/GainfoService.cs      | 21 ++++++++++++++-----
 .../Device/Enums/DeviceTaskEnumType.cs        |  8 +++----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
index 903b38e1..3da1f9bc 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
@@ -1,5 +1,4 @@
 using Dlhis.Basic.Device.Services;
-using Dlhis.Basic.Device.Services.Implements;
 using Dlhis.Basic.Organization.Request;
 using Dlhis.Basic.Organization.Response;
 using Dlhis.Entity.Basic.Entity;
@@ -25,13 +24,18 @@ public class GainfoService : IGainfoService
     private readonly IDbContext _dbContext;
     private readonly ICurrentUser _currentUser;
     private readonly IDevicePermissionService _devicePermissionService;
+    private readonly ILogger<GainfoService> _logger;
 
-    public GainfoService(IGainfoStore gainfoStore, IDbContext dbContext, ICurrentUser currentUser, IDevicePermissionService devicePermissionService)
+    public GainfoService(IGainfoStore gainfoStore,
+        IDbContext dbContext,
+        ICurrentUser currentUser,
+        IDevicePermissionService devicePermissionService, ILogger<GainfoService> logger)
     {
         _gainfoStore = gainfoStore;
         _dbContext = dbContext;
         _currentUser = currentUser;
         _devicePermissionService = devicePermissionService;
+        _logger = logger;
     }
 
     /// <summary>
@@ -212,9 +216,7 @@ public class GainfoService : IGainfoService
             dbContext.Client.CurrentConnectionConfig.ConnectionString = faceConnectionString;
             var face = await dbContext.Queryable<GainfoFaceEntity>().Where(x => x.UserCode == gainfo.Code).SingleAsync();
 
-            //生成任务
-            await _devicePermissionService.GenerateDeviceTasksAsync(gainfo.No, face == null ? DeviceTaskEnumType.Add : DeviceTaskEnumType.AddAfterDelete);
-
+            var taskType = face == null ? DeviceTaskEnumType.Add : DeviceTaskEnumType.Update;
             if (face == null)
             {
                 face = new GainfoFaceEntity
@@ -227,9 +229,18 @@ public class GainfoService : IGainfoService
             }
             else
             {
+                if (face.Face == request.Face)
+                {
+                    _logger.LogWarning("相同的人脸照片更新忽略");
+                    return;
+                }
+
                 face.Face = request.Face;
                 await dbContext.UpdateAsync(face);
             }
+
+            //生成任务
+            await _devicePermissionService.GenerateDeviceTasksAsync(gainfo.No, taskType);
         });
     }
 
diff --git a/Src/Dlhis.Entity/Device/Enums/DeviceTaskEnumType.cs b/Src/Dlhis.Entity/Device/Enums/DeviceTaskEnumType.cs
index 780ff55d..8d607bb6 100644
--- a/Src/Dlhis.Entity/Device/Enums/DeviceTaskEnumType.cs
+++ b/Src/Dlhis.Entity/Device/Enums/DeviceTaskEnumType.cs
@@ -8,8 +8,6 @@ namespace Dlhis.Entity.Device.Enums;
 [Description("设备任务类型")]
 public enum DeviceTaskEnumType
 {
-    // 状态:ADD-准备下发;ADDOK-下发成功;DEL-准备删除;DELOK-删除成功;AERR-下发错误;DERR-删除错误;UUU-先删除后下发;
-
     /// <summary>
     /// 添加
     /// </summary>
@@ -23,8 +21,8 @@ public enum DeviceTaskEnumType
     Delete = 2,
 
     /// <summary>
-    /// 删除后添加
+    /// 更新
     /// </summary>
-    [Description("删除后添加")]
-    AddAfterDelete = 3,
+    [Description("更新")]
+    Update = 3,
 }