change showStatus signalR
This commit is contained in:
@@ -961,7 +961,9 @@ public class InstitutionContractSmsServiceRepository : RepositoryBase<long, Inst
|
|||||||
}
|
}
|
||||||
int successProcess = 1;
|
int successProcess = 1;
|
||||||
int countList = smsListData.Count;
|
int countList = smsListData.Count;
|
||||||
|
List<string> failedNumberList = [];
|
||||||
|
int successSend = 0;
|
||||||
|
int failedSend = 0;
|
||||||
foreach (var item in smsListData)
|
foreach (var item in smsListData)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -976,7 +978,7 @@ public class InstitutionContractSmsServiceRepository : RepositoryBase<long, Inst
|
|||||||
item.PartyName, item.PhoneNumber, item.ContractingPartyId, item.InstitutionContractId);
|
item.PartyName, item.PhoneNumber, item.ContractingPartyId, item.InstitutionContractId);
|
||||||
await _smsResultRepository.CreateAsync(createSmsResult);
|
await _smsResultRepository.CreateAsync(createSmsResult);
|
||||||
await _smsResultRepository.SaveChangesAsync();
|
await _smsResultRepository.SaveChangesAsync();
|
||||||
await signalR.SendAsync("sendStatus", true, item.PhoneNumber);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -988,29 +990,31 @@ public class InstitutionContractSmsServiceRepository : RepositoryBase<long, Inst
|
|||||||
item.PartyName, item.PhoneNumber, item.ContractingPartyId, item.InstitutionContractId);
|
item.PartyName, item.PhoneNumber, item.ContractingPartyId, item.InstitutionContractId);
|
||||||
await _smsResultRepository.CreateAsync(createSmsResult);
|
await _smsResultRepository.CreateAsync(createSmsResult);
|
||||||
await _smsResultRepository.SaveChangesAsync();
|
await _smsResultRepository.SaveChangesAsync();
|
||||||
await signalR.SendAsync("sendStatus", true, item.PhoneNumber);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
successSend += 1;
|
||||||
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
string name = item.PartyName.Length > 18 ? item.PartyName.Substring(0, 18) : item.PartyName;
|
string name = item.PartyName.Length > 18 ? item.PartyName.Substring(0, 18) : item.PartyName;
|
||||||
string errMess = $"{name}-خطا";
|
string errMess = $"{name}-خطا";
|
||||||
await signalR.SendAsync("sendStatus", false, item.PhoneNumber);
|
failedNumberList.Add(item.PhoneNumber);
|
||||||
|
failedSend += 1;
|
||||||
await _smsService.Alarm("09114221321", errMess);
|
await _smsService.Alarm("09114221321", errMess);
|
||||||
}
|
}
|
||||||
|
|
||||||
Thread.Sleep(600);
|
Thread.Sleep(600);
|
||||||
var percent = (successProcess / (double)countList) * 100;
|
var percent = (successProcess / (double)countList) * 100;
|
||||||
await signalR.SendAsync("showStatus", (int)percent);
|
await signalR.SendAsync("showStatus", countList, failedSend, successSend,(int)percent, failedNumberList);
|
||||||
|
|
||||||
successProcess += 1;
|
successProcess += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
await _smsService.Alarm("09114221321", sendMessEnd);
|
await _smsService.Alarm("09114221321", sendMessEnd);
|
||||||
Thread.Sleep(1000);
|
|
||||||
await _smsService.Alarm("09111485044", sendMessEnd);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2140,19 +2144,9 @@ public class InstitutionContractSmsServiceRepository : RepositoryBase<long, Inst
|
|||||||
|
|
||||||
int successProcess = 1;
|
int successProcess = 1;
|
||||||
int countList = smsListData.Count;
|
int countList = smsListData.Count;
|
||||||
|
List<string> failedNumberList = [];
|
||||||
#region Test
|
int successSend = 0;
|
||||||
|
int failedSend = 0;
|
||||||
|
|
||||||
//for (int i = 0; i < 100; i++)
|
|
||||||
//{
|
|
||||||
// var percent = (successProcess / (double)countList) * 100;
|
|
||||||
// await _hubContext.Clients.Group(SendSmsHub.GetGroupName(7))
|
|
||||||
// .SendAsync("showStatus", (int)percent);
|
|
||||||
// Thread.Sleep(1000);
|
|
||||||
// successProcess += 1;
|
|
||||||
//}
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
foreach (var item in smsListData)
|
foreach (var item in smsListData)
|
||||||
{
|
{
|
||||||
@@ -2167,14 +2161,12 @@ public class InstitutionContractSmsServiceRepository : RepositoryBase<long, Inst
|
|||||||
|
|
||||||
if (res.isSucceded)
|
if (res.isSucceded)
|
||||||
{
|
{
|
||||||
|
|
||||||
var createSmsResult = new Company.Domain.SmsResultAgg.SmsResult(res.messaeId,
|
var createSmsResult = new Company.Domain.SmsResultAgg.SmsResult(res.messaeId,
|
||||||
res.message, typeOfSms, item.PartyName, item.PhoneNumber,
|
res.message, typeOfSms, item.PartyName, item.PhoneNumber,
|
||||||
item.ContractingPartyId, item.InstitutionContractId);
|
item.ContractingPartyId, item.InstitutionContractId);
|
||||||
|
|
||||||
await _smsResultRepository.CreateAsync(createSmsResult);
|
await _smsResultRepository.CreateAsync(createSmsResult);
|
||||||
await _smsResultRepository.SaveChangesAsync();
|
await _smsResultRepository.SaveChangesAsync();
|
||||||
await signalR.SendAsync("sendStatus", true, item.PhoneNumber);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -2183,30 +2175,28 @@ public class InstitutionContractSmsServiceRepository : RepositoryBase<long, Inst
|
|||||||
item.Amount, item.Code1, item.Code2);
|
item.Amount, item.Code1, item.Code2);
|
||||||
if (res.isSucceded)
|
if (res.isSucceded)
|
||||||
{
|
{
|
||||||
|
|
||||||
var createSmsResult = new Company.Domain.SmsResultAgg.SmsResult(res.messaeId,
|
var createSmsResult = new Company.Domain.SmsResultAgg.SmsResult(res.messaeId,
|
||||||
res.message, typeOfSms, item.PartyName, item.PhoneNumber,
|
res.message, typeOfSms, item.PartyName, item.PhoneNumber,
|
||||||
item.ContractingPartyId, item.InstitutionContractId);
|
item.ContractingPartyId, item.InstitutionContractId);
|
||||||
|
|
||||||
await _smsResultRepository.CreateAsync(createSmsResult);
|
await _smsResultRepository.CreateAsync(createSmsResult);
|
||||||
await _smsResultRepository.SaveChangesAsync();
|
await _smsResultRepository.SaveChangesAsync();
|
||||||
await signalR.SendAsync("sendStatus", true, item.PhoneNumber);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
successSend += 1;
|
||||||
Thread.Sleep(600);
|
Thread.Sleep(600);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
string name = item.PartyName.Length > 18 ? item.PartyName.Substring(0, 18) : item.PartyName;
|
string name = item.PartyName.Length > 18 ? item.PartyName.Substring(0, 18) : item.PartyName;
|
||||||
string errMess = $"{name}-خطا";
|
string errMess = $"{name}-خطا";
|
||||||
await signalR.SendAsync("sendStatus", false, item.PhoneNumber);
|
failedNumberList.Add(item.PhoneNumber);
|
||||||
|
failedSend += 1;
|
||||||
_logger.LogError(errMess);
|
_logger.LogError(errMess);
|
||||||
await _smsService.Alarm("09114221321", errMess);
|
await _smsService.Alarm("09114221321", errMess);
|
||||||
}
|
}
|
||||||
|
|
||||||
var percent = (successProcess / (double)countList) * 100;
|
var percent = (successProcess / (double)countList) * 100;
|
||||||
await signalR.SendAsync("showStatus", (int)percent);
|
await signalR.SendAsync("showStatus", countList, failedSend, successSend, (int)percent, failedNumberList);
|
||||||
|
|
||||||
successProcess += 1;
|
successProcess += 1;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user