|
@@ -651,10 +651,11 @@ namespace TEAMModelBI.Controllers.BITmid
|
|
bool dateFromToValid = (!string.IsNullOrWhiteSpace(dateFromStr) && !string.IsNullOrWhiteSpace(dateToStr)) ? true : false;
|
|
bool dateFromToValid = (!string.IsNullOrWhiteSpace(dateFromStr) && !string.IsNullOrWhiteSpace(dateToStr)) ? true : false;
|
|
bool dateListValid = (dateList.Count > 0) ? true : false;
|
|
bool dateListValid = (dateList.Count > 0) ? true : false;
|
|
if (dateFromToValid.Equals(false) && dateListValid.Equals(false)) return BadRequest();
|
|
if (dateFromToValid.Equals(false) && dateListValid.Equals(false)) return BadRequest();
|
|
- List<string> targets = (jsonElement.TryGetProperty("targets", out JsonElement targetsJobj)) ? targetsJobj.ToObject<List<string>>() : new List<string>() {"tmid", "sch", "geo" }; //查詢日期:起始(string)[例]2023-03-05
|
|
|
|
- if(dateFromToValid)
|
|
|
|
|
|
+ List<string> targets = (jsonElement.TryGetProperty("targets", out JsonElement targetsJobj)) ? targetsJobj.ToObject<List<string>>() : new List<string>() {"tmid", "sch", "geo" }; //資料取得 "tmid":必定會取 "sch":學校資訊 "geo":地理資訊
|
|
|
|
+ bool getLoginTime = (jsonElement.TryGetProperty("getLoginTime", out JsonElement getLoginTimeJobj)) ? getLoginTimeJobj.GetBoolean() : false; //是否取得各服務Login時間
|
|
|
|
+ if (dateFromToValid)
|
|
{
|
|
{
|
|
- object result = await GetTmidUseprodCore(dateFromStr, dateToStr, targets, false);
|
|
|
|
|
|
+ object result = await GetTmidUseprodCore(dateFromStr, dateToStr, targets, getLoginTime);
|
|
return Ok(result);
|
|
return Ok(result);
|
|
}
|
|
}
|
|
else if(dateListValid)
|
|
else if(dateListValid)
|
|
@@ -664,7 +665,7 @@ namespace TEAMModelBI.Controllers.BITmid
|
|
{
|
|
{
|
|
string dateFrom = dateFromTo.dateFrom;
|
|
string dateFrom = dateFromTo.dateFrom;
|
|
string dateTo = dateFromTo.dateTo;
|
|
string dateTo = dateFromTo.dateTo;
|
|
- object tmidUseprod = await GetTmidUseprodCore(dateFrom, dateTo, targets, false);
|
|
|
|
|
|
+ object tmidUseprod = await GetTmidUseprodCore(dateFrom, dateTo, targets, getLoginTime);
|
|
result.Add(tmidUseprod);
|
|
result.Add(tmidUseprod);
|
|
}
|
|
}
|
|
return Ok(result);
|
|
return Ok(result);
|