yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
liguoyang
2024-02-21 16:26:15 +08:00
parent c92c43a86d 7fb913764e
commit 82644f5e8a
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncOrganizationJob.cs
View File

@@ -28,11 +28,11 @@ public class SyncOrganizationJob
if (orgResult.Org != null && orgResult.Org.Items.Count > 0) if (orgResult.Org != null && orgResult.Org.Items.Count > 0)
{ {
var modifiedOrgList = GetModifiedOrg(orgResult.Org?.Items); //var modifiedOrgList = GetModifiedOrg(orgResult.Org.Items);
await SaveOrg(modifiedOrgList); await SaveOrg(orgResult.Org.Items);
} }
var syncPositionJob = BackgroundJob.ContinueJobWith<SyncPositionJob>("SyncOrganizationJob", job => job.SyncPositionInfo(), JobContinuationOptions.OnlyOnSucceededState); var syncPositionJob = BackgroundJob.Enqueue<SyncPositionJob>(job => job.SyncPositionInfo());
BackgroundJob.ContinueJobWith<SyncPersonJob>(syncPositionJob, job => job.SyncPersonInfo(), JobContinuationOptions.OnlyOnSucceededState); BackgroundJob.ContinueJobWith<SyncPersonJob>(syncPositionJob, job => job.SyncPersonInfo(), JobContinuationOptions.OnlyOnSucceededState);
} }
@@ -49,8 +49,6 @@ public class SyncOrganizationJob
private async Task SaveOrg(List<SapOrganizationItem> modifiedOrgList) private async Task SaveOrg(List<SapOrganizationItem> modifiedOrgList)
{ {
if (modifiedOrgList == null || modifiedOrgList.Count == 0) return;
foreach (SapOrganizationItem item in modifiedOrgList) foreach (SapOrganizationItem item in modifiedOrgList)
{ {
var department = await _dbContext.Queryable<DepartmentEntity>().Where(x => x.No == item.OBJID).FirstAsync(); var department = await _dbContext.Queryable<DepartmentEntity>().Where(x => x.No == item.OBJID).FirstAsync();

2
Src/Dlhis.ScheduledTask/SyncSapInfo/Services/Implements/JinkoSapService.cs
View File

@@ -23,9 +23,9 @@ public class JinkoSapService : IJinkoSapService
private HttpClient GetHttpClient() private HttpClient GetHttpClient()
{ {
var httpClient = _httpClientFactory.CreateClient("jinko:sap"); var httpClient = _httpClientFactory.CreateClient("jinko:sap");
//http://sappidap.jinkosolar.cn:51000
httpClient.BaseAddress = new Uri("http://sappipap01.jinkosolar.cn:50100"); httpClient.BaseAddress = new Uri("http://sappipap01.jinkosolar.cn:50100");
httpClient.Timeout = TimeSpan.FromMinutes(10); httpClient.Timeout = TimeSpan.FromMinutes(10);
var credentials = string.Format("{0}:{1}", "EHS_USER", "y3R1hd2h*RICAC"); var credentials = string.Format("{0}:{1}", "EHS_USER", "y3R1hd2h*RICAC");
var headerValue = Convert.ToBase64String(Encoding.UTF8.GetBytes(credentials)); var headerValue = Convert.ToBase64String(Encoding.UTF8.GetBytes(credentials));
httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", headerValue); httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", headerValue);