Revert "修改"

This reverts commit 7d65cf5051.

IRaCIS.Core.API/_ServiceExtensions/SwaggerSetup.cs

@@ -16,30 +16,30 @@ namespace IRaCIS.Core.API;
 
 public enum SwaggerVersion
 {
-    [Description("文件记录(FileRecord)")]
+    [Description("文件记录")]
     FileRecord = -1,
 
-    [Description("医生模块(Reviewer)")]
+    [Description("医生模块")]
     Reviewer = 1,
-    [Description("项目模块(Trial)")]
+    [Description("项目模块")]
     Trial = 2,
-    [Description("入组模块(Enroll)")]
+    [Description("入组模块")]
     Enroll = 3,
-    [Description("工作量模块(Workload)")]
+    [Description("工作量模块")]
     Workload = 4,
-    [Description("通用信息获取(Common)")]
+    [Description("通用信息获取")]
     Common = 5,
-    [Description("机构信息模块(Institution)")]
+    [Description("机构信息模块")]
     Institution = 6,
-    [Description("统计模块(DashboardStatistics)")]
+    [Description("统计模块")]
     DashboardStatistics = 7,
-    [Description("财务模块(Financial)")]
+    [Description("财务模块")]
     Financial = 8,
-    [Description("管理模块(Management)")]
+    [Description("管理模块")]
     Management =9,
-    [Description("影像模块(Image)")]
+    [Description("影像模块")]
     Image =10,
-    [Description("读片模块(Reading)")]
+    [Description("读片模块")]
     Reading =11
 };
 

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -2552,13 +2552,6 @@
             <returns></returns>
             <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.UserService.SetIsIgnoreUncommonly(IRaCIS.Core.Application.ViewModel.SetIsIgnoreUncommonlyInDto)">
-            <summary>
-            设置是否忽略异地登录
-            </summary>
-            <param name="inDto"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.Application.Service.UserService.GetUserLoginRoleList(IRaCIS.Application.Contracts.IRCLoginDto,IRaCIS.Core.Application.Auth.ITokenService,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
             <summary>
             账号验证，获取账号角色信息 获取临时token
@@ -13540,12 +13533,6 @@
             <param name="_readingClinicalDataReposiotry"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TestService.BackImageResize(System.Guid,System.Guid)">
-            <summary>
-            后端处理某个中心缩略图有问题  先下载，生成缩略图上传，然后更新数据库
-            </summary>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.Application.Service.TestService.DealTialFileSie(IRaCIS.Core.Application.Helper.IOSSService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingClinicalDataPDF})">
             <summary>
             非dicom 临床数据

IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs

@@ -27,7 +27,6 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public bool IsLoginUncommonly { get; set; }
 
-        public bool IsIgnoreUncommonly { get; set; }
 
         public string JsonObj { get; set; }
 
@@ -44,13 +43,6 @@ namespace IRaCIS.Core.Application.ViewModel
         public UserMFAType MFAType { get; set; } = UserMFAType.Login;
     }
 
-    public class SetIsIgnoreUncommonlyInDto
-    {
-        public Guid Id { get; set; }
-
-        public bool IsIgnoreUncommonly { get; set; }
-    }
-
     ///<summary>UserLogQuery  列表查询参数模型</summary>
     public class UserLogQuery : PageInput
     {
@@ -58,13 +50,10 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public UserOptType? OptType { get; set; }
 
-        public List<UserOptType> OptTypeList { get; set; } = new List<UserOptType>();
-
         public string? IP { get; set; }
 
         public string? LoginFaildName { get; set; }
 
-
         public string? LoginUserName { get; set; }
 
         public DateTime? BeginDate { get; set; }

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -835,17 +835,7 @@ namespace IRaCIS.Core.Application.Service
             return ResponseOutput.Ok();
         }
 
-        /// <summary>
+
-        /// 设置是否忽略异地登录
-        /// </summary>
-        /// <param name="inDto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<IResponseOutput> SetIsIgnoreUncommonly(SetIsIgnoreUncommonlyInDto inDto)
-        {
-            await _userLogRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new UserLog() { IsIgnoreUncommonly = inDto.IsIgnoreUncommonly }, true);
-            return ResponseOutput.Ok();
-        }
 
         [HttpPost]
         public async Task<PageOutput<UserLogView>> GetUserLogList(UserLogQuery inQuery)
@@ -856,7 +846,6 @@ namespace IRaCIS.Core.Application.Service
 
             var userLogQueryable =
                _userLogRepository.AsQueryable().IgnoreQueryFilters()
-                  .WhereIf(inQuery.OptTypeList.Count()>0, t => inQuery.OptTypeList.Contains(t.OptType))
                .WhereIf(inQuery.IdentityUserId != null, t => t.ActionIdentityUserId == inQuery.IdentityUserId)
                .WhereIf(inQuery.TargetIdentityUserId != null, t => t.TargetIdentityUserId == inQuery.TargetIdentityUserId)
                .WhereIf(inQuery.TrialId != null, t => t.ActionIdentityUser.UserTrialList.Any(c => c.TrialId == inQuery.TrialId) || t.TargetIdentityUser.UserTrialList.Any(c => c.TrialId == inQuery.TrialId))
@@ -864,8 +853,7 @@ namespace IRaCIS.Core.Application.Service
                .WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)
                .WhereIf(inQuery.BeginDate != null, t => t.CreateTime >= inQuery.BeginDate)
                .WhereIf(inQuery.EndDate != null, t => t.CreateTime <= inQuery.EndDate)
-               .WhereIf(inQuery.IsLoginUncommonly != null && inQuery.IsLoginUncommonly.Value, t => t.IsLoginUncommonly&&!t.IsIgnoreUncommonly)
+               .WhereIf(inQuery.IsLoginUncommonly != null, t => t.IsLoginUncommonly == inQuery.IsLoginUncommonly)
-               .WhereIf(inQuery.IsLoginUncommonly != null && !inQuery.IsLoginUncommonly.Value, t => !t.IsLoginUncommonly  || t.IsIgnoreUncommonly)
                .WhereIf(!string.IsNullOrEmpty(inQuery.LoginUserName), t => t.ActionUserName.Contains(inQuery.LoginUserName!))
                .WhereIf(!string.IsNullOrEmpty(inQuery.LoginFaildName), t => t.ActionUserName.Contains(inQuery.LoginFaildName!))
                .WhereIf(!string.IsNullOrEmpty(inQuery.IP), t => t.IP.Contains(inQuery.IP!))

IRaCIS.Core.Domain/Management/UserLog.cs

@@ -44,9 +44,6 @@ public class UserLog : BaseAddAuditEntity
     [Comment("异地登录")]
     public bool IsLoginUncommonly { get; set; }
 
-    [Comment("是否忽略异地登录")]
-    public bool IsIgnoreUncommonly { get; set; }
-
 
 
     #region 后续删除

IRaCIS.Core.Infra.EFCore/Migrations/20250409013944_IsIgnoreUncommonly.cs

@@ -1,30 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace IRaCIS.Core.Infra.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class IsIgnoreUncommonly : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsIgnoreUncommonly",
-                table: "UserLog",
-                type: "bit",
-                nullable: false,
-                defaultValue: false,
-                comment: "是否忽略异地登录");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "IsIgnoreUncommonly",
-                table: "UserLog");
-        }
-    }
-}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -13488,10 +13488,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasMaxLength(400)
                         .HasColumnType("nvarchar(400)");
 
-                    b.Property<bool>("IsIgnoreUncommonly")
-                        .HasColumnType("bit")
-                        .HasComment("是否忽略异地登录");
-
                     b.Property<bool>("IsLoginUncommonly")
                         .HasColumnType("bit")
                         .HasComment("异地登录");