|
@@ -40,8 +40,9 @@ namespace TEAMModelOS.Controllers
|
|
private readonly AzureServiceBusFactory _serviceBus;
|
|
private readonly AzureServiceBusFactory _serviceBus;
|
|
private readonly AzureStorageFactory _azureStorage;
|
|
private readonly AzureStorageFactory _azureStorage;
|
|
private readonly CoreAPIHttpService _coreAPIHttpService;
|
|
private readonly CoreAPIHttpService _coreAPIHttpService;
|
|
|
|
+ private readonly ScsStudyApisService _scsStudyApisService;
|
|
public IConfiguration _configuration { get; set; }
|
|
public IConfiguration _configuration { get; set; }
|
|
- public AbilitySubController(CoreAPIHttpService coreAPIHttpService, AzureStorageFactory azureStorage,AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option, ThirdApisService thirdApisService, HttpTrigger httpTrigge, AzureServiceBusFactory serviceBus, IConfiguration configuration)
|
|
|
|
|
|
+ public AbilitySubController(ScsStudyApisService scsStudyApisService, CoreAPIHttpService coreAPIHttpService, AzureStorageFactory azureStorage,AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option, ThirdApisService thirdApisService, HttpTrigger httpTrigge, AzureServiceBusFactory serviceBus, IConfiguration configuration)
|
|
{
|
|
{
|
|
_azureCosmos = azureCosmos;
|
|
_azureCosmos = azureCosmos;
|
|
_snowflakeId = snowflakeId;
|
|
_snowflakeId = snowflakeId;
|
|
@@ -53,6 +54,7 @@ namespace TEAMModelOS.Controllers
|
|
_configuration = configuration;
|
|
_configuration = configuration;
|
|
_azureStorage = azureStorage;
|
|
_azureStorage = azureStorage;
|
|
_coreAPIHttpService = coreAPIHttpService;
|
|
_coreAPIHttpService = coreAPIHttpService;
|
|
|
|
+ _scsStudyApisService = scsStudyApisService;
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -209,7 +211,7 @@ namespace TEAMModelOS.Controllers
|
|
Teacher teacher = await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Teacher").ReadItemAsync<Teacher>(id, new PartitionKey("Base"));
|
|
Teacher teacher = await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Teacher").ReadItemAsync<Teacher>(id, new PartitionKey("Base"));
|
|
|
|
|
|
|
|
|
|
- var abilitys = await ThirdService.GetDiagnosisList(client, $"{standard}", _dingDing, setting, _httpTrigger, teacher, _option,_azureStorage);
|
|
|
|
|
|
+ var abilitys = await ThirdService.GetDiagnosisList(client, $"{standard}", _dingDing, setting, _scsStudyApisService, teacher, _option,_azureStorage);
|
|
if (abilitys != null)
|
|
if (abilitys != null)
|
|
{
|
|
{
|
|
abilitys.ForEach(x => { x.currency = 1; });
|
|
abilitys.ForEach(x => { x.currency = 1; });
|