From 3fb820bd2d6abd2c72d57ce3d8622826bce32d48 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Sat, 9 Mar 2024 18:03:33 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BA=BA=E5=91=98=E5=90=8C=E6=AD=A5,?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E4=BB=BB=E5=8A=A1=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj | 6 +- .../Dtos/PermissionUsersInfoDto.cs | 14 ++ .../Dtos/UserTenantDeviceCodeDto.cs | 14 ++ Src/Dlhis.Basic.Api/IDevicePermissionApi.cs | 19 ++- .../DevicePermissionsController.cs | 21 ++- .../Device/Dtos/PermissionUsersInfoDto.cs | 15 ++ .../Services/IDevicePermissionService.cs | 10 +- .../Implements/DevicePermissionService.cs | 128 +++++++++++++----- .../Controllers/DeviceUploadLogsController.cs | 18 ++- .../Dlhis.ScheduledTask.csproj | 2 + Src/Dlhis.ScheduledTask/Dockerfile | 1 + Src/Dlhis.ScheduledTask/Program.cs | 3 - .../SyncSapInfo/Dto/SapPersonJobStatus.cs | 2 +- .../SyncSapInfo/Job/SyncPersonJob.cs | 59 ++++++-- .../SyncSapInfo/Services/IJinkoSapService.cs | 2 +- .../appsettings.Development.json | 3 +- Src/Dlhis.ScheduledTask/appsettings.json | 3 +- 17 files changed, 261 insertions(+), 59 deletions(-) create mode 100644 Src/Dlhis.Basic.Api/Dtos/PermissionUsersInfoDto.cs create mode 100644 Src/Dlhis.Basic.Api/Dtos/UserTenantDeviceCodeDto.cs create mode 100644 Src/Dlhis.Basic/Device/Dtos/PermissionUsersInfoDto.cs diff --git a/Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj b/Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj index e41324f5..2311965f 100644 --- a/Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj +++ b/Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj @@ -3,11 +3,15 @@ net6.0 enable - enable + disable + + + + diff --git a/Src/Dlhis.Basic.Api/Dtos/PermissionUsersInfoDto.cs b/Src/Dlhis.Basic.Api/Dtos/PermissionUsersInfoDto.cs new file mode 100644 index 00000000..872ec843 --- /dev/null +++ b/Src/Dlhis.Basic.Api/Dtos/PermissionUsersInfoDto.cs @@ -0,0 +1,14 @@ +namespace Dlhis.Basic.Api.Dtos; + +public class PermissionUsersInfoDto +{ + /// + /// 拥有权限的用户 + /// + public List UserNos { get; set; } + + /// + /// 用户对应的 [ 厂区--设备Code ] + /// + public Dictionary> PermissionInfos { get; set; } +} diff --git a/Src/Dlhis.Basic.Api/Dtos/UserTenantDeviceCodeDto.cs b/Src/Dlhis.Basic.Api/Dtos/UserTenantDeviceCodeDto.cs new file mode 100644 index 00000000..3d822559 --- /dev/null +++ b/Src/Dlhis.Basic.Api/Dtos/UserTenantDeviceCodeDto.cs @@ -0,0 +1,14 @@ +namespace Dlhis.Basic.Api.Dtos; + +public class UserTenantDeviceCodeDto +{ + /// + /// 租户 + /// + public string Tenant { get; set; } + + /// + /// 设备权限 + /// + public List Codes { get; set; } +} diff --git a/Src/Dlhis.Basic.Api/IDevicePermissionApi.cs b/Src/Dlhis.Basic.Api/IDevicePermissionApi.cs index feeb452e..d1150a7f 100644 --- a/Src/Dlhis.Basic.Api/IDevicePermissionApi.cs +++ b/Src/Dlhis.Basic.Api/IDevicePermissionApi.cs @@ -1,4 +1,5 @@ -using Kurisu.Core.Result; +using Dlhis.Basic.Api.Dtos; +using Kurisu.Core.Result; using Kurisu.RemoteCall.Attributes; namespace Dlhis.Basic.Api; @@ -9,4 +10,20 @@ public interface IDevicePermissionApi [Auth] [Get("/api/devicepermissions/canteen/uniqueNos")] Task>> GetCanteenDeviceUniqueNosByUserNoAsync(string userNo); + + + /// + /// 获取所有人的权限信息 + /// + /// + [Get("/api/devicepermissions/all-permission")] + Task> GetPermissionUsersInfoAsync(); + + /// + /// 重新生成权限 + /// + /// + /// + [Post("/api/devicepermissions/re-permission")] + Task> RePermissionUsersInfoAsync(PermissionUsersInfoDto beforeDto); } \ No newline at end of file diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs index 736902c0..dba09fd2 100644 --- a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs +++ b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs @@ -1,4 +1,5 @@ -using Dlhis.Basic.Device.Request; +using Dlhis.Basic.Device.Dtos; +using Dlhis.Basic.Device.Request; using Dlhis.Basic.Device.Response; using Dlhis.Basic.Device.Services; using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop; @@ -57,7 +58,7 @@ public class DevicePermissionsController : ControllerBase /// - /// 就餐设备唯一号权限 + /// 获取就餐设备唯一号权限 /// /// /// @@ -67,4 +68,20 @@ public class DevicePermissionsController : ControllerBase { return await _devicePermissionService.GetCanteenDeviceUniqueNosByUserNoAsync(userNo); } + + [AllowAnonymous] + [HttpGet("all-permission")] + [IgnoreTenant] + public async Task GetPermissionUsersInfoAsync() + { + return await _devicePermissionService.GetPermissionUsersInfoAsync(); + } + + [AllowAnonymous] + [IgnoreTenant] + [HttpPost("re-permission")] + public async Task ReGeneratePermissionUsersInfoAsync(PermissionUsersInfoDto beforeDto) + { + return await _devicePermissionService.ReGeneratePermissionUsersInfoAsync(beforeDto); + } } diff --git a/Src/Dlhis.Basic/Device/Dtos/PermissionUsersInfoDto.cs b/Src/Dlhis.Basic/Device/Dtos/PermissionUsersInfoDto.cs new file mode 100644 index 00000000..ac59afd3 --- /dev/null +++ b/Src/Dlhis.Basic/Device/Dtos/PermissionUsersInfoDto.cs @@ -0,0 +1,15 @@ +namespace Dlhis.Basic.Device.Dtos +{ + public class PermissionUsersInfoDto + { + /// + /// 拥有权限的用户 + /// + public List UserNos { get; set; } + + /// + /// 用户对应的 [ 厂区--设备Code ] + /// + public Dictionary> PermissionInfos { get; set; } + } +} diff --git a/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs index ef313da0..3d8ea3ec 100644 --- a/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs @@ -1,4 +1,5 @@ -using Dlhis.Basic.Device.Request; +using Dlhis.Basic.Device.Dtos; +using Dlhis.Basic.Device.Request; using Dlhis.Basic.Device.Response; using Dlhis.Entity.Device.Enums; using Dlhis.Entity.Sys.Enums; @@ -64,4 +65,11 @@ public interface IDevicePermissionService : IScopeDependency /// /// Task> GetAssigmentByCodeAsync(AssigmentByCodeRequest request); + + + + Task GetPermissionUsersInfoAsync(); + + + Task ReGeneratePermissionUsersInfoAsync(PermissionUsersInfoDto beforeDto); } diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs index d46ac987..b24373cd 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs @@ -161,6 +161,97 @@ public class DevicePermissionService : IDevicePermissionService } } + public async Task GetPermissionUsersInfoAsync() + { + //获取所有人的权限 + var userNos = await GetPermissionUserNosAsync(); + var permissions = await GetAssignDeviceCodesInternalAsync(userNos); + + return new PermissionUsersInfoDto + { + UserNos = userNos, + PermissionInfos = permissions + }; + } + + + public async Task ReGeneratePermissionUsersInfoAsync(PermissionUsersInfoDto beforeDto) + { + var userNos = beforeDto.UserNos; + var before = beforeDto.PermissionInfos.ToDictionary(x => x.Key, x => x.Value, StringComparer.OrdinalIgnoreCase); + + //获取业务处理后所有人的权限 + var nextUserNos = await GetPermissionUserNosAsync(); + if (nextUserNos.Any()) + userNos = userNos.Concat(nextUserNos).Distinct(StringComparer.OrdinalIgnoreCase).ToList(); + + var current = await GetAssignDeviceCodesInternalAsync(userNos); + + var deivces = await _dbContext.Queryable().ToListAsync(); + var waitTasks = new List(); + + foreach (var userNo in userNos) + { + before.TryGetValue(userNo, out var beforeTenantDeviceCodes); + beforeTenantDeviceCodes ??= new(); + + current.TryGetValue(userNo, out var currentTenantDeviceCodes); + currentTenantDeviceCodes ??= new(); + + var tenants = beforeTenantDeviceCodes.Select(x => x.Tenant).Concat(currentTenantDeviceCodes.Select(x => x.Tenant)).Distinct().ToList(); + + foreach (var tenant in tenants) + { + var currentCodes = currentTenantDeviceCodes.FirstOrDefault(x => x.Tenant == tenant)?.Codes ?? new(); + var beforeCodes = beforeTenantDeviceCodes.FirstOrDefault(x => x.Tenant == tenant)?.Codes ?? new(); + + //被删除 + var deletedItems = beforeCodes.Where(x => !currentCodes.Contains(x)).ToList(); + //新增 + var addItems = currentCodes.Where(x => !beforeCodes.Contains(x)).ToList(); + + if (!deletedItems.Any() && !addItems.Any()) + { + continue; + } + + var deviceCodes = deivces.Where(x => deletedItems.Contains(x.Code) || addItems.Contains(x.Code)).Select(x => x.Code).ToList(); + deletedItems = deletedItems.Where(x => deviceCodes.Contains(x)).ToList(); + addItems = addItems.Where(x => deviceCodes.Contains(x)).ToList(); + + //下发任务创建 + var toDeleted = deletedItems.Select(x => new DeviceTaskEntity + { + DeviceUniqueNo = deivces.First(item => item.Code == x).UniqueNo, + Status = DeviceTaskStatusEnumType.Wait, + Type = DeviceTaskEnumType.Delete, + UserNo = userNo, + Version = 0, + TenantId = tenant, + }).ToList(); + + var toAdd = addItems.Select(x => new DeviceTaskEntity + { + DeviceUniqueNo = deivces.First(item => item.Code == x).UniqueNo, + Status = DeviceTaskStatusEnumType.Wait, + Type = DeviceTaskEnumType.Add, + UserNo = userNo, + Version = 0, + TenantId = tenant, + }).ToList(); + + waitTasks.AddRange(toDeleted.Concat(toAdd).ToList()); + } + } + + if (waitTasks.Any()) + { + await _dbContext.InsertAsync(waitTasks); + } + + return waitTasks.Count; + } + public async Task GenerateDeviceTasksAsync(string userNo, DeviceTaskEnumType taskType) { var deviceCodes = await GetAssignDeviceCodesAsync(userNo); @@ -193,7 +284,6 @@ public class DevicePermissionService : IDevicePermissionService await _dbContext.InsertAsync(tasks); } - public async Task> GetCanteenDeviceUniqueNosByUserNoAsync(string userNo) { var all = await GetAssignDeviceCodesAsync(userNo); @@ -305,40 +395,6 @@ public class DevicePermissionService : IDevicePermissionService return userNos.Concat(userNosByGroup).Concat(userNosByDepartment).Concat(userNosByWerk).Distinct().ToList(); } - - private static List GetAssignmentsInternal( - List devicePermissions, List deviceGroups, - DeviceAssignmentTypeEnumType uniqueType, AssignTypeEnumType assignType, string assignValue) - { - var devicePermissionCodes = devicePermissions - .Where(x => x.UniqueType == uniqueType) - .Where(x => x.AssignType == assignType) - .Where(x => x.AssignValue == assignValue) - .Select(x => x.UniqueValue).ToList(); - - //处理获取设备组的情况,递归到最下级获取设备code - if (uniqueType == DeviceAssignmentTypeEnumType.Group) - { - var tops = deviceGroups.Where(x => !x.PCode.HasValue).ToList(); - tops.ForEach(x => - { - RecursionGetNext(x, deviceGroups, devicePermissionCodes, devicePermissionCodes.Contains(x.Code)); - }); - } - - return devicePermissionCodes.Distinct().ToList(); - - void RecursionGetNext(DeviceGroupEntity current, List deviceGroups, List result, bool add) - { - var next = deviceGroups.Where(x => x.PCode == current.Code).ToList(); - foreach (var item in next) - { - if (add) result.Add(item.Code); - RecursionGetNext(item, deviceGroups, result, result.Contains(item.Code)); - } - } - } - private static List GetAssignCodesInternal( List devicePermissions, List deviceGroups, DeviceAssignmentTypeEnumType uniqueType, AssignTypeEnumType assignType, string assignValue) @@ -400,7 +456,7 @@ public class DevicePermissionService : IDevicePermissionService var deviceGroups = await _dbContext.Queryable().ToListAsync(); var deviceRelationships = await _dbContext.Queryable().ToListAsync(); - var result = new Dictionary>(gainfos.Count); + var result = new Dictionary>(gainfos.Count, StringComparer.OrdinalIgnoreCase); foreach (var gainfo in gainfos) { diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs index 9e2e6567..09095e3f 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs @@ -1,4 +1,5 @@ -using Dlhis.ScheduledTask.DeviceUploadLog.Request; +using Dlhis.Basic.Api; +using Dlhis.ScheduledTask.DeviceUploadLog.Request; using Dlhis.ScheduledTask.DeviceUploadLog.Response; using Dlhis.ScheduledTask.DeviceUploadLog.Services; using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop; @@ -17,10 +18,12 @@ namespace Dlhis.ScheduledTask.DeviceUploadLog.Controllers; public class DeviceUploadLogsController : ControllerBase { private readonly IDeviceUploadLogService _deviceUploadLogService; + private readonly IDevicePermissionApi _devicePermissionApi; - public DeviceUploadLogsController(IDeviceUploadLogService deviceUploadLogService) + public DeviceUploadLogsController(IDeviceUploadLogService deviceUploadLogService, IDevicePermissionApi devicePermissionApi) { _deviceUploadLogService = deviceUploadLogService; + _devicePermissionApi = devicePermissionApi; } /// @@ -57,4 +60,15 @@ public class DeviceUploadLogsController : ControllerBase { await _deviceUploadLogService.SetUploadLogsBeginDateTimeAsync(requests); } + + //[HttpPost("try")] + //public async Task Test() + //{ + // var dtoResult = await _devicePermissionApi.GetPermissionUsersInfoAsync(); + // var dto = dtoResult.Data; + // var rResult = await _devicePermissionApi.RePermissionUsersInfoAsync(dto); + // var r = rResult.Data; + + // return r; + //} } diff --git a/Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj b/Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj index 9efffeb1..a199ba52 100644 --- a/Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj +++ b/Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj @@ -21,9 +21,11 @@ + + diff --git a/Src/Dlhis.ScheduledTask/Dockerfile b/Src/Dlhis.ScheduledTask/Dockerfile index 0bb7db48..9f56dc21 100644 --- a/Src/Dlhis.ScheduledTask/Dockerfile +++ b/Src/Dlhis.ScheduledTask/Dockerfile @@ -7,6 +7,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src COPY ["Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj", "Src/Dlhis.ScheduledTask/"] +COPY ["Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj", "Src/Dlhis.Basic.Api/"] COPY ["Src/Dlhis.Entity/Dlhis.Entity.csproj", "Src/Dlhis.Entity/"] COPY ["Src/Dlhis.Sys.Api/Dlhis.Sys.Api.csproj", "Src/Dlhis.Sys.Api/"] RUN dotnet restore "Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj" diff --git a/Src/Dlhis.ScheduledTask/Program.cs b/Src/Dlhis.ScheduledTask/Program.cs index 9f35b5ee..27e7b9cc 100644 --- a/Src/Dlhis.ScheduledTask/Program.cs +++ b/Src/Dlhis.ScheduledTask/Program.cs @@ -1,9 +1,6 @@ using Kurisu.AspNetCore.Startup; -using Kurisu.AspNetCore.Utils; using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.Startup; -using Microsoft.AspNetCore.DataProtection; -using StackExchange.Redis; class Program { diff --git a/Src/Dlhis.ScheduledTask/SyncSapInfo/Dto/SapPersonJobStatus.cs b/Src/Dlhis.ScheduledTask/SyncSapInfo/Dto/SapPersonJobStatus.cs index 70e9b247..13e14f6c 100644 --- a/Src/Dlhis.ScheduledTask/SyncSapInfo/Dto/SapPersonJobStatus.cs +++ b/Src/Dlhis.ScheduledTask/SyncSapInfo/Dto/SapPersonJobStatus.cs @@ -11,6 +11,6 @@ /// /// 0离职 /// - public int STAT2 { get; set; } + public string STAT2 { get; set; } } } diff --git a/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPersonJob.cs b/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPersonJob.cs index 63465c5e..bd75db28 100644 --- a/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPersonJob.cs +++ b/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPersonJob.cs @@ -10,6 +10,7 @@ using Dlhis.Entity.Basic.Enums; using Dlhis.Sys.Api; using Dlhis.Sys.Api.Response; using SqlSugar; +using Dlhis.Basic.Api; namespace Dlhis.ScheduledTask.SyncSapInfo.Job; @@ -18,20 +19,27 @@ public class SyncPersonJob private readonly ILogger _logger; private readonly IJinkoSapService _jinkoSapService; private readonly ITenantApi _tenantApi; + private readonly IDevicePermissionApi _devicePermissionApi; private List _positions; private List _tenants; + private List _departmentChanges; + private List _jobChanges; - public SyncPersonJob(ILogger logger, IJinkoSapService jinkoSapService, ITenantApi tenantApi) + public SyncPersonJob(ILogger logger, IJinkoSapService jinkoSapService, + ITenantApi tenantApi, IDevicePermissionApi devicePermissionApi) { _logger = logger; _jinkoSapService = jinkoSapService; _tenantApi = tenantApi; + _devicePermissionApi = devicePermissionApi; } public async Task RunAsync() { var personResp = await _jinkoSapService.GetPersonsAsync(); var persons = personResp.Person.Items; + _departmentChanges = personResp.DepartmentInfo.Items; + _jobChanges = personResp.JobStatusInfo.Items; _logger.LogInformation("获取SAP人员数量为:{count}", persons.Count); if (persons.Count > 0) @@ -59,18 +67,20 @@ public class SyncPersonJob var workCodes = persons.Select(x => x.ZWORKCODE).ToList(); var chunks = workCodes.Chunk(4000).ToList(); - Scoped.Temp.Value.Create(sp => + await Scoped.Temp.Value.Create(async sp => { var dbContext = sp.GetService(); foreach (var searchCodes in chunks) { _logger.LogInformation("SAP分批处理Chunk数量:{count}", searchCodes.Count()); + var dtoResult = await _devicePermissionApi.GetPermissionUsersInfoAsync(); + var dto = dtoResult.Data; var existsWorkCodes = dbContext.Queryable() - .Where(x => searchCodes.Contains(x.ename)) - .Select(x => x.ename) - .ToList(); + .Where(x => searchCodes.Contains(x.ename)) + .Select(x => x.ename) + .ToList(); var originUpdates = persons.Where(x => existsWorkCodes.Contains(x.ZWORKCODE)).ToList(); var existsUpdateWorkCodes = originUpdates.Select(x => x.ZWORKCODE).ToList(); @@ -83,6 +93,7 @@ public class SyncPersonJob _logger.LogInformation("SAP分批更新数:{count}", updates.Count); var inserts = ToGainfoSap(originInserts); _logger.LogInformation("SAP分批新增数:{count}", inserts.Count); + foreach (var item in inserts) { i++; @@ -114,6 +125,10 @@ public class SyncPersonJob } } + var rResult = await _devicePermissionApi.RePermissionUsersInfoAsync(dto); + var r = rResult.Data; + + _logger.LogInformation("生成下发任务数量:{count}", r); } }); @@ -127,7 +142,7 @@ public class SyncPersonJob var info = new GainfoEntity { No = Guid.NewGuid().ToString(), - SapNo = item.ano, + SapNo = item.PERNR, Type = item.@class, Name = item.gname, Code = item.ename, @@ -157,10 +172,9 @@ public class SyncPersonJob { db.Client.Insertable(info).AS("GainfoLeave").ExecuteCommand(); } - } - private void UpdatePerson(IDbContext db, GainfoSapEntity item) + private static void UpdatePerson(IDbContext db, GainfoSapEntity item) { var gainfoSap = db.Queryable().Where(x => x.ename == item.ename).First(); db.Updateable().SetColumns(g => new GainfoSapEntity @@ -214,12 +228,39 @@ public class SyncPersonJob return sapList; } + var now = DateTime.Now; + foreach (var item in sapList) + { + var a = _jobChanges.FirstOrDefault(x => x.ZWORKCODE == item.ZWORKCODE); + if (a != null) + { + if (a.BEGDA >= now && a.ENDDA <= now) + { + if (a.STAT2 == "0") + { + item.STAT2 = "0"; + item.ZSTATUS = "5"; + } + } + } + + var b = _departmentChanges.FirstOrDefault(x => x.ZWORKCODE == item.ZWORKCODE); + if (b != null) + { + if (b.BEGDA >= now && b.ENDDA <= now) + { + item.ORGEH = b.ORGEH; + item.WERKS = b.WERKS; + } + } + } + var needRemove = sapList.Intersect(last, new SapPersonComparer()); return sapList.Except(needRemove, new SapPersonComparer()).ToList(); } - private List LoadData(IDbContext db) + private static List LoadData(IDbContext db) { var gainfo = db.Queryable().ToList(); diff --git a/Src/Dlhis.ScheduledTask/SyncSapInfo/Services/IJinkoSapService.cs b/Src/Dlhis.ScheduledTask/SyncSapInfo/Services/IJinkoSapService.cs index 80bf045a..bd654f02 100644 --- a/Src/Dlhis.ScheduledTask/SyncSapInfo/Services/IJinkoSapService.cs +++ b/Src/Dlhis.ScheduledTask/SyncSapInfo/Services/IJinkoSapService.cs @@ -2,7 +2,7 @@ namespace Dlhis.ScheduledTask.SyncSapInfo.Services; -public interface IJinkoSapService : ISingletonDependency +public interface IJinkoSapService : IScopeDependency { Task GetSapOrganizationsAsync(); diff --git a/Src/Dlhis.ScheduledTask/appsettings.Development.json b/Src/Dlhis.ScheduledTask/appsettings.Development.json index 8674e444..6e89eed4 100644 --- a/Src/Dlhis.ScheduledTask/appsettings.Development.json +++ b/Src/Dlhis.ScheduledTask/appsettings.Development.json @@ -6,7 +6,8 @@ } }, "InternalRequest": { - "SysRequestUrl": "http://localhost:5003" + "SysRequestUrl": "http://localhost:5003", + "BasicRequestUrl": "http://localhost:5002" }, "FaceUrlOptions": { "Url": "http://localhost:5002/api/gainfos/face?token=", diff --git a/Src/Dlhis.ScheduledTask/appsettings.json b/Src/Dlhis.ScheduledTask/appsettings.json index 1bc1a466..7b148077 100644 --- a/Src/Dlhis.ScheduledTask/appsettings.json +++ b/Src/Dlhis.ScheduledTask/appsettings.json @@ -6,7 +6,8 @@ } }, "InternalRequest": { - "SysRequestUrl": "http://sys" + "SysRequestUrl": "http://sys", + "BasicRequestUrl": "http://basic" }, "DataProtectionOptions": { "Enable": true,