Skip to content

E
EduSpider
Commit 872978a1 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 2dbba6a2
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 146 deletions
EduSpider.Repository/StuHomeWorkRepository.cs
View file @ 872978a1
......@@ -83,7 +83,6 @@ WHERE 1=1
{
List<ExamWorkResult> list = new();
var dataList = GetStuHomeWorkDetailsListRepository(new CourseQuery() { CourseId = CourseId });
var courseList = dataList.GroupBy(qitem => new { qitem.course_id,qitem.CourseName }).Select(qitem=>new {qitem.Key.course_id,qitem.Key.CourseName });
if (courseList != null && courseList.Any())
{
......@@ -92,176 +91,179 @@ WHERE 1=1
var stuList = dataList.Where(qitem => qitem.course_id == cItem.course_id).GroupBy(qitem => new { qitem.student_uid }).Select(qitem => new{ qitem.Key.student_uid});
//课程配置评论列表
var courseCommentList =new CourseCommentRepository().GetCourseCommentListRepository(new CourseQuery() { QCourseIds = cItem.course_id.ToString() });
foreach (var sItem in stuList)
var defaultCommentList = new CommentRepository().GetCommentListRepository(new CourseQuery() { KeyWords = cItem.CourseName });
if ((courseCommentList != null && courseCommentList.Count > 0) || (defaultCommentList != null && defaultCommentList.Count > 0))
{
List<ExamWorkResult> homeWorkList = new();
//学员评论列表
var commentList = new StuCommentRepository().GetStuCommentListRepository(new CourseQuery() { CourseId = cItem.course_id, StuIds = sItem.student_uid.ToString() });
var tempDataList = dataList.Where(qitem => qitem.course_id == cItem.course_id && qitem.student_uid == sItem.student_uid).ToList();
if (tempDataList != null && tempDataList.Count > 0)
foreach (var sItem in stuList)
{
int RowNum = 1;
foreach (var item in tempDataList)
List<ExamWorkResult> homeWorkList = new();
//学员评论列表
var commentList = new StuCommentRepository().GetStuCommentListRepository(new CourseQuery() { CourseId = cItem.course_id, StuIds = sItem.student_uid.ToString() });
var tempDataList = dataList.Where(qitem => qitem.course_id == cItem.course_id && qitem.student_uid == sItem.student_uid).ToList();
if (tempDataList != null && tempDataList.Count > 0)
{
homeWorkList.Add(new ExamWorkResult()
int RowNum = 1;
foreach (var item in tempDataList)
{
RowNum = RowNum,
CreateTime = item.add_time,
ResultType = 1,
Title = item.Homework_title,
Score = item.score,
Score_p = item.score_p,
ScoreType = item.score_type,
Score_Value = item.Score_value,
HomeWorkStatus = item.status,
ThName = item.th_name,
Stu_HomeWork_Id = item.stu_homework_id,
});
RowNum++;
homeWorkList.Add(new ExamWorkResult()
{
RowNum = RowNum,
CreateTime = item.add_time,
ResultType = 1,
Title = item.Homework_title,
Score = item.score,
Score_p = item.score_p,
ScoreType = item.score_type,
Score_Value = item.Score_value,
HomeWorkStatus = item.status,
ThName = item.th_name,
Stu_HomeWork_Id = item.stu_homework_id,
});
RowNum++;
}
}
}
string info;
if (homeWorkList != null && homeWorkList.Count > 0)
{
//第一次评价
if (homeWorkList.Count >= 5)
string info;
if (homeWorkList != null && homeWorkList.Count > 0)
{
var firstList = homeWorkList.Where(qitem => qitem.RowNum <= 5).ToList();
var firstSubmitCount = firstList.Where(qitem => qitem.HomeWorkStatus == 0).Count();
//第一阶段有提交作业情况(至少一次)
if (firstList.Count!= firstSubmitCount)
//第一次评价
if (homeWorkList.Count >= 5)
{
var firstScore = firstList.Average(qitem => qitem.Score_p) * 100;
string title = firstList.LastOrDefault().ThName + "老师的评语";
info = GetCommentInfo(courseCommentList,cItem.CourseName,1, firstScore);
if (!string.IsNullOrEmpty(info))
var firstList = homeWorkList.Where(qitem => qitem.RowNum <= 5).ToList();
var firstSubmitCount = firstList.Where(qitem => qitem.HomeWorkStatus == 0).Count();
//第一阶段有提交作业情况(至少一次)
if (firstList.Count != firstSubmitCount)
{
var First_Stu_HomeWork_Id = firstList.LastOrDefault().Stu_HomeWork_Id;
var tempModel = GetSystemCreateComment(commentList, cItem.course_id, First_Stu_HomeWork_Id);
var firstNum = CreateRandomNum();
var firstStartTime = firstList.LastOrDefault().CreateTime;
var secondModel = homeWorkList.Where(qitem => qitem.RowNum == 6).FirstOrDefault();
if (secondModel != null)
{
var newSeconds = CreateRandomSecondNum(firstStartTime, secondModel.CreateTime);
firstStartTime = firstStartTime.AddSeconds(newSeconds);
}
else
{
firstStartTime = firstStartTime.AddMinutes(firstNum);
}
if (tempModel == null || (tempModel != null && tempModel.Id <= 0))
var firstScore = firstList.Average(qitem => qitem.Score_p) * 100;
string title = firstList.LastOrDefault().ThName + "老师的评语";
info = GetCommentInfo(courseCommentList, cItem.CourseName, 1, firstScore);
if (!string.IsNullOrEmpty(info))
{
//新增系统生成评价
new StuCommentRepository().SetStuCommentRepository(new RB_Stu_Comment()
var First_Stu_HomeWork_Id = firstList.LastOrDefault().Stu_HomeWork_Id;
var tempModel = GetSystemCreateComment(commentList, cItem.course_id, First_Stu_HomeWork_Id);
var firstNum = CreateRandomNum();
var firstStartTime = firstList.LastOrDefault().CreateTime;
var secondModel = homeWorkList.Where(qitem => qitem.RowNum == 6).FirstOrDefault();
if (secondModel != null)
{
var newSeconds = CreateRandomSecondNum(firstStartTime, secondModel.CreateTime);
firstStartTime = firstStartTime.AddSeconds(newSeconds);
}
else
{
Id = 0,
StartHomeWorkId = firstList.FirstOrDefault().Stu_HomeWork_Id,
HomeWorkId = First_Stu_HomeWork_Id,
StuUid = Convert.ToInt32(sItem.student_uid),
CourseId = cItem.course_id,
Times = 1,
Info = info,
CreateType = 1,
CreateByName = firstList.LastOrDefault().ThName,
CreateTime = firstStartTime,
ShowType = 3,
});
firstStartTime = firstStartTime.AddMinutes(firstNum);
}
if (tempModel == null || (tempModel != null && tempModel.Id <= 0))
{
//新增系统生成评价
new StuCommentRepository().SetStuCommentRepository(new RB_Stu_Comment()
{
Id = 0,
StartHomeWorkId = firstList.FirstOrDefault().Stu_HomeWork_Id,
HomeWorkId = First_Stu_HomeWork_Id,
StuUid = Convert.ToInt32(sItem.student_uid),
CourseId = cItem.course_id,
Times = 1,
Info = info,
CreateType = 1,
CreateByName = firstList.LastOrDefault().ThName,
CreateTime = firstStartTime,
ShowType = 3,
});
}
}
}
}
}
//第二次评价
if (homeWorkList.Count >= 9)
{
var secondList = homeWorkList.Where(qitem => qitem.RowNum > 5 && qitem.RowNum <= 9).ToList();
var secondSubmitCount = secondList.Where(qitem => qitem.HomeWorkStatus == 0).Count();
//第二阶段有提交作业情况(至少一次)
if (secondList.Count!= secondSubmitCount)
//第二次评价
if (homeWorkList.Count >= 9)
{
var secondScore = secondList.Average(qitem => qitem.Score_p) * 100;
info = GetCommentInfo(courseCommentList, cItem.CourseName, 2, secondScore);
if (!string.IsNullOrEmpty(info))
var secondList = homeWorkList.Where(qitem => qitem.RowNum > 5 && qitem.RowNum <= 9).ToList();
var secondSubmitCount = secondList.Where(qitem => qitem.HomeWorkStatus == 0).Count();
//第二阶段有提交作业情况(至少一次)
if (secondList.Count != secondSubmitCount)
{
var Second_Stu_HomeWork_Id = secondList.LastOrDefault().Stu_HomeWork_Id;
var secondModel = GetSystemCreateComment(commentList, cItem.course_id, Second_Stu_HomeWork_Id);
var secondNum = CreateRandomNum();
var secondTime = secondList.LastOrDefault().CreateTime;
var thirdModel = homeWorkList.Where(qitem => qitem.RowNum == 10).FirstOrDefault();
if (thirdModel != null)
var secondScore = secondList.Average(qitem => qitem.Score_p) * 100;
info = GetCommentInfo(courseCommentList, cItem.CourseName, 2, secondScore);
if (!string.IsNullOrEmpty(info))
{
var newSeconds = CreateRandomSecondNum(secondTime, thirdModel.CreateTime);
secondTime = secondTime.AddSeconds(newSeconds);
}
else
{
secondTime = secondTime.AddMinutes(secondNum);
}
var Second_Stu_HomeWork_Id = secondList.LastOrDefault().Stu_HomeWork_Id;
var secondModel = GetSystemCreateComment(commentList, cItem.course_id, Second_Stu_HomeWork_Id);
var secondNum = CreateRandomNum();
var secondTime = secondList.LastOrDefault().CreateTime;
var thirdModel = homeWorkList.Where(qitem => qitem.RowNum == 10).FirstOrDefault();
if (thirdModel != null)
{
var newSeconds = CreateRandomSecondNum(secondTime, thirdModel.CreateTime);
secondTime = secondTime.AddSeconds(newSeconds);
}
else
{
secondTime = secondTime.AddMinutes(secondNum);
}
if (secondModel == null || (secondModel != null && secondModel.Id <= 0))
{
new StuCommentRepository().SetStuCommentRepository(new RB_Stu_Comment()
if (secondModel == null || (secondModel != null && secondModel.Id <= 0))
{
Id = 0,
StartHomeWorkId = secondList.FirstOrDefault().Stu_HomeWork_Id,
HomeWorkId = Second_Stu_HomeWork_Id,
StuUid = Convert.ToInt32(sItem.student_uid),
CourseId = cItem.course_id,
Times = 2,
Info = info,
CreateType = 1,
CreateByName = secondList.LastOrDefault().ThName,
CreateTime = secondTime,
ShowType = 3,
});
new StuCommentRepository().SetStuCommentRepository(new RB_Stu_Comment()
{
Id = 0,
StartHomeWorkId = secondList.FirstOrDefault().Stu_HomeWork_Id,
HomeWorkId = Second_Stu_HomeWork_Id,
StuUid = Convert.ToInt32(sItem.student_uid),
CourseId = cItem.course_id,
Times = 2,
Info = info,
CreateType = 1,
CreateByName = secondList.LastOrDefault().ThName,
CreateTime = secondTime,
ShowType = 3,
});
}
}
}
}
}
//第三次评价
if (homeWorkList.Count >= 13)
{
var thirdList = homeWorkList.Where(qitem => qitem.RowNum > 9 && qitem.RowNum <= 13).ToList();
var thirdSubmitCount = thirdList.Where(qitem => qitem.HomeWorkStatus == 0).Count();
//第三阶段有提交作业情况(至少一次)
if (thirdList.Count!= thirdSubmitCount)
//第三次评价
if (homeWorkList.Count >= 13)
{
var thirdScore = thirdList.Average(qitem => qitem.Score_p) * 100;
info = GetCommentInfo(courseCommentList, cItem.CourseName, 3, thirdScore);
if (!string.IsNullOrEmpty(info))
var thirdList = homeWorkList.Where(qitem => qitem.RowNum > 9 && qitem.RowNum <= 13).ToList();
var thirdSubmitCount = thirdList.Where(qitem => qitem.HomeWorkStatus == 0).Count();
//第三阶段有提交作业情况(至少一次)
if (thirdList.Count != thirdSubmitCount)
{
var Third_Stu_HomeWork_Id = thirdList.LastOrDefault().Stu_HomeWork_Id;
var thirdModel = GetSystemCreateComment(commentList, cItem.course_id, Third_Stu_HomeWork_Id);
var thirdNum = CreateRandomNum();
var thirdTime = thirdList.LastOrDefault().CreateTime;
var fourthModel = homeWorkList.Where(qitem => qitem.RowNum == 14).FirstOrDefault();
if (fourthModel != null)
{
var newSeconds = CreateRandomSecondNum(thirdTime, fourthModel.CreateTime);
thirdTime = thirdTime.AddSeconds(newSeconds);
}
else
var thirdScore = thirdList.Average(qitem => qitem.Score_p) * 100;
info = GetCommentInfo(courseCommentList, cItem.CourseName, 3, thirdScore);
if (!string.IsNullOrEmpty(info))
{
thirdTime = thirdTime.AddMinutes(thirdNum);
}
if (thirdModel == null || (thirdModel != null && thirdModel.Id <= 0))
{
new StuCommentRepository().SetStuCommentRepository(new RB_Stu_Comment()
var Third_Stu_HomeWork_Id = thirdList.LastOrDefault().Stu_HomeWork_Id;
var thirdModel = GetSystemCreateComment(commentList, cItem.course_id, Third_Stu_HomeWork_Id);
var thirdNum = CreateRandomNum();
var thirdTime = thirdList.LastOrDefault().CreateTime;
var fourthModel = homeWorkList.Where(qitem => qitem.RowNum == 14).FirstOrDefault();
if (fourthModel != null)
{
var newSeconds = CreateRandomSecondNum(thirdTime, fourthModel.CreateTime);
thirdTime = thirdTime.AddSeconds(newSeconds);
}
else
{
thirdTime = thirdTime.AddMinutes(thirdNum);
}
if (thirdModel == null || (thirdModel != null && thirdModel.Id <= 0))
{
Id = 0,
StartHomeWorkId = thirdList.FirstOrDefault().Stu_HomeWork_Id,
HomeWorkId = Third_Stu_HomeWork_Id,
StuUid = Convert.ToInt32(sItem.student_uid),
CourseId = cItem.course_id,
Times = 3,
Info = info,
CreateType = 1,
CreateByName = thirdList.LastOrDefault().ThName,
CreateTime = thirdList.LastOrDefault().CreateTime.AddMinutes(thirdNum),
ShowType = 3,
});
new StuCommentRepository().SetStuCommentRepository(new RB_Stu_Comment()
{
Id = 0,
StartHomeWorkId = thirdList.FirstOrDefault().Stu_HomeWork_Id,
HomeWorkId = Third_Stu_HomeWork_Id,
StuUid = Convert.ToInt32(sItem.student_uid),
CourseId = cItem.course_id,
Times = 3,
Info = info,
CreateType = 1,
CreateByName = thirdList.LastOrDefault().ThName,
CreateTime = thirdList.LastOrDefault().CreateTime.AddMinutes(thirdNum),
ShowType = 3,
});
}
}
}
}
......
EduSpider.WebApi/Controllers/User/LoginController.cs
View file @ 872978a1
......@@ -30,6 +30,18 @@ namespace EduSpider.WebApi.Controllers
[Autowired]
public IAccountService AccountService { get; set; }
/// <summary>
/// 心跳检测
/// </summary>
/// <returns></returns>
[HttpGet]
[HttpPost]
[AllowAnonymous]
public ApiResult Heart()
{
return ApiResult.Success();
}
#region 账号密码登录
/// <summary>
/// 账号密码登录
......
EduSpider.WebApi/Startup.cs
View file @ 872978a1
using Autofac;
using Edu.WebApi.Filter;
using EduSpider.WebApi.Timers;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Controllers;
......@@ -49,6 +50,7 @@ namespace EduSpider.WebApi
options.JsonSerializerOptions.Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All);
options.JsonSerializerOptions.PropertyNamingPolicy = null;
});
services.AddHostedService<TimedTaskServices>();
}
/// <summary>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment