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