From a4ee90ca5c46d4295036f78f83a69d26b0bea245 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 13 Jul 2023 11:29:16 +0800
Subject: [PATCH] =?UTF-8?q?hang-=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=20-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml   |  3 ---
 .../Service/Management/DTO/UserLogViewModel.cs        | 11 +++--------
 .../Service/Management/UserService.cs                 |  5 +++--
 .../Service/Management/_MapConfig.cs                  |  1 -
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 6a4cf1815..7cd213420 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -8122,9 +8122,6 @@
         <member name="T:IRaCIS.Core.Application.ViewModel.UserLogQuery">
             <summary>UserLogQuery  列表查询参数模型</summary>
         </member>
-        <member name="T:IRaCIS.Core.Application.ViewModel.UserLogAddOrEdit">
-            <summary> UserLogAddOrEdit  列表查询参数模型</summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.TirggerTaskInfo.TargetAssessmentIsIUorIC">
             <summary>
             靶病灶是否为IUPD或者ICPD
diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
index aca8d17ed..ac60efbdc 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
@@ -9,7 +9,7 @@ using System.Collections.Generic;
 namespace IRaCIS.Core.Application.ViewModel
 {
     /// <summary> UserLogView  列表视图模型 </summary>
-    public class UserLogView: UserLogAddOrEdit
+    public class UserLogView
     {
         public Guid? Id { get; set; }
         public string IP { get; set; }
@@ -20,13 +20,13 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string LoginUserName { get; set; }
 
-        public UserType LoginUserTypeEnum { get; set; }
+        public UserTypeEnum LoginUserTypeEnum { get; set; }
 
 
 
         public string OptUserName { get; set; }
 
-        public UserType OptUserTypeEnum { get; set; }
+        public UserTypeEnum OptUserTypeEnum { get; set; }
     }
 
     ///<summary>UserLogQuery  列表查询参数模型</summary>
@@ -47,11 +47,6 @@ namespace IRaCIS.Core.Application.ViewModel
 
     }
 
-    ///<summary> UserLogAddOrEdit  列表查询参数模型</summary>
-    public class UserLogAddOrEdit
-    {
-      
-    }
 
 
 }
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index 8d0eb668c..c6540c7f4 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -705,9 +705,10 @@ namespace IRaCIS.Application.Services
             return pageList;
         }
 
-        public async Task<IResponseOutput> LoginOut(Guid userId,string loginName)
+        [HttpGet]
+        public async Task<IResponseOutput> LoginOut()
         {
-            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = userId, OptUserId=userId,   OptType = UserOptType.LoginOut },true);
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId = _userInfo.Id,   OptType = UserOptType.LoginOut },true);
 
             return ResponseOutput.Ok();
         }
diff --git a/IRaCIS.Core.Application/Service/Management/_MapConfig.cs b/IRaCIS.Core.Application/Service/Management/_MapConfig.cs
index d2bd738a6..744c906a8 100644
--- a/IRaCIS.Core.Application/Service/Management/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Management/_MapConfig.cs
@@ -125,7 +125,6 @@ namespace IRaCIS.Core.Application.Service
                   .ForMember(d => d.OptUserName, c => c.MapFrom(t => t.OptUser.UserName))
                   .ForMember(d => d.OptUserTypeEnum, c => c.MapFrom(t => t.OptUser.UserTypeEnum))
                 ;
-            CreateMap<UserLog, UserLogAddOrEdit>().ReverseMap();
         }
     }