|
@@ -32,7 +32,8 @@ namespace TEAMModelOS.Controllers
|
|
|
private readonly Option _option;
|
|
|
private readonly HttpTrigger _httpTrigger;
|
|
|
private readonly AzureStorageFactory _azureStorage;
|
|
|
- public AbilityController(AzureStorageFactory azureStorage,HttpTrigger httpTrigger, AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option)
|
|
|
+ private readonly ScsStudyApisService _scsStudyApisService;
|
|
|
+ public AbilityController(ScsStudyApisService scsStudyApisService, AzureStorageFactory azureStorage,HttpTrigger httpTrigger, AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option)
|
|
|
{
|
|
|
_azureStorage= azureStorage;
|
|
|
_azureCosmos = azureCosmos;
|
|
@@ -40,6 +41,7 @@ namespace TEAMModelOS.Controllers
|
|
|
_dingDing = dingDing;
|
|
|
_option = option?.Value;
|
|
|
_httpTrigger = httpTrigger;
|
|
|
+ _scsStudyApisService = scsStudyApisService;
|
|
|
}
|
|
|
/*
|
|
|
{"abilityId":"册别id:0baf00db-0768-4b62-a8f7-280f6bcebf71","scope":"school","abilityCode":"册别分区键"}
|
|
@@ -214,7 +216,8 @@ namespace TEAMModelOS.Controllers
|
|
|
List<ScSchool> schools = await table.FindListByDict<ScSchool>(new Dictionary<string, object>() { { "PartitionKey", "ScSchool" }, { "schoolCode", $"{_code}" } });
|
|
|
if (schools.IsNotEmpty()) {
|
|
|
Dictionary<string, object> dict = new() { { "accessConfig", accessConfig },{ "schoolCode",$"{schools[0].schoolid}"}, { "areaId", setting.id } };
|
|
|
- (int status, string json) = await _httpTrigger.RequestHttpTrigger(dict, _option.Location, "GetSchoolDiagnosis");
|
|
|
+ //(int status, string json) = await _httpTrigger.RequestHttpTrigger(dict, _option.Location, "GetSchoolDiagnosis");
|
|
|
+ (int status, string json) = await _scsStudyApisService.GetSchoolDiagnosis(setting.id, accessConfig,$"{schools[0].schoolid}");
|
|
|
if (status == 200)
|
|
|
{
|
|
|
List<ScsProjectDiagnosis> projectDiagnoses = json.ToObject<List<ScsProjectDiagnosis>>(new JsonSerializerOptions { PropertyNameCaseInsensitive = false });
|