Skip to content

E
EduSpider
Commit 42b6cd69 authored by 黄奎's avatar 黄奎
Browse files
Options

111

parent 4b9dd836
Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 228 deletions
EduSpider.Model/Entity/RB_Course.cs
View file @ 42b6cd69
......@@ -14,116 +14,116 @@ namespace EduSpider.Model.Entity
/// <summary>
/// 课程编号
/// </summary>
public int courseId { get; set; }
public int CourseId { get; set; }
/// <summary>
/// 课程名称
/// </summary>
public string courseName { get; set; }
public string CourseName { get; set; }
/// <summary>
/// 首次课日期
/// </summary>
public DateTime? beginTime { get; set; }
public DateTime BeginTime { get; set; }
/// <summary>
/// 完成次数
/// </summary>
public int? completeNum { get; set; }
public int CompleteNum { get; set; }
/// <summary>
/// 总次数
/// </summary>
public int? totalClassNum { get; set; }
public int TotalClassNum { get; set; }
/// <summary>
/// 有效日期
/// </summary>
public DateTime? expiryTime { get; set; }
public DateTime? ExpiryTime { get; set; }
/// <summary>
/// 直播数
/// </summary>
public int? liveNum { get; set; }
public int? LiveNum { get; set; }
/// <summary>
/// 录课数
/// </summary>
public int? recordNum { get; set; }
public int? RecordNum { get; set; }
/// <summary>
/// 回放数
/// </summary>
public int? openNum { get; set; }
public int? OpenNum { get; set; }
/// <summary>
/// 学生数
/// </summary>
public int? studentNum { get; set; }
public int? StudentNum { get; set; }
/// <summary>
/// 旁听数
/// </summary>
public int? auditNum { get; set; }
public int AuditNum { get; set; }
/// <summary>
/// 教师数
/// </summary>
public int? teacherNum { get; set; }
public int TeacherNum { get; set; }
/// <summary>
/// 课程状态(1-未结课，课程进度未完成,3-已结课)
/// </summary>
public int courseStatus { get; set; }
public int CourseStatus { get; set; }
/// <summary>
/// 回放地址
/// </summary>
public string webCast { get; set; }
public string WebCast { get; set; }
/// <summary>
/// 班主任编号
/// </summary>
public int? teacherId { get; set; }
public int TeacherId { get; set; }
/// <summary>
/// 班主任账号
/// </summary>
public string teacherAccount { get; set; }
public string TeacherAccount { get; set; }
/// <summary>
/// 班主任账号Id
/// </summary>
public int? teacherUid { get; set; }
public int? TeacherUid { get; set; }
/// <summary>
/// 班主任姓名
/// </summary>
public string teacherName { get; set; }
public string TeacherName { get; set; }
/// <summary>
/// 班主任头像
/// </summary>
public string teacherLogo { get; set; }
public string TeacherLogo { get; set; }
/// <summary>
/// 课程类型(1-标准课，公开课)
/// </summary>
public int courseType { get; set; }
public int CourseType { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime addTime { get; set; }
public DateTime AddTime { get; set; }
/// <summary>
/// 课程图片
/// </summary>
public string courseWare { get; set; }
public string CourseWare { get; set; }
/// <summary>
/// 封面图
/// </summary>
public string coverImg { get; set; }
public string CoverImg { get; set; }
}
}
EduSpider.Model/Entity/RB_HomeWork.cs
View file @ 42b6cd69
......@@ -13,156 +13,156 @@ namespace EduSpider.Model.Entity
/// <summary>
/// 作业编号
/// </summary>
public int homework_id { get; set; }
public int Homework_id { get; set; }
/// <summary>
/// 作业标题
/// </summary>
public string homework_title { get; set; }
public string Homework_title { get; set; }
/// <summary>
/// 作业分享Key
/// </summary>
public string homework_share_key { get; set; }
public string Homework_share_key { get; set; }
/// <summary>
/// 课程编号
/// </summary>
public int course_id { get; set; }
public int Course_id { get; set; }
/// <summary>
/// 课程名称
/// </summary>
public string course_name { get; set; }
public string Course_name { get; set; }
/// <summary>
/// 作业开始时间
/// </summary>
public DateTime start_time { get; set; }
public DateTime Start_time { get; set; }
/// <summary>
/// 作业结束时间
/// </summary>
public DateTime end_time { get; set; }
public DateTime End_time { get; set; }
/// <summary>
/// 作业状态(0-未开始，1-进行中，2-已结束)
/// </summary>
public int status { get; set; }
public int Status { get; set; }
/// <summary>
/// 显示状态(0-客户端显示，1-客户端隐藏)
/// </summary>
public int is_del { get; set; }
public int Is_del { get; set; }
/// <summary>
/// 是否公开作业(1-公开作业，2-不公开，3-公开优秀)
/// </summary>
public int is_open { get; set; }
public int Is_open { get; set; }
/// <summary>
/// 公开方式(1-结束后)
/// </summary>
public int open_type { get; set; }
public int Open_type { get; set; }
/// <summary>
/// 是否允许补交(1-否,2-是)
/// </summary>
public int is_revise { get; set; }
public int Is_revise { get; set; }
/// <summary>
/// 学生数
/// </summary>
public int num { get; set; }
public int Num { get; set; }
/// <summary>
/// 优秀人数
/// </summary>
public int cream_num { get; set; }
public int Cream_num { get; set; }
/// <summary>
/// 补交人数
/// </summary>
public int revised_num { get; set; }
public int Revised_num { get; set; }
/// <summary>
/// 已批阅
/// </summary>
public int rnum { get; set; }
public int Rnum { get; set; }
/// <summary>
/// 已提交
/// </summary>
public int cnum { get; set; }
public int Cnum { get; set; }
/// <summary>
/// 学校编号
/// </summary>
public int school_uid { get; set; }
public int School_uid { get; set; }
/// <summary>
/// 评分机制(5-自定义，4-不评分，3-等第制，2-十分制，1-百分制)
/// </summary>
public int score_type { get; set; }
public int Score_type { get; set; }
/// <summary>
/// 自定义分数
/// </summary>
public decimal score_value { get; set; }
public decimal Score_value { get; set; }
/// <summary>
/// 教师账号
/// </summary>
public string teacher_account { get; set; }
public string Teacher_account { get; set; }
/// <summary>
/// 教师姓名
/// </summary>
public string teacher_name { get; set; }
public string Teacher_name { get; set; }
/// <summary>
/// 教师编号
/// </summary>
public int teacher_uid { get; set; }
public int Teacher_uid { get; set; }
/// <summary>
/// th_cancel
/// </summary>
public string th_cancel { get; set; }
public string Th_cancel { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime add_time { get; set; }
public DateTime Add_time { get; set; }
/// <summary>
/// 更新时间
/// </summary>
public DateTime update_time { get; set; }
public DateTime Update_time { get; set; }
/// <summary>
/// 打回订正人数
/// </summary>
public int ref_num { get; set; }
public int Ref_num { get; set; }
/// <summary>
/// 已订正人数
/// </summary>
public int refc_num { get; set; }
public int Refc_num { get; set; }
/// <summary>
/// 平均分
/// </summary>
public decimal av_score { get; set; }
public decimal Av_score { get; set; }
/// <summary>
/// 最高分
/// </summary>
public decimal max_score { get; set; }
public decimal Max_score { get; set; }
/// <summary>
/// 最低分
/// </summary>
public decimal min_score { get; set; }
public decimal Min_score { get; set; }
}
}
EduSpider.Model/Extend/RB_Course_Student_Extend.cs
View file @ 42b6cd69
......@@ -15,22 +15,22 @@ namespace EduSpider.Model.Extend
/// <summary>
/// 课程名称
/// </summary>
public string courseName { get; set; }
public string CourseName { get; set; }
/// <summary>
/// 教师编号
/// </summary>
public int teacherId { get; set; }
public int TeacherId { get; set; }
/// <summary>
/// 教师名称
/// </summary>
public string teacherName { get; set; }
public string TeacherName { get; set; }
/// <summary>
/// 教师头像
/// </summary>
public string teacherLogo { get; set;}
public string TeacherLogo { get; set;}
/// <summary>
/// 封面图
......@@ -40,17 +40,17 @@ namespace EduSpider.Model.Extend
/// <summary>
/// 课程状态
/// </summary>
public int courseStatus { get; set; }
public int CourseStatus { get; set; }
/// <summary>
/// 完成次数
/// </summary>
public int completeNum { get; set; }
public int CompleteNum { get; set; }
/// <summary>
/// 总次数
/// </summary>
public int totalClassNum { get; set; }
public int TotalClassNum { get; set; }
}
}
EduSpider.Model/Extend/RB_Course_Teacher_Extend.cs
View file @ 42b6cd69
......@@ -10,22 +10,22 @@ namespace EduSpider.Model.Extend
/// <summary>
/// 课程名称
/// </summary>
public string courseName { get; set; }
public string CourseName { get; set; }
/// <summary>
/// 教师编号
/// </summary>
public int teacherId { get; set; }
public int TeacherId { get; set; }
/// <summary>
/// 教师名称
/// </summary>
public string teacherName { get; set; }
public string TeacherName { get; set; }
/// <summary>
/// 教师头像
/// </summary>
public string teacherLogo { get; set; }
public string TeacherLogo { get; set; }
/// <summary>
/// 封面图
......@@ -35,17 +35,17 @@ namespace EduSpider.Model.Extend
/// <summary>
/// 课程状态
/// </summary>
public int courseStatus { get; set; }
public int CourseStatus { get; set; }
/// <summary>
/// 完成次数
/// </summary>
public int completeNum { get; set; }
public int CompleteNum { get; set; }
/// <summary>
/// 总次数
/// </summary>
public int totalClassNum { get; set; }
public int TotalClassNum { get; set; }
}
}
EduSpider.Model/Extend/RB_Stu_HomeWork_Extend.cs
View file @ 42b6cd69
......@@ -15,16 +15,16 @@ namespace EduSpider.Model.Extend
/// <summary>
/// 作业名称
/// </summary>
public string homework_title { get; set; }
public string Homework_title { get; set; }
/// <summary>
/// 课程名称
/// </summary>
public string courseName { get; set; }
public string CourseName { get; set; }
/// <summary>
/// 自定义分数
/// </summary>
public decimal score_value { get; set; }
public decimal Score_value { get; set; }
}
}
EduSpider.Model/Query/CourseQuery.cs
View file @ 42b6cd69
......@@ -8,7 +8,7 @@
/// <summary>
/// 课程编号
/// </summary>
public int courseId { get; set; }
public int CourseId { get; set; }
/// <summary>
/// 课程编号【多个】
......@@ -18,7 +18,7 @@
/// <summary>
/// 课程名称
/// </summary>
public string courseName { get; set; }
public string CourseName { get; set; }
/// <summary>
/// 学员编号
......
EduSpider.Repository/CourseRepository.cs
View file @ 42b6cd69
......@@ -37,11 +37,11 @@ namespace EduSpider.Repository
UPDATE RB_Course
SET courseWare=@courseWare,coverImg=@coverImg,courseType=@courseType,addTime=@addTime
WHERE courseId=@courseId ";
parameters.Add("courseWare", courses[0].courseWare);
parameters.Add("coverImg", courses[0].coverImg);
parameters.Add("courseType", courses[0].courseType);
parameters.Add("addTime", courses[0].addTime);
parameters.Add("courseId", courses[0].courseId);
parameters.Add("courseWare", courses[0].CourseWare);
parameters.Add("coverImg", courses[0].CoverImg);
parameters.Add("courseType", courses[0].CourseType);
parameters.Add("addTime", courses[0].AddTime);
parameters.Add("courseId", courses[0].CourseId);
return Execute(sql, parameters) > 0;
}
......@@ -61,14 +61,14 @@ WHERE 1=1
");
if (query != null)
{
if (!string.IsNullOrWhiteSpace(query.courseName))
if (!string.IsNullOrWhiteSpace(query.CourseName))
{
builder.AppendFormat(" AND A.{0} LIKE @courseName ", nameof(RB_Course.courseName));
parameters.Add("courseName", "%" + query.courseName.Trim() + "%");
builder.AppendFormat(" AND A.{0} LIKE @courseName ", nameof(RB_Course.CourseName));
parameters.Add("courseName", "%" + query.CourseName.Trim() + "%");
}
if (query.courseId > 0)
if (query.CourseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course.courseId), query.courseId);
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course.CourseId), query.CourseId);
}
}
return base.Get<RB_Course>(builder.ToString(), parameters).ToList();
......@@ -93,14 +93,14 @@ WHERE 1=1
");
if (query != null)
{
if (!string.IsNullOrWhiteSpace(query.courseName))
if (!string.IsNullOrWhiteSpace(query.CourseName))
{
builder.AppendFormat(" AND A.{0} LIKE @courseName ", nameof(RB_Course.courseName));
parameters.Add("courseName", "%" + query.courseName.Trim() + "%");
builder.AppendFormat(" AND A.{0} LIKE @courseName ", nameof(RB_Course.CourseName));
parameters.Add("courseName", "%" + query.CourseName.Trim() + "%");
}
if (query.courseId > 0)
if (query.CourseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course.courseId), query.courseId);
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course.CourseId), query.CourseId);
}
}
return base.GetPage<RB_Course>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
......
EduSpider.Repository/CourseStudentRepository.cs
View file @ 42b6cd69
......@@ -43,9 +43,9 @@ WHERE 1=1
if (query != null)
{
if (query.courseId > 0)
if (query.CourseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_Student.courseId), query.courseId);
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_Student.courseId), query.CourseId);
}
if (!string.IsNullOrWhiteSpace(query.StuIds))
{
......
EduSpider.Repository/CourseTeacherRepository.cs
View file @ 42b6cd69
......@@ -43,9 +43,9 @@ WHERE 1=1
if (query != null)
{
if (query.courseId > 0)
if (query.CourseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_Student.courseId), query.courseId);
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_Student.courseId), query.CourseId);
}
if (!string.IsNullOrWhiteSpace(query.TeacherIds))
{
......@@ -56,12 +56,12 @@ WHERE 1=1
//进行中
if (query.QCourseState == 1)
{
builder.AppendFormat(" AND B.{0} IN({1}) AND B.totalClassNum<>B.completeNum ", nameof(RB_Course.courseStatus), 1);
builder.AppendFormat(" AND B.{0} IN({1}) AND B.totalClassNum<>B.completeNum ", nameof(RB_Course.CourseStatus), 1);
}
//已完成
if (query.QCourseState == 2)
{
builder.AppendFormat(" AND B.{0} IN({1}) ", nameof(RB_Course.courseStatus), 3);
builder.AppendFormat(" AND B.{0} IN({1}) ", nameof(RB_Course.CourseStatus), 3);
}
}
}
......
EduSpider.Repository/HomeWorkRepository.cs
View file @ 42b6cd69
......@@ -32,7 +32,7 @@ namespace EduSpider.Repository
/// <returns></returns>
public List<RB_HomeWork> GetCourseHomeWorkListRepository(CourseQuery query)
{
StringBuilder builder = new StringBuilder();
StringBuilder builder = new();
builder.AppendFormat(@"
SELECT A.*
FROM RB_HomeWork AS A
......@@ -40,9 +40,9 @@ WHERE 1=1
");
if (query != null)
{
if (query.courseId > 0)
if (query.CourseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_HomeWork.course_id), query.courseId);
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_HomeWork.Course_id), query.CourseId);
}
}
return Get<RB_HomeWork>(builder.ToString()).ToList();
......
EduSpider.Repository/StuHomeWorkRepository.cs
View file @ 42b6cd69
......@@ -17,7 +17,7 @@ namespace EduSpider.Repository
/// <summary>
/// 评语配置仓储层对象
/// </summary>
private readonly CommentRepository commentRepository = new CommentRepository();
private readonly CommentRepository commentRepository = new();
/// <summary>
/// 批量添加学生家庭作业
......@@ -37,8 +37,8 @@ namespace EduSpider.Repository
/// <returns></returns>
public List<ExamWorkResult> GetStuHomeWorkListRepository(CourseQuery query)
{
List<ExamWorkResult> list = new List<ExamWorkResult>();
StringBuilder builder = new StringBuilder();
List<ExamWorkResult> list = new();
StringBuilder builder = new();
builder.AppendFormat(@"
SELECT A.*,B.homework_title,B.score_value,C.courseName
FROM RB_Stu_HomeWork AS A LEFT JOIN rb_homework AS B ON A.homework_id=B.homework_id
......@@ -47,9 +47,9 @@ WHERE 1=1
");
if (query != null)
{
if (query.courseId > 0)
if (query.CourseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Stu_HomeWork_Extend.course_id), query.courseId);
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Stu_HomeWork_Extend.course_id), query.CourseId);
}
if (!string.IsNullOrWhiteSpace(query.QCourseIds))
{
......@@ -61,7 +61,7 @@ WHERE 1=1
}
}
var dataList = Get<RB_Stu_HomeWork_Extend>(builder.ToString()).ToList();
List<ExamWorkResult> homeWorkList = new List<ExamWorkResult>();
List<ExamWorkResult> homeWorkList = new();
if (dataList != null && dataList.Count > 0)
{
int RowNum = 1;
......@@ -72,11 +72,11 @@ WHERE 1=1
RowNum= RowNum,
CreateTime = item.add_time,
ResultType = 1,
Title = item.homework_title,
Title = item.Homework_title,
Score = item.score,
Score_p = item.score_p,
ScoreType = item.score_type,
Score_Value = item.score_value,
Score_Value = item.Score_value,
HomeWorkStatus = item.status,
});
RowNum++;
......
EduSpider.Services/CourseService.cs
View file @ 42b6cd69
......@@ -79,8 +79,8 @@ namespace EduSpider.Services
/// <returns></returns>
public List<object> GetStuWorkAndExamList(CourseQuery query)
{
List<object> list = new List<object>();
List<ExamWorkResult> dataList = new List<ExamWorkResult>();
List<object> list = new();
List<ExamWorkResult> dataList = new();
var homeWorkList = StuHomeWorkRepository.GetStuHomeWorkListRepository(query);
if (homeWorkList != null && homeWorkList.Count > 0)
{
......@@ -117,35 +117,35 @@ namespace EduSpider.Services
/// <returns></returns>
public List<object> GetCourseHomeWork(CourseQuery query)
{
List<object> result = new List<object>();
List<object> result = new();
var list = HomeWorkRepository.GetCourseHomeWorkListRepository(query);
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
string str = "";
if (item.status == 0)
if (item.Status == 0)
{
str = "未开始";
}
else if (item.status == 1)
else if (item.Status == 1)
{
str = "进行中";
}
else if (item.status == 2)
else if (item.Status == 2)
{
str = "已结束";
}
result.Add(new
{
HomeWorkId = item.homework_id,
HomeWorkTitle = item.homework_title,
Status = item.status,
HomeWorkId = item.Homework_id,
HomeWorkTitle = item.Homework_title,
item.Status,
StatusStr = str,
StuNum = item.num,
SubmitNum = item.cnum,
ReviewNum = item.rnum,
ExcellentNum = item.cream_num
StuNum = item.Num,
SubmitNum = item.Cnum,
ReviewNum = item.Rnum,
ExcellentNum = item.Cream_num
});
}
}
......
EduSpider.WebApi/Controllers/Student/StuController.cs
View file @ 42b6cd69
......@@ -33,7 +33,7 @@ namespace EduSpider.WebApi.Controllers
{
StuIds = base.BaseUserId.ToString()
};
List<object> result = new List<object>();
List<object> result = new();
var list = CourseService.GetStuCourseList(query);
if (list != null && list.Count > 0)
{
......@@ -42,11 +42,11 @@ namespace EduSpider.WebApi.Controllers
result.Add(new
{
item.courseId,
item.courseName,
item.CourseName,
item.CoverImg,
item.completeNum,
item.totalClassNum,
item.teacherName,
item.CompleteNum,
item.TotalClassNum,
item.TeacherName,
});
}
}
......@@ -65,7 +65,7 @@ namespace EduSpider.WebApi.Controllers
var query = new Model.Query.CourseQuery()
{
StuIds = base.BaseUserId.ToString(),
courseId = base.ReqParameters.GetInt("courseId")
CourseId = base.ReqParameters.GetInt("courseId")
};
var homeworkExamList = CourseService.GetStuWorkAndExamList(query);
return ApiResult.Success(data: homeworkExamList);
......
EduSpider.WebApi/Controllers/Student/TeacherController.cs
View file @ 42b6cd69
......@@ -32,11 +32,11 @@ namespace EduSpider.WebApi.Controllers
TeacherIds = base.BaseUserId.ToString()
};
//全部课程
List<object> AllCourseList = new List<object>();
List<object> AllCourseList = new();
//已结课
List<object> FinishList = new List<object>();
List<object> FinishList = new();
//进行中
List<object> NotFinishList = new List<object>();
List<object> NotFinishList = new();
var list = CourseService.GetTeacherCourseList(query);
if (list != null && list.Count > 0)
......@@ -46,18 +46,18 @@ namespace EduSpider.WebApi.Controllers
var obj = new
{
item.courseId,
item.courseName,
item.CourseName,
item.CoverImg,
item.completeNum,
item.totalClassNum,
item.teacherName,
item.CompleteNum,
item.TotalClassNum,
item.TeacherName,
};
AllCourseList.Add(obj);
if (item.courseStatus == 3)
if (item.CourseStatus == 3)
{
FinishList.Add(obj);
}
if (item.courseStatus == 1 && item.completeNum != item.totalClassNum)
if (item.CourseStatus == 1 && item.CompleteNum != item.TotalClassNum)
{
NotFinishList.Add(obj);
}
......@@ -78,9 +78,9 @@ namespace EduSpider.WebApi.Controllers
{
var query = new Model.Query.CourseQuery()
{
courseId = base.ReqParameters.GetInt("courseId")
CourseId = base.ReqParameters.GetInt("courseId")
};
List<object> result = new List<object>();
List<object> result = new();
var list = CourseService.GetStuCourseList(query);
if (list != null && list.Count > 0)
{
......@@ -108,7 +108,7 @@ namespace EduSpider.WebApi.Controllers
{
var query = new Model.Query.CourseQuery()
{
courseId = base.ReqParameters.GetInt("courseId")
CourseId = base.ReqParameters.GetInt("courseId")
};
var list = CourseService.GetCourseHomeWork(query);
return ApiResult.Success(data: list);
......
EduSpider.WebApi/Filter/ActionFilterAttribute.cs
View file @ 42b6cd69
......@@ -26,7 +26,7 @@ namespace Edu.WebApi.Filter
base.OnActionExecuting(actionContext);
HttpRequest request = actionContext.HttpContext.Request;
request.EnableBuffering();
RequestParm requestParm = new RequestParm
RequestParm requestParm = new()
{
Token = request.Headers["Authorization"]
};
......
EduSpider/Spiders/ClassInRule/CourseManager.cs
View file @ 42b6cd69
......@@ -20,7 +20,7 @@ namespace EduSpider.Spiders.ClassInRule
/// <summary>
/// 获取课程列表
/// </summary>
public async void RunCourse(string cookie)
public static async void RunCourse(string cookie)
{
int perpage = 20;
var pageCount = 1;
......@@ -49,9 +49,9 @@ namespace EduSpider.Spiders.ClassInRule
Console.WriteLine(string.Format("第{0}次,导入完成{1}条.", pageCount, totalCount));
foreach (var item in tempList)
{
RunCourseStudent(cookie, item.courseId);
RunCourseTeacher(cookie, item.courseId);
RunCourseInfo(cookie, item.courseId);
RunCourseStudent(cookie, item.CourseId);
RunCourseTeacher(cookie, item.CourseId);
RunCourseInfo(cookie, item.CourseId);
}
}
if (totalNum % perpage == 0)
......@@ -86,9 +86,9 @@ namespace EduSpider.Spiders.ClassInRule
Console.WriteLine(string.Format("第{0}次,导入完成{1}条.", i, totalCount));
foreach (var sItem in subtempList)
{
RunCourseStudent(cookie, sItem.courseId);
RunCourseTeacher(cookie, sItem.courseId);
RunCourseInfo(cookie, sItem.courseId);
RunCourseStudent(cookie, sItem.CourseId);
RunCourseTeacher(cookie, sItem.CourseId);
RunCourseInfo(cookie, sItem.CourseId);
}
}
}
......@@ -107,7 +107,7 @@ namespace EduSpider.Spiders.ClassInRule
/// <returns></returns>
public static List<RB_Course> ParseJson(string data)
{
List<RB_Course> list = new List<RB_Course>();
List<RB_Course> list = new();
JArray courseArray = JArray.Parse(data);
if (courseArray != null && courseArray.Count > 0)
{
......@@ -121,26 +121,26 @@ namespace EduSpider.Spiders.ClassInRule
}
list.Add(new RB_Course()
{
courseId = courseObj.GetInt("courseId"),
courseName = courseObj.GetString("courseName"),
beginTime = ConvertHelper.UnixToDateTime(courseObj.GetInt("beginTime")),
completeNum = courseObj.GetInt("completeNum"),
totalClassNum = courseObj.GetInt("totalClassNum"),
expiryTime = expiryTime,
liveNum = courseObj.GetInt("liveNum"),
recordNum = courseObj.GetInt("recordNum"),
openNum = courseObj.GetInt("openNum"),
studentNum = courseObj.GetInt("studentNum"),
auditNum = courseObj.GetInt("auditNum"),
teacherNum = courseObj.GetInt("teacherNum"),
courseStatus = courseObj.GetInt("courseStatus"),
webCast = courseObj.GetString("webCast"),
teacherId = courseObj.GetInt("teacherId"),
teacherAccount = courseObj.GetString("teacherAccount"),
teacherUid = courseObj.GetInt("teacherUid"),
teacherName = courseObj.GetString("teacherName"),
teacherLogo = courseObj.GetString("teacherLogo"),
courseType = courseObj.GetInt("courseType"),
CourseId = courseObj.GetInt("courseId"),
CourseName = courseObj.GetString("courseName"),
BeginTime = ConvertHelper.UnixToDateTime(courseObj.GetInt("beginTime")),
CompleteNum = courseObj.GetInt("completeNum"),
TotalClassNum = courseObj.GetInt("totalClassNum"),
ExpiryTime = expiryTime,
LiveNum = courseObj.GetInt("liveNum"),
RecordNum = courseObj.GetInt("recordNum"),
OpenNum = courseObj.GetInt("openNum"),
StudentNum = courseObj.GetInt("studentNum"),
AuditNum = courseObj.GetInt("auditNum"),
TeacherNum = courseObj.GetInt("teacherNum"),
CourseStatus = courseObj.GetInt("courseStatus"),
WebCast = courseObj.GetString("webCast"),
TeacherId = courseObj.GetInt("teacherId"),
TeacherAccount = courseObj.GetString("teacherAccount"),
TeacherUid = courseObj.GetInt("teacherUid"),
TeacherName = courseObj.GetString("teacherName"),
TeacherLogo = courseObj.GetString("teacherLogo"),
CourseType = courseObj.GetInt("courseType"),
}); ;
}
}
......@@ -163,7 +163,7 @@ namespace EduSpider.Spiders.ClassInRule
string url = "https://console.eeo.cn/saasajax/student.ajax.php?action=getCourseStudentList";
var response = await request.PostAsync(url, content);
var sutResult = response.Content.ReadAsStringAsync().Result;
List<RB_Course_Student> list = new List<RB_Course_Student>();
List<RB_Course_Student> list = new();
if (!string.IsNullOrWhiteSpace(sutResult))
{
JObject stuRootObj = JObject.Parse(sutResult);
......@@ -211,7 +211,7 @@ namespace EduSpider.Spiders.ClassInRule
string url = "https://console.eeo.cn/saasajax/course.ajax.php?action=getCourseTeacherList";
var response = await request.PostAsync(url, content);
var teacherResult = response.Content.ReadAsStringAsync().Result;
List<RB_Course_Teacher> list = new List<RB_Course_Teacher>();
List<RB_Course_Teacher> list = new();
if (!string.IsNullOrWhiteSpace(teacherResult))
{
JObject teacherRootObj = JObject.Parse(teacherResult);
......@@ -265,7 +265,7 @@ namespace EduSpider.Spiders.ClassInRule
string url = "https://console.eeo.cn/saasajax/course.ajax.php?action=getCourseInfo";
var response = await request.PostAsync(url, content);
var courseInfoResult = response.Content.ReadAsStringAsync().Result;
List<RB_Course> list = new List<RB_Course>();
List<RB_Course> list = new();
if (!string.IsNullOrWhiteSpace(courseInfoResult))
{
JObject courseRootObj = JObject.Parse(courseInfoResult);
......@@ -279,28 +279,28 @@ namespace EduSpider.Spiders.ClassInRule
}
var courseModel = new RB_Course()
{
courseId = courseObj.GetInt("courseId"),
courseName = courseObj.GetString("courseName"),
beginTime = ConvertHelper.UnixToDateTime(courseObj.GetInt("beginTime")),
completeNum = courseObj.GetInt("completeNum"),
totalClassNum = courseObj.GetInt("totalClassNum"),
expiryTime = expiryTime,
liveNum = courseObj.GetInt("liveNum"),
recordNum = courseObj.GetInt("recordNum"),
openNum = courseObj.GetInt("openNum"),
studentNum = courseObj.GetInt("studentNum"),
auditNum = courseObj.GetInt("auditNum"),
teacherNum = courseObj.GetInt("teacherNum"),
courseStatus = courseObj.GetInt("courseStatus"),
webCast = courseObj.GetString("webCast"),
teacherId = courseObj.GetInt("teacherId"),
teacherAccount = courseObj.GetString("teacherAccount"),
teacherUid = courseObj.GetInt("teacherUid"),
teacherName = courseObj.GetString("teacherName"),
teacherLogo = courseObj.GetString("teacherLogo"),
courseType = courseObj.GetInt("courseType"),
addTime = ConvertHelper.UnixToDateTime(courseObj.GetInt("addTime")),
courseWare = courseObj.GetString("courseWare"),
CourseId = courseObj.GetInt("courseId"),
CourseName = courseObj.GetString("courseName"),
BeginTime = ConvertHelper.UnixToDateTime(courseObj.GetInt("beginTime")),
CompleteNum = courseObj.GetInt("completeNum"),
TotalClassNum = courseObj.GetInt("totalClassNum"),
ExpiryTime = expiryTime,
LiveNum = courseObj.GetInt("liveNum"),
RecordNum = courseObj.GetInt("recordNum"),
OpenNum = courseObj.GetInt("openNum"),
StudentNum = courseObj.GetInt("studentNum"),
AuditNum = courseObj.GetInt("auditNum"),
TeacherNum = courseObj.GetInt("teacherNum"),
CourseStatus = courseObj.GetInt("courseStatus"),
WebCast = courseObj.GetString("webCast"),
TeacherId = courseObj.GetInt("teacherId"),
TeacherAccount = courseObj.GetString("teacherAccount"),
TeacherUid = courseObj.GetInt("teacherUid"),
TeacherName = courseObj.GetString("teacherName"),
TeacherLogo = courseObj.GetString("teacherLogo"),
CourseType = courseObj.GetInt("courseType"),
AddTime = ConvertHelper.UnixToDateTime(courseObj.GetInt("addTime")),
CourseWare = courseObj.GetString("courseWare"),
};
string tempCoverImg = courseObj.GetString("coverImg");
string coverImg = "";
......@@ -308,7 +308,7 @@ namespace EduSpider.Spiders.ClassInRule
{
coverImg = "https://console.eeo.cn/upload/images/" + tempCoverImg;
}
courseModel.coverImg = coverImg;
courseModel.CoverImg = coverImg;
list.Add(courseModel);
}
}
......
EduSpider/Spiders/ClassInRule/HomeWorkManager.cs
View file @ 42b6cd69
......@@ -21,7 +21,7 @@ namespace EduSpider.Spiders.ClassInRule
/// <summary>
/// 获取学生作业列表
/// </summary>
public async void RunHomeWork(string cookie)
public static async void RunHomeWork(string cookie)
{
int perpage = 20;
var pageCount = 1;
......@@ -51,7 +51,7 @@ namespace EduSpider.Spiders.ClassInRule
Console.WriteLine(string.Format("第{0}次,导入完成{1}条.", pageCount, totalCount));
foreach (var item in tempList)
{
RunStuHomeWork(cookie, item.homework_id, item.course_id);
RunStuHomeWork(cookie, item.Homework_id, item.Course_id);
}
}
if (totalNum % perpage == 0)
......@@ -88,7 +88,7 @@ namespace EduSpider.Spiders.ClassInRule
Console.WriteLine(string.Format("第{0}次,导入完成{1}条.", i, totalCount));
foreach (var sItem in subtempList)
{
RunStuHomeWork(cookie, sItem.homework_id, sItem.course_id);
RunStuHomeWork(cookie, sItem.Homework_id, sItem.Course_id);
}
}
}
......@@ -107,7 +107,7 @@ namespace EduSpider.Spiders.ClassInRule
/// <returns></returns>
public static List<RB_HomeWork> ParseJson(string data)
{
List<RB_HomeWork> list = new List<RB_HomeWork>();
List<RB_HomeWork> list = new();
if (!string.IsNullOrWhiteSpace(data))
{
JArray courseArray = JArray.Parse(data);
......@@ -118,37 +118,37 @@ namespace EduSpider.Spiders.ClassInRule
JObject homeObj = JObject.Parse(jItem.ToString());
list.Add(new RB_HomeWork()
{
homework_id = homeObj.GetInt("homework_id"),
homework_title = homeObj.GetString("homework_title"),
homework_share_key = homeObj.GetString("homework_share_key"),
course_id = homeObj.GetInt("course_id"),
course_name = homeObj.GetString("course_name"),
start_time = ConvertHelper.UnixToDateTime(homeObj.GetInt("start_time")),
end_time = ConvertHelper.UnixToDateTime(homeObj.GetInt("end_time")),
status = homeObj.GetInt("status"),
is_del = homeObj.GetInt("is_del"),
is_open = homeObj.GetInt("is_open"),
open_type = homeObj.GetInt("open_type"),
is_revise = homeObj.GetInt("is_revise"),
num = homeObj.GetInt("num"),
cream_num = homeObj.GetInt("cream_num"),
revised_num = homeObj.GetInt("revised_num"),
rnum = homeObj.GetInt("rnum"),
cnum = homeObj.GetInt("cnum"),
school_uid = homeObj.GetInt("school_uid"),
score_type = homeObj.GetInt("score_type"),
score_value = homeObj.GetDecimal("score_value"),
teacher_account = homeObj.GetString("teacher_account"),
teacher_name = homeObj.GetString("teacher_name"),
teacher_uid = homeObj.GetInt("teacher_uid"),
th_cancel = homeObj.GetString("th_cancel"),
add_time = ConvertHelper.UnixToDateTime(homeObj.GetInt("add_time")),
update_time = ConvertHelper.UnixToDateTime(homeObj.GetInt("update_time")),
ref_num = homeObj.GetInt("ref_num"),
refc_num = homeObj.GetInt("refc_num"),
av_score = homeObj.GetDecimal("av_score"),
max_score = homeObj.GetDecimal("max_score"),
min_score = homeObj.GetDecimal("min_score"),
Homework_id = homeObj.GetInt("homework_id"),
Homework_title = homeObj.GetString("homework_title"),
Homework_share_key = homeObj.GetString("homework_share_key"),
Course_id = homeObj.GetInt("course_id"),
Course_name = homeObj.GetString("course_name"),
Start_time = ConvertHelper.UnixToDateTime(homeObj.GetInt("start_time")),
End_time = ConvertHelper.UnixToDateTime(homeObj.GetInt("end_time")),
Status = homeObj.GetInt("status"),
Is_del = homeObj.GetInt("is_del"),
Is_open = homeObj.GetInt("is_open"),
Open_type = homeObj.GetInt("open_type"),
Is_revise = homeObj.GetInt("is_revise"),
Num = homeObj.GetInt("num"),
Cream_num = homeObj.GetInt("cream_num"),
Revised_num = homeObj.GetInt("revised_num"),
Rnum = homeObj.GetInt("rnum"),
Cnum = homeObj.GetInt("cnum"),
School_uid = homeObj.GetInt("school_uid"),
Score_type = homeObj.GetInt("score_type"),
Score_value = homeObj.GetDecimal("score_value"),
Teacher_account = homeObj.GetString("teacher_account"),
Teacher_name = homeObj.GetString("teacher_name"),
Teacher_uid = homeObj.GetInt("teacher_uid"),
Th_cancel = homeObj.GetString("th_cancel"),
Add_time = ConvertHelper.UnixToDateTime(homeObj.GetInt("add_time")),
Update_time = ConvertHelper.UnixToDateTime(homeObj.GetInt("update_time")),
Ref_num = homeObj.GetInt("ref_num"),
Refc_num = homeObj.GetInt("refc_num"),
Av_score = homeObj.GetDecimal("av_score"),
Max_score = homeObj.GetDecimal("max_score"),
Min_score = homeObj.GetDecimal("min_score"),
});
}
}
......@@ -167,7 +167,7 @@ namespace EduSpider.Spiders.ClassInRule
IStuHomeWorkRepository stuHomeWorkRepository = new StuHomeWorkRepository();
ICourseStudentRepository courseStudentRepository = new CourseStudentRepository();
string stuIds = "";
var courseStuList = courseStudentRepository.GetCourseStudentListRepository(new Model.Query.CourseQuery() { courseId = courseId });
var courseStuList = courseStudentRepository.GetCourseStudentListRepository(new Model.Query.CourseQuery() { CourseId = courseId });
if (courseStuList != null)
{
stuIds = string.Join(",", courseStuList.Select(qitem => qitem.uid));
......@@ -180,7 +180,7 @@ namespace EduSpider.Spiders.ClassInRule
string url = "https://console.eeo.cn/saasajax/homework.ajax.php?action=getStudentsHomeworkList";
var response = await request.PostAsync(url, content);
var sutHomeWorkResult = response.Content.ReadAsStringAsync().Result;
List<RB_Stu_HomeWork> list = new List<RB_Stu_HomeWork>();
List<RB_Stu_HomeWork> list = new();
if (!string.IsNullOrWhiteSpace(sutHomeWorkResult))
{
JObject stuHomeRootObj = JObject.Parse(sutHomeWorkResult);
......
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