Skip to content

E
EduSpider
Commit 3c9e2e35 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/eduspider 

# Conflicts:
#	EduSpider.Model/Entity/RB_Stu_Comment.cs
#	EduSpider.Model/Query/CourseQuery.cs
#	EduSpider.Repository/StuHomeWorkRepository.cs
parents f8c84944 8fe6a3a7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 723 additions and 520 deletions
EduSpider.IRepository/IStuCommentDetailsRepository.cs 0 → 100644
View file @ 3c9e2e35
using EduSpider.Model.Entity;
using EduSpider.Model.Extend;
using EduSpider.Model.Query;
using System.Collections.Generic;
using VTX.FW.Config;
using VTX.FW.DB;
namespace EduSpider.IRepository
{
/// <summary>
/// 学生评论详情仓储接口
/// </summary>
public interface IStuCommentDetailsRepository : IDBRepository<RB_Stu_CommentDetails>, IDependency
{
/// <summary>
/// 批量新增修改学员评论详情
/// </summary>
/// <param name="list"></param>
/// <returns></returns>
public bool BatchSetStuCommentDetails(List<RB_Stu_CommentDetails> list);
/// <summary>
/// 获取学员评价详情
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Stu_CommentDetails_Extend> GetStuCommentDetailsListRepository(RB_Stu_CommentDetails_Extend query);
/// <summary>
/// 修改学生评价
/// </summary>
/// <param name="Ids"></param>
/// <param name="Info"></param>
/// <returns></returns>
public bool SetStuCommentDetailsInfoRepository(string Ids, string Info);
/// <summary>
/// 修改学员评论状态
/// </summary>
/// <param name="ShowType"></param>
/// <param name="Ids"></param>
/// <returns></returns>
public bool SetStuCommentDetailsShowTypeRepository(int ShowType, string Ids);
/// <summary>
/// 根据课程评论次数修改可见等级
/// </summary>
/// <param name="CourseId">课程编号</param>
/// <param name="CommentMainId">评价主表编号</param>
/// <param name="ShowType">可见性</param>
/// <returns></returns>
public bool SetStuCommentShowTypeByTimesRepository(int CourseId, int CommentMainId, int ShowType);
/// <summary>
/// 根据编号删除学员评论
/// </summary>
/// <param name="Ids"></param>
/// <returns></returns>
public bool DeleteStuCommentRepository(string Ids);
}
}
EduSpider.IRepository/IStuCommentRepository.cs
View file @ 3c9e2e35
...@@ -8,7 +8,7 @@ using VTX.FW.DB; ...@@ -8,7 +8,7 @@ using VTX.FW.DB;
namespace EduSpider.IRepository namespace EduSpider.IRepository
{ {
/// <summary> /// <summary>
/// 学员评语仓储接口 /// 学员评价仓储接口
/// </summary> /// </summary>
public interface IStuCommentRepository:IDBRepository<RB_Stu_Comment>, IDependency public interface IStuCommentRepository:IDBRepository<RB_Stu_Comment>, IDependency
{ {
...@@ -17,59 +17,20 @@ namespace EduSpider.IRepository ...@@ -17,59 +17,20 @@ namespace EduSpider.IRepository
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
public bool SetStuCommentRepository(RB_Stu_Comment model); public bool SetStuCommentRepository(RB_Stu_Comment_Extend model, bool IsAdd = false);
/// <summary> /// <summary>
/// 批量新增学员评价 /// 批量新增学员评价
/// </summary> /// </summary>
/// <param name="list"></param> /// <param name="list"></param>
/// <returns></returns> /// <returns></returns>
public bool BatchSetStuCommentRepository(List<RB_Stu_Comment> list, StuCommentType commentType ); public bool BatchSetStuCommentRepository(RB_Stu_Comment_Extend model, StuCommentType commentType );
/// <summary>
/// 查询学员评语列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Stu_Comment> GetStuCommentListRepository(CourseQuery query);
/// <summary>
/// 修改学员评论状态
/// </summary>
/// <param name="ShowType"></param>
/// <param name="Ids"></param>
/// <returns></returns>
public bool SetStuCommentShowTypeRepository(int ShowType, string Ids);
/// <summary>
/// 根据课程评论次数修改可见等级
/// </summary>
/// <param name="CourseId">课程编号</param>
/// <param name="Times">次数</param>
/// <param name="ShowType">可见性</param>
/// <returns></returns>
public bool SetStuCommentShowTypeByTimesRepository(int CourseId,int Times,int ShowType);
/// <summary>
/// 根据编号删除学员评论
/// </summary>
/// <param name="Ids"></param>
/// <returns></returns>
public bool DeleteStuCommentRepository(string Ids);
/// <summary> /// <summary>
/// 获取系统生成评论次数 /// 获取系统生成评论次数
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Stu_Comment> GetCourseCommentTimesListRepository(CourseQuery query); public List<RB_Stu_Comment_Extend> GetCourseCommentTimesListRepository(CourseQuery query);
/// <summary>
/// 获取评论列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Stu_Comment_Extend> GetStuCommentList(CourseQuery query);
} }
} }
EduSpider.IServices/ICourseService.cs
View file @ 3c9e2e35
...@@ -80,26 +80,27 @@ namespace EduSpider.IServices ...@@ -80,26 +80,27 @@ namespace EduSpider.IServices
/// <returns></returns> /// <returns></returns>
public bool DeleteCourseCommentDetail(string DetailIds); public bool DeleteCourseCommentDetail(string DetailIds);
/// <summary>
/// 新增修改学员评价
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool SetStuComment(RB_Stu_Comment model);
/// <summary> /// <summary>
/// 批量新增学员评价 /// 批量新增学员评价
/// </summary> /// </summary>
/// <param name="list"></param> /// <param name="list"></param>
/// <returns></returns> /// <returns></returns>
public bool BatchSetStuComment(List<RB_Stu_Comment> list, StuCommentType commentType); public bool BatchSetStuComment(RB_Stu_Comment_Extend model, StuCommentType commentType);
/// <summary> /// <summary>
/// 获取学员评价列表 /// 获取学员评价列表
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Stu_Comment_Extend> GetStuCommentList(CourseQuery query); public List<RB_Stu_CommentDetails_Extend> GetStuCommentDetailsList(RB_Stu_CommentDetails_Extend query);
/// <summary>
/// 修改学生评价
/// </summary>
/// <param name="Ids"></param>
/// <param name="Info"></param>
/// <returns></returns>
public bool SetStuCommentDetailsInfo(string Ids, string Info);
/// <summary> /// <summary>
/// 修改学员评论状态 /// 修改学员评论状态
...@@ -107,16 +108,16 @@ namespace EduSpider.IServices ...@@ -107,16 +108,16 @@ namespace EduSpider.IServices
/// <param name="ShowType"></param> /// <param name="ShowType"></param>
/// <param name="Ids"></param> /// <param name="Ids"></param>
/// <returns></returns> /// <returns></returns>
public bool SetStuCommentShowType(int ShowType, string Ids); public bool SetStuCommentDetailsShowType(int ShowType, string Ids);
/// <summary> /// <summary>
/// 根据课程评论次数修改可见等级 /// 根据课程评论次数修改可见等级
/// </summary> /// </summary>
/// <param name="CourseId">课程编号</param> /// <param name="CourseId">课程编号</param>
/// <param name="Times">次数</param> /// <param name="CommentMainId">评价主表编号</param>
/// <param name="ShowType">可见性</param> /// <param name="ShowType">可见性</param>
/// <returns></returns> /// <returns></returns>
public bool SetStuCommentShowTypeByTimes(int CourseId, int Times, int ShouType); public bool SetStuCommentShowTypeByTimes(int CourseId, int CommentMainId, int ShouType);
/// <summary> /// <summary>
/// 根据编号删除学员评论 /// 根据编号删除学员评论
...@@ -130,7 +131,7 @@ namespace EduSpider.IServices ...@@ -130,7 +131,7 @@ namespace EduSpider.IServices
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Stu_Comment> GetCourseCommentTimesList(CourseQuery query); public List<RB_Stu_Comment_Extend> GetCourseCommentTimesList(CourseQuery query);
/// <summary> /// <summary>
/// 获取系统评价配置 /// 获取系统评价配置
......
EduSpider.Model/Entity/RB_Stu_Comment.cs
View file @ 3c9e2e35
...@@ -4,77 +4,50 @@ using VTX.FW.Attr; ...@@ -4,77 +4,50 @@ using VTX.FW.Attr;
namespace EduSpider.Model.Entity namespace EduSpider.Model.Entity
{ {
/// <summary> /// <summary>
/// 学员评语实体类 /// 学员评价主表实体类
/// </summary> /// </summary>
[Serializable] [Serializable]
[DB(ConnectionName = "DefaultConnection")] [DB(ConnectionName = "DefaultConnection")]
public class RB_Stu_Comment public class RB_Stu_Comment
{ {
/// <summary> /// <summary>
/// 主键编号 /// 主键编号
/// </summary> /// </summary>
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 开始作业编号 /// 次数
/// </summary> /// </summary>
public Int64 StartHomeWorkId { get; set; } public int Times { get; set; }
/// <summary> /// <summary>
/// 家庭作业编号 /// 课程编号
/// </summary> /// </summary>
public Int64 HomeWorkId { get; set; } public int CourseId { get; set; }
/// <summary> /// <summary>
/// 学员登录编号 /// 评论标题
/// </summary> /// </summary>
public int StuUid { get; set; } public string Title { get; set; }
/// <summary> /// <summary>
/// 课程编号 /// 创建类型(1-系统创建，2-老师创建)
/// </summary> /// </summary>
public int CourseId { get; set; } public int CreateType { get; set; }
/// <summary> /// <summary>
/// 评语次数 /// 创建人
/// </summary> /// </summary>
public int Times { get; set; } public int CreateBy { get; set; }
/// <summary> /// <summary>
/// 评语 /// 创建时间
/// </summary> /// </summary>
public string Info { get; set; } public DateTime CreateTime { get; set; }
/// <summary> /// <summary>
/// 创建类型(1-系统创建，2-老师创建) /// 创建人姓名
/// </summary> /// </summary>
public int CreateType { get; set; } public string CreateByName { get; set; }
}
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateBy { get; set; }
/// <summary>
/// 创建人姓名
/// </summary>
public string CreateByName { get; set; }
/// <summary>
/// 显示类型(1-全部可见，2-部分可见，3-不可见)
/// </summary>
public int ShowType { get; set; }
/// <summary>
/// 删除状态(0-正常，1-删除)
/// </summary>
public int Status { get; set; }
}
} }
EduSpider.Model/Entity/RB_Stu_CommentDetails.cs 0 → 100644
View file @ 3c9e2e35
using System;
using VTX.FW.Attr;
namespace EduSpider.Model.Entity
{
/// <summary>
/// 学员评价详情表实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Stu_CommentDetails
{
/// <summary>
/// 主键编号
/// </summary>
public int Id { get; set; }
/// <summary>
/// 学员评价主表编号
/// </summary>
public int CommentMainId { get; set; }
/// <summary>
/// 开始作业编号
/// </summary>
public Int64 StartHomeWorkId { get; set; }
/// <summary>
/// 家庭作业编号
/// </summary>
public Int64 HomeWorkId { get; set; }
/// <summary>
/// 学员登录编号
/// </summary>
public int StuUid { get; set; }
/// <summary>
/// 课程编号
/// </summary>
public int CourseId { get; set; }
/// <summary>
/// 评语次数
/// </summary>
public int Times { get; set; }
/// <summary>
/// 评语
/// </summary>
public string Info { get; set; }
/// <summary>
/// 创建类型(1-系统创建，2-老师创建)
/// </summary>
public int CreateType { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateBy { get; set; }
/// <summary>
/// 创建人姓名
/// </summary>
public string CreateByName { get; set; }
/// <summary>
/// 显示类型(1-全部可见，2-部分可见，3-不可见)
/// </summary>
public int ShowType { get; set; }
/// <summary>
/// 删除状态(0-正常，1-删除)
/// </summary>
public int Status { get; set; }
/// <summary>
/// 多个作业编号
/// </summary>
public string HomeWorkIds { get; set; }
}
}
EduSpider.Model/Extend/RB_Stu_CommentDetails_Extend.cs 0 → 100644
View file @ 3c9e2e35
using EduSpider.Model.Entity;
namespace EduSpider.Model.Extend
{
/// <summary>
/// 学员评价详情扩展实体类
/// </summary>
public class RB_Stu_CommentDetails_Extend : RB_Stu_CommentDetails
{
/// <summary>
/// 学员评价主表编号
/// </summary>
public string QCommentMainIds { get; set; }
/// <summary>
/// 学生名称
/// </summary>
public string StuName { get; set; }
}
}
EduSpider.Model/Extend/RB_Stu_Comment_Extend.cs
View file @ 3c9e2e35
using EduSpider.Model.Entity; using EduSpider.Model.Entity;
using System; using System.Collections.Generic;
using VTX.FW.Attr;
namespace EduSpider.Model.Extend namespace EduSpider.Model.Extend
{ {
/// <summary> /// <summary>
/// 学生评价扩展 /// 学生评价主表扩展实体类
/// </summary> /// </summary>
public class RB_Stu_Comment_Extend : RB_Stu_Comment public class RB_Stu_Comment_Extend : RB_Stu_Comment
{ {
/// <summary> /// <summary>
/// 学生姓名 /// 学员评论详情列表
/// </summary> /// </summary>
public string StuName { get; set; } public List<RB_Stu_CommentDetails> Details { get; set; }
}
/// <summary>
/// 显示类型
/// </summary>
public int ShowType { get; set; }
}
} }
EduSpider.Model/Query/CourseQuery.cs
View file @ 3c9e2e35
...@@ -41,21 +41,21 @@ namespace EduSpider.Model.Query ...@@ -41,21 +41,21 @@ namespace EduSpider.Model.Query
/// 关键词 /// 关键词
/// </summary> /// </summary>
public string KeyWords { get; set;} public string KeyWords { get; set;}
/// <summary> /// <summary>
/// 作业编号 /// 是否强制匹配关键词
/// </summary> /// </summary>
public Int64 HomeWorkId { get; set; } public int IsMatchKeyWords { get; set; }
/// <summary> /// <summary>
/// 开始作业编号 /// 作业编号
/// </summary> /// </summary>
public Int64 StartHomeWorkId { get; set; } public Int64 HomeWorkId { get; set; }
/// <summary> /// <summary>
/// 结束作业编号 /// 作业编号
/// </summary> /// </summary>
public Int64 EndHomeWorkId { get; set; } public string QHomeWorkIds { get; set; }
/// <summary> /// <summary>
/// 创建类型(1-系统创建，2-老师创建) /// 创建类型(1-系统创建，2-老师创建)
......
EduSpider.Repository/CommentRepository.cs
View file @ 3c9e2e35
...@@ -66,7 +66,20 @@ WHERE 1=1 ...@@ -66,7 +66,20 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Comment_Extend.Id), query.DefaultCommentId); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Comment_Extend.Id), query.DefaultCommentId);
} }
var list = base.Get<RB_Comment_Extend>(builder.ToString(),parameters).ToList(); var list = new List<RB_Comment_Extend>();
//强制匹配关键词
if (query.IsMatchKeyWords == 1)
{
if (parameters != null && parameters.ParameterNames.Count()>0)
{
list = base.Get<RB_Comment_Extend>(builder.ToString(), parameters).ToList();
}
}
else
{
list = base.Get<RB_Comment_Extend>(builder.ToString(), parameters).ToList();
}
if (list != null && list.Count>0) if (list != null && list.Count>0)
{ {
string Ids = string.Join(",", list.Select(qitem => qitem.Id)); string Ids = string.Join(",", list.Select(qitem => qitem.Id));
......
EduSpider.Repository/CourseCommentDetailsRepository.cs
View file @ 3c9e2e35
...@@ -82,7 +82,7 @@ WHERE 1=1 ...@@ -82,7 +82,7 @@ WHERE 1=1
/// <returns></returns> /// <returns></returns>
public bool DeleteCourseCommentDetailsRepository(string DetailIds) public bool DeleteCourseCommentDetailsRepository(string DetailIds)
{ {
string sql = string.Format("UPDATE RB_Course_CommentDetails SET Status=1 WHERE DetailId IN({0}) ", DetailIds); string sql = string.Format(" UPDATE RB_Course_CommentDetails SET Status=1 WHERE DetailId IN({0}) ", DetailIds);
return base.Execute(sql) > 0; return base.Execute(sql) > 0;
} }
} }
......
EduSpider.Repository/StuCommentDetailsRepository.cs 0 → 100644
View file @ 3c9e2e35
using EduSpider.IRepository;
using EduSpider.Model.Entity;
using EduSpider.Model.Extend;
using EduSpider.Model.Query;
using EduSpider.Repository.Base;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using VTX.FW.DB.Dapper;
namespace EduSpider.Repository
{
/// <summary>
/// 学员评论详情仓储接口
/// </summary>
public class StuCommentDetailsRepository : BaseRepository<RB_Stu_CommentDetails>, IStuCommentDetailsRepository
{
/// <summary>
/// 批量新增修改学员评论详情
/// </summary>
/// <param name="list"></param>
/// <returns></returns>
public bool BatchSetStuCommentDetails(List<RB_Stu_CommentDetails> list)
{
foreach (var item in list)
{
var defaultModel = GetStuCommentDetailsListRepository(new RB_Stu_CommentDetails_Extend()
{
CourseId = item.CourseId,
Times = item.Times,
StuUid = item.StuUid,
HomeWorkId = item.HomeWorkId,
}).FirstOrDefault();
string createTimeStr = "";
if (defaultModel != null)
{
createTimeStr = VTX.FW.Helper.ConvertHelper.FormatTime(defaultModel.CreateTime.AddSeconds(1));
}
else
{
var homeWorkModel = new StuHomeWorkRepository().GetStuHomeWorkDetailsListRepository(new CourseQuery()
{
CourseId = item.CourseId,
HomeWorkId = item.HomeWorkId,
StuIds = item.StuUid.ToString()
}).FirstOrDefault();
if (homeWorkModel != null)
{
createTimeStr = VTX.FW.Helper.ConvertHelper.FormatTime(homeWorkModel.add_time.AddSeconds(1));
}
}
if (!string.IsNullOrEmpty(createTimeStr))
{
item.CreateTime = Convert.ToDateTime(createTimeStr);
}
else
{
item.CreateTime = DateTime.Now;
}
// flag = base.Insert(item) > 0;
}
bool flag = BatchInsert(list);
return flag;
}
/// <summary>
/// 获取学员评价详情
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Stu_CommentDetails_Extend> GetStuCommentDetailsListRepository(RB_Stu_CommentDetails_Extend query)
{
StringBuilder builder = new();
builder.AppendFormat(@"
SELECT A.*,s.StudentName as StuName
FROM RB_Stu_CommentDetails AS A LEFT JOIN rb_student s on A.StuUid = s.StudentUid
WHERE 1=1
");
if (query != null)
{
if (!string.IsNullOrWhiteSpace(query.QCommentMainIds))
{
builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Stu_CommentDetails_Extend.CommentMainId), query.QCommentMainIds);
}
if (query.CommentMainId > 0)
{
builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Stu_CommentDetails_Extend.CommentMainId), query.CommentMainId);
}
if (query.CourseId > 0)
{
builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Stu_CommentDetails_Extend.CourseId), query.CourseId);
}
if (query.Times > 0)
{
builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Stu_CommentDetails_Extend.Times), query.Times);
}
if (query.StuUid > 0)
{
builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Stu_CommentDetails_Extend.StuUid), query.StuUid);
}
if (query.HomeWorkId > 0)
{
builder.AppendFormat(@" AND A.{0} ={1} ", nameof(RB_Stu_CommentDetails_Extend.HomeWorkId), query.HomeWorkId);
}
}
return Get<RB_Stu_CommentDetails_Extend>(builder.ToString()).ToList();
}
/// <summary>
/// 修改学生评价
/// </summary>
/// <param name="Ids"></param>
/// <param name="Info"></param>
/// <returns></returns>
public bool SetStuCommentDetailsInfoRepository(string Ids,string Info)
{
string sql = string.Format("UPDATE RB_Stu_CommentDetails SET Info=@Info WHERE Id IN({0}) ", Ids);
DynamicParameters parameters = new();
parameters.Add("Info", Info);
return base.Execute(sql,parameters) > 0;
}
/// <summary>
/// 根据课程编号和次数修改评价可见状态
/// </summary>
/// <param name="CourseId"></param>
/// <param name="CommentMainId">评价主表编号</param>
/// <param name="ShowType"></param>
/// <returns></returns>
public bool SetStuCommentShowTypeByTimesRepository(int CourseId, int CommentMainId, int ShowType)
{
string sql = string.Format("UPDATE RB_Stu_CommentDetails SET ShowType={0} WHERE CourseId={1} AND CommentMainId={2}", ShowType, CourseId, CommentMainId);
return base.Execute(sql) > 0;
}
/// <summary>
/// 修改学员评论可见状态
/// </summary>
/// <param name="ShowType"></param>
/// <param name="Ids"></param>
/// <returns></returns>
public bool SetStuCommentDetailsShowTypeRepository(int ShowType, string Ids)
{
string sql = string.Format("UPDATE RB_Stu_CommentDetails SET ShowType={0} WHERE Id IN({1}) ", ShowType, Ids);
return base.Execute(sql) > 0;
}
/// <summary>
/// 根据编号删除评论
/// </summary>
/// <param name="Ids"></param>
/// <returns></returns>
public bool DeleteStuCommentRepository(string Ids)
{
string sql = string.Format("UPDATE RB_Stu_CommentDetails SET Status=1 WHERE Id IN({0}) ", Ids);
return base.Execute(sql) > 0;
}
}
}
EduSpider.Services/CourseService.cs
View file @ 3c9e2e35
...@@ -8,8 +8,6 @@ using EduSpider.Repository; ...@@ -8,8 +8,6 @@ using EduSpider.Repository;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VTX.FW.Attr; using VTX.FW.Attr;
namespace EduSpider.Services namespace EduSpider.Services
...@@ -73,6 +71,11 @@ namespace EduSpider.Services ...@@ -73,6 +71,11 @@ namespace EduSpider.Services
[Autowired] [Autowired]
public IStuCommentRepository StuCommentRepository { get; set; } public IStuCommentRepository StuCommentRepository { get; set; }
/// <summary>
/// 学员评价详情仓储接口
/// </summary>
[Autowired]
public IStuCommentDetailsRepository StuCommentDetailsRepository { get; set; }
/// <summary> /// <summary>
...@@ -354,48 +357,35 @@ namespace EduSpider.Services ...@@ -354,48 +357,35 @@ namespace EduSpider.Services
} }
/// <summary> /// <summary>
/// 新增修改学员评价 /// 批量新增学员评价
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="list"></param>
/// <returns></returns> /// <returns></returns>
public bool SetStuComment(RB_Stu_Comment model) public bool BatchSetStuComment(RB_Stu_Comment_Extend model, StuCommentType commentType)
{ {
if (model.Id <= 0 && model.HomeWorkId > 0) return StuCommentRepository.BatchSetStuCommentRepository(model, commentType);
{
var stuHomeWork = StuHomeWorkRepository.GetStuHomeWorkDetailsListRepository(new CourseQuery()
{
CourseId = model.CourseId,
HomeWorkId = model.HomeWorkId,
StuIds = model.StuUid.ToString()
}).FirstOrDefault();
if (stuHomeWork != null)
{
model.CreateTime = stuHomeWork.add_time.AddSeconds(1);
}
}
return StuCommentRepository.SetStuCommentRepository(model);
} }
/// <summary> /// <summary>
/// 批量新增学员评价 /// 获取学员评价列表
/// </summary> /// </summary>
/// <param name="list"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public bool BatchSetStuComment(List<RB_Stu_Comment> list, StuCommentType commentType) public List<RB_Stu_CommentDetails_Extend> GetStuCommentDetailsList(RB_Stu_CommentDetails_Extend query)
{ {
return StuCommentRepository.BatchSetStuCommentRepository(list,commentType); var list = StuCommentDetailsRepository.GetStuCommentDetailsListRepository(query);
return list;
} }
/// <summary> /// <summary>
/// 获取学员评价列表 /// 修改学生评语
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="Ids"></param>
/// <param name="Info"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Stu_Comment_Extend> GetStuCommentList(CourseQuery query) public bool SetStuCommentDetailsInfo(string Ids, string Info)
{ {
var list = StuCommentRepository.GetStuCommentList(query); return StuCommentDetailsRepository.SetStuCommentDetailsInfoRepository(Ids, Info);
return list;
} }
/// <summary> /// <summary>
...@@ -404,21 +394,21 @@ namespace EduSpider.Services ...@@ -404,21 +394,21 @@ namespace EduSpider.Services
/// <param name="ShowType"></param> /// <param name="ShowType"></param>
/// <param name="Ids"></param> /// <param name="Ids"></param>
/// <returns></returns> /// <returns></returns>
public bool SetStuCommentShowType(int ShowType, string Ids) public bool SetStuCommentDetailsShowType(int ShowType, string Ids)
{ {
return StuCommentRepository.SetStuCommentShowTypeRepository(ShowType, Ids); return StuCommentDetailsRepository.SetStuCommentDetailsShowTypeRepository(ShowType, Ids);
} }
/// <summary> /// <summary>
/// 根据课程评论次数修改可见等级 /// 根据课程评论次数修改可见等级
/// </summary> /// </summary>
/// <param name="CourseId">课程编号</param> /// <param name="CourseId">课程编号</param>
/// <param name="Times">次数</param> /// <param name="CommentMainId">评价主表编号</param>
/// <param name="ShowType">可见性</param> /// <param name="ShowType">可见性</param>
/// <returns></returns> /// <returns></returns>
public bool SetStuCommentShowTypeByTimes(int CourseId, int Times, int ShowType) public bool SetStuCommentShowTypeByTimes(int CourseId, int CommentMainId, int ShowType)
{ {
return StuCommentRepository.SetStuCommentShowTypeByTimesRepository(CourseId, Times, ShowType); return StuCommentDetailsRepository.SetStuCommentShowTypeByTimesRepository(CourseId, CommentMainId, ShowType);
} }
...@@ -429,7 +419,7 @@ namespace EduSpider.Services ...@@ -429,7 +419,7 @@ namespace EduSpider.Services
/// <returns></returns> /// <returns></returns>
public bool RemoveStuComment(string Ids) public bool RemoveStuComment(string Ids)
{ {
return StuCommentRepository.DeleteStuCommentRepository(Ids); return StuCommentDetailsRepository.DeleteStuCommentRepository(Ids);
} }
/// <summary> /// <summary>
...@@ -437,15 +427,21 @@ namespace EduSpider.Services ...@@ -437,15 +427,21 @@ namespace EduSpider.Services
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Stu_Comment> GetCourseCommentTimesList(CourseQuery query) public List<RB_Stu_Comment_Extend> GetCourseCommentTimesList(CourseQuery query)
{ {
var list = StuCommentRepository.GetCourseCommentTimesListRepository(query); var list = StuCommentRepository.GetCourseCommentTimesListRepository(query);
if (list != null && list.Count > 0) if (list != null && list.Count > 0)
{ {
string qIds = string.Join(",", list.Select(qitem => qitem.Id));
List<RB_Stu_CommentDetails_Extend> detailsList = new List<RB_Stu_CommentDetails_Extend>();
if (!string.IsNullOrEmpty(qIds))
{
detailsList= StuCommentDetailsRepository.GetStuCommentDetailsListRepository(new RB_Stu_CommentDetails_Extend() { QCommentMainIds = qIds });
}
foreach (var item in list) foreach (var item in list)
{ {
int ShowType = 3; int ShowType = 3;
var subList = StuCommentRepository.GetStuCommentListRepository(new CourseQuery() { CourseId = item.CourseId, CommentTimes = item.Times }); var subList = detailsList?.Where(qitem => qitem.CommentMainId == item.Id)?.ToList();
if (subList != null && subList.Count > 0) if (subList != null && subList.Count > 0)
{ {
var totalCount = subList.Count; var totalCount = subList.Count;
...@@ -485,6 +481,10 @@ namespace EduSpider.Services ...@@ -485,6 +481,10 @@ namespace EduSpider.Services
/// <returns></returns> /// <returns></returns>
public List<ExamWorkResult> CreateHomeWorkComment(int CourseId) public List<ExamWorkResult> CreateHomeWorkComment(int CourseId)
{ {
if (StuHomeWorkRepository == null)
{
StuHomeWorkRepository = new StuHomeWorkRepository();
}
return StuHomeWorkRepository.CreateHomeWorkCommentRepository(CourseId); return StuHomeWorkRepository.CreateHomeWorkCommentRepository(CourseId);
} }
} }
......
EduSpider.WebApi/Properties/PublishProfiles/FolderProfile.pubxml
View file @ 3c9e2e35
...@@ -10,7 +10,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121. ...@@ -10,7 +10,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration> <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform> <LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider> <PublishProvider>FileSystem</PublishProvider>
<PublishUrl>G:\Publish\jinjieapi.oytour.com</PublishUrl> <PublishUrl>G:\Publish\jinjie_publish</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod> <WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
<TargetFramework>net5.0</TargetFramework>
<ProjectGuid>f0a5853b-7aa9-43bf-8e81-98b65f44a269</ProjectGuid>
<SelfContained>false</SelfContained>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
\ No newline at end of file
EduSpider.WebApi/Timers/TimedTaskServices.cs
View file @ 3c9e2e35
using EduSpider.IServices; using EduSpider.IServices;
using EduSpider.Services;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
...@@ -18,8 +19,7 @@ namespace EduSpider.WebApi.Timers ...@@ -18,8 +19,7 @@ namespace EduSpider.WebApi.Timers
/// <summary> /// <summary>
/// 课程仓储接口 /// 课程仓储接口
/// </summary> /// </summary>
[Autowired] public ICourseService CourseService = new CourseService();
public ICourseService CourseService { get; set; }
//定义一个定时器 //定义一个定时器
private Timer _timer; private Timer _timer;
...@@ -32,7 +32,7 @@ namespace EduSpider.WebApi.Timers ...@@ -32,7 +32,7 @@ namespace EduSpider.WebApi.Timers
{ {
VTX.FW.Helper.LogHelper.WriteInfo("StartAsync","定时任务被启动"); VTX.FW.Helper.LogHelper.WriteInfo("StartAsync","定时任务被启动");
int Interval = 0; int Interval = 0;
Interval = 2; Interval = 30;//30分钟执行一次
//Interval = 1; //Interval = 1;
//绑定定时任务 //绑定定时任务
//设置延迟时间 //设置延迟时间
...@@ -55,15 +55,15 @@ namespace EduSpider.WebApi.Timers ...@@ -55,15 +55,15 @@ namespace EduSpider.WebApi.Timers
/// <returns></returns> /// <returns></returns>
private void DoWork(object state) private void DoWork(object state)
{ {
VTX.FW.Helper.LogHelper.WriteInfo("DoWork","定时任务被触发");
try try
{ {
if (Interlocked.Exchange(ref create_Comment, 1) == 0) if (Interlocked.Exchange(ref create_Comment, 1) == 0)
{ {
VTX.FW.Helper.LogHelper.WriteInfo("DoWork", "DealMarketConsultantData========Start"); VTX.FW.Helper.LogHelper.WriteInfo("DoWork", "CreateHomeWorkComment========Start");
Thread.Sleep(1000 * 60 * 1);
var today = DateTime.Now; var today = DateTime.Now;
CourseService.CreateHomeWorkComment(0); CourseService.CreateHomeWorkComment(0);
VTX.FW.Helper.LogHelper.WriteInfo("DoWork", "DealMarketConsultantData========End"); VTX.FW.Helper.LogHelper.WriteInfo("DoWork", "CreateHomeWorkComment==========End");
Interlocked.Exchange(ref create_Comment, 0); Interlocked.Exchange(ref create_Comment, 0);
} }
} }
......
EduSpider/MindService.cs
View file @ 3c9e2e35
...@@ -23,8 +23,10 @@ namespace EduSpider ...@@ -23,8 +23,10 @@ namespace EduSpider
protected override void OnStart(string[] args) protected override void OnStart(string[] args)
{ {
VTX.FW.Helper.LogHelper.WriteInfo("OnStart", "开始服务"); VTX.FW.Helper.LogHelper.WriteInfo("OnStart", "开始服务");
timer1 = new System.Timers.Timer(); timer1 = new System.Timers.Timer
timer1.Interval = 1000 * 60 * 1; //60分钟 {
Interval = 1000 * 60 * 1 //60分钟
};
timer1.Elapsed += new System.Timers.ElapsedEventHandler(RunClassInData); timer1.Elapsed += new System.Timers.ElapsedEventHandler(RunClassInData);
timer1.Enabled = true; timer1.Enabled = true;
} }
......
EduSpider/Spiders/SchoolHouseKeeper/SchoolCourseManager.cs
View file @ 3c9e2e35
...@@ -46,7 +46,7 @@ namespace EduSpider.Spiders.SchoolHouseKeeper ...@@ -46,7 +46,7 @@ namespace EduSpider.Spiders.SchoolHouseKeeper
string result; string result;
result = Utility.SchoolHttpHelper.HttpPost(url, VTX.FW.Helper.JsonHelper.Serialize(pageModel), "application/json", cookie); ; result = Utility.SchoolHttpHelper.HttpPost(url, VTX.FW.Helper.JsonHelper.Serialize(pageModel), "application/json", cookie); ;
List<SchoolCourseItem> list = new List<SchoolCourseItem>(); List<SchoolCourseItem> list = new();
if (!string.IsNullOrEmpty(result)) if (!string.IsNullOrEmpty(result))
{ {
JObject jobj = JObject.Parse(result); JObject jobj = JObject.Parse(result);
...@@ -56,7 +56,7 @@ namespace EduSpider.Spiders.SchoolHouseKeeper ...@@ -56,7 +56,7 @@ namespace EduSpider.Spiders.SchoolHouseKeeper
Console.WriteLine(string.Format("已完成 第 {0} 页/共 {1} 页,已完成 {2} 条/总共 {3} 条", pageModel.PageIndex, pageCount, pageModel.PageSize * pageModel.PageIndex, totalCount)); Console.WriteLine(string.Format("已完成 第 {0} 页/共 {1} 页,已完成 {2} 条/总共 {3} 条", pageModel.PageIndex, pageCount, pageModel.PageSize * pageModel.PageIndex, totalCount));
if (pageCount > pageModel.PageIndex) if (pageCount > pageModel.PageIndex)
{ {
Random random = new Random(); Random random = new();
for (var i = 2; i <= pageCount; i++) for (var i = 2; i <= pageCount; i++)
{ {
var num = random.Next(1, 10); var num = random.Next(1, 10);
...@@ -83,7 +83,7 @@ namespace EduSpider.Spiders.SchoolHouseKeeper ...@@ -83,7 +83,7 @@ namespace EduSpider.Spiders.SchoolHouseKeeper
/// <returns></returns> /// <returns></returns>
public static List<SchoolCourseItem> ParseJson(string data) public static List<SchoolCourseItem> ParseJson(string data)
{ {
List<SchoolCourseItem> list = new List<SchoolCourseItem>(); List<SchoolCourseItem> list = new();
if (!string.IsNullOrEmpty(data)) if (!string.IsNullOrEmpty(data))
{ {
JArray courseArray = JArray.Parse(data); JArray courseArray = JArray.Parse(data);
......
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