marking
/
Learn.VideoAnalysis
19
0
Fork 0
Code Pull Requests Actions Releases Activity

优化 查询切片的接口返回参数

This commit is contained in:
小肥羊 2026-04-17 18:15:50 +08:00
parent 63041cd019
commit 36f719370b
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
VideoAnalysisCore/Controllers/Dto/ApiDto.cs
View File

@ -425,7 +425,7 @@ namespace VideoAnalysisCore.Controllers.Dto
/// <summary>
/// 年份
/// </summary>
public GradeEnum? GradeId { get; set; }
public string? GradeId { get; set; }
/// <summary>
/// 开始时间
@ -446,7 +446,7 @@ namespace VideoAnalysisCore.Controllers.Dto
/// <summary>
/// 课程阶段
/// </summary>
public virtual StageEnum? Stage { get; set; }
public virtual string? Stage { get; set; }
/// <summary>
/// 视频所属云校ID
/// <para><see cref="UserCenter.Model.CloudSchool"/> 用户中心的云校id</para>

38
VideoAnalysisCore/Controllers/LJZK_Controller.cs
View File

@ -123,12 +123,12 @@ namespace VideoAnalysisCore.Controllers
VideoUrl = s.VideoUrl,
CourseType = s.CourseType,
CallBackUrl = s.CallBackUrl,
CloudSchoolId =s.UserCenterCloudSchoolId,
CloudSchoolId = s.UserCenterCloudSchoolId,
Area = s.Area,
HostIP = s.HostIP,
StageId = s.StageId,
GradeId = s.GradeId,
GradeYear = s.Trem==0?null : s.Trem,
GradeYear = s.Trem == 0 ? null : s.Trem,
GradeSemester = s.GradeSemester,
TextBookVersionId = s.TextBookVersionId,
};
@ -151,8 +151,8 @@ namespace VideoAnalysisCore.Controllers
VideoType = s.CourseType,
CloudSchoolId = s.UserCenterCloudSchoolId,
TextBookVersionId = s.TextBookVersionId,
GradeSemester =s .GradeSemester,
CourseLevel =s.CourseLevel,
GradeSemester = s.GradeSemester,
CourseLevel = s.CourseLevel,
GradeId = s.GradeId,
GradeYear = np.GradeYear,
});
@ -207,7 +207,7 @@ namespace VideoAnalysisCore.Controllers
/// <param name="taskId">自定义id</param>
/// <returns></returns>
[HttpGet(Name = "TaskKnowInfo")]
public async Task<IActionResult> TaskKnowInfo(string? tagId , string? taskId)
public async Task<IActionResult> TaskKnowInfo(string? tagId, string? taskId)
{
if (string.IsNullOrEmpty(tagId) && !string.IsNullOrEmpty(taskId))
tagId = taskId;
@ -261,12 +261,12 @@ namespace VideoAnalysisCore.Controllers
Theme = s.Theme,
Know = videoKnowDic.ContainsKey(s.Id)
? videoKnowDic[s.Id]?.Select(x => new TaskKnowInfo()
{
Id = x.Id,
KnowPoint = x.KnowPoint,
KnowPointId = x.KnowPointId,
KnowWeight = x.KnowPointWeight??0f,
})?.ToArray()
{
Id = x.Id,
KnowPoint = x.KnowPoint,
KnowPointId = x.KnowPointId,
KnowWeight = x.KnowPointWeight ?? 0f,
})?.ToArray()
: null
}).ToArray()
};
@ -312,11 +312,11 @@ namespace VideoAnalysisCore.Controllers
stageQuery = stageQuery.WhereIF(!string.IsNullOrWhiteSpace(req.Content), s => s.Content.Contains(req.Content));
var pageIndex = req.PageIndex < 0 ? 0 : req.PageIndex;
var pageSize = req.PageSize <= 0 ? 50 : req.PageSize > 100 ?100 : req.PageSize;
var pageSize = req.PageSize <= 0 ? 50 : req.PageSize > 100 ? 100 : req.PageSize;
string[]? knowArr = null;
if (req.KnowPointStrArr is not null && req.KnowPointStrArr.Length > 0)
{
knowArr = req.KnowPointStrArr.Where(s => !string.IsNullOrWhiteSpace(s)).Select(s=>s.Trim()).Distinct().ToArray();
knowArr = req.KnowPointStrArr.Where(s => !string.IsNullOrWhiteSpace(s)).Select(s => s.Trim()).Distinct().ToArray();
if (knowArr.Length > 0)
{
stageQuery = stageQuery.Where(s => SqlFunc.Subqueryable<VideoKonwPoint>()
@ -333,7 +333,7 @@ namespace VideoAnalysisCore.Controllers
var taskIdArr = stagePageArr.Select(s => s.VideoTaskId).ToArray();
var kpQuery = videoKonwPointDB.AsQueryable()
.Where(s => taskIdArr.Contains(s.VideoTaskId) && s.KnowPointId != null);
if (knowArr !=null && knowArr.Length > 0)
if (knowArr != null && knowArr.Length > 0)
kpQuery = kpQuery.Where(s => knowArr.Contains(s.KnowPointId));
var kpArr = await kpQuery
@ -357,8 +357,8 @@ namespace VideoAnalysisCore.Controllers
EndTime = s.EndTime,
Theme = s.Theme,
CloudSchoolId = s.CloudSchoolId,
Stage=s.Stage,
GradeId = s.GradeId,
Stage = s.Stage.ToString(),
GradeId = s.GradeId.ToString(),
GradeYear = s.GradeYear?.ToString(),
//PreviewUrl= videoInfoRes.ContainsKey(s.VideoTaskId.ToString())? videoInfoRes[] :
KnowPoints = kpDic.ContainsKey(s.Id) ? kpDic[s.Id] : []
@ -382,9 +382,9 @@ namespace VideoAnalysisCore.Controllers
[HttpGet(Name = "GetVideoURL")]
public async Task<IActionResult> GetVideoURL(long videoTaskId)
{
if (videoTaskId ==0)
if (videoTaskId == 0)
return BadRequest("参数不能为空");
var task =await videoTaskDB.GetByIdAsync(videoTaskId);
var task = await videoTaskDB.GetByIdAsync(videoTaskId);
if (task is null)
return BadRequest("参数无效");
try
@ -401,7 +401,7 @@ namespace VideoAnalysisCore.Controllers
return Ok(videoInfo.Body.PlayInfoList.PlayInfo.First().PlayURL);
}
catch (Exception ex )
catch (Exception ex)
{
return BadRequest("获取存储的视频信息失败!" + ex.Message);