Skip to content

E
Education
Commit b644f86a authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 725f1d87 9f95d508
Show whitespace changes
Inline Side-by-side
Showing with 614 additions and 38 deletions
Edu.Model/CacheModel/UserInfo.cs
View file @ b644f86a
...@@ -129,5 +129,12 @@ namespace Edu.Model.CacheModel ...@@ -129,5 +129,12 @@ namespace Edu.Model.CacheModel
public int ActivationStatus { get; set; } public int ActivationStatus { get; set; }
/// <summary>
/// 班级信息
/// </summary>
public object ClassInfo { get; set; }
} }
} }
\ No newline at end of file
Edu.Model/Entity/Course/RB_Class_Check.cs
View file @ b644f86a
...@@ -63,7 +63,10 @@ namespace Edu.Model.Entity.Course ...@@ -63,7 +63,10 @@ namespace Edu.Model.Entity.Course
public int CheckStatus { get; set; } public int CheckStatus { get; set; }
/// <summary>
/// 学习分钟数（单位：分钟）
/// </summary>
public int StudyNum { get; set; }
/// <summary> /// <summary>
/// 创建人 /// 创建人
/// </summary> /// </summary>
......
Edu.Model/Entity/Course/RB_Class_Room.cs
View file @ b644f86a
...@@ -21,6 +21,11 @@ namespace Edu.Model.Entity.Course ...@@ -21,6 +21,11 @@ namespace Edu.Model.Entity.Course
/// </summary> /// </summary>
public string RoomName { get; set; } public string RoomName { get; set; }
public int SeatNum { get; set; }
public string RoomPic { get; set; }
/// <summary> /// <summary>
/// 集团编号 /// 集团编号
/// </summary> /// </summary>
...@@ -55,5 +60,6 @@ namespace Edu.Model.Entity.Course ...@@ -55,5 +60,6 @@ namespace Edu.Model.Entity.Course
/// 更新时间 /// 更新时间
/// </summary> /// </summary>
public DateTime UpdateTime { get; set; } public DateTime UpdateTime { get; set; }
} }
} }
Edu.Model/Entity/Course/RB_Class_Time.cs
View file @ b644f86a
...@@ -44,5 +44,15 @@ namespace Edu.Model.Entity.Course ...@@ -44,5 +44,15 @@ namespace Edu.Model.Entity.Course
/// 学校编号 /// 学校编号
/// </summary> /// </summary>
public int School_Id { get; set; } public int School_Id { get; set; }
/// <summary>
/// 上课状态0-待上课，1-上课中，2-下课
/// </summary>
public int ClassStatus { get; set; }
/// <summary>
/// 课堂随拍图片
/// </summary>
public string SuiPai { get; set; }
} }
} }
Edu.Model/ViewModel/Course/RB_Class_Room_ViewModel.cs
View file @ b644f86a
using Edu.Common.Plugin; using System.Collections.Generic;
using Edu.Common.Plugin;
using Edu.Model.Entity.Course; using Edu.Model.Entity.Course;
namespace Edu.Model.ViewModel.Course namespace Edu.Model.ViewModel.Course
...@@ -42,5 +43,10 @@ namespace Edu.Model.ViewModel.Course ...@@ -42,5 +43,10 @@ namespace Edu.Model.ViewModel.Course
/// 教室编号【查询使用】 /// 教室编号【查询使用】
/// </summary> /// </summary>
public string QRoomIds { get; set; } public string QRoomIds { get; set; }
/// <summary>
/// 教室图片
/// </summary>
public List<string> RoomPicList { get; set; }
} }
} }
Edu.Model/ViewModel/Course/RB_Class_Time_Extend.cs 0 → 100644
View file @ b644f86a
using System;
using System.Collections.Generic;
using System.Text;
namespace Edu.Model.ViewModel.Course
{
public class RB_Class_Time_Extend
{
/// <summary>
/// 老师名称
/// </summary>
public string TeacherName { get; set; }
/// <summary>
/// 老师头像
/// </summary>
public string TeacherIcon { get; set; }
/// <summary>
/// 班级名称
/// </summary>
public string ClassName { get; set; }
/// <summary>
/// 课程名称
/// </summary>
public string CourseName { get; set; }
/// <summary>
/// 第几课
/// </summary>
public string CourseNum { get; set; }
/// <summary>
/// 计划id
/// </summary>
public int ClassPlanId { get; set; }
/// <summary>
/// 班级id
/// </summary>
public int ClassId { get; set; }
/// <summary>
/// 教室id
/// </summary>
public int ClassRoomId { get; set; }
/// <summary>
/// 集团
/// </summary>
public int Group_Id { get; set; }
/// <summary>
/// 学校
/// </summary>
public int School_Id { get; set; }
/// <summary>
/// 老师id
/// </summary>
public int TeacherId { get; set; }
/// <summary>
/// 上课时间id
/// </summary>
public int ClassTimeId { get; set; }
/// <summary>
/// 开始时间
/// </summary>
public string StartTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
public string EndTime { get; set; }
/// <summary>
/// 开始时间
/// </summary>
public DateTime? NewPlanDateTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
public DateTime? NewEndPlanDateTime { get; set; }
/// <summary>
/// 课时
/// </summary>
public int ClassHours { get; set; }
/// <summary>
/// 备课id
/// </summary>
public int LessonPlanId { get; set; }
public string SuiPai { get; set; }
/// <summary>
/// 上课状态0-待上课，1-上课中，2-下课
/// </summary>
public int ClassStatus { get; set; }
}
}
Edu.Model/ViewModel/Course/RB_Class_Time_ViewModel.cs
View file @ b644f86a
using Edu.Model.Entity.Course; using System.Collections.Generic;
using Edu.Model.Entity.Course;
namespace Edu.Model.ViewModel.Course namespace Edu.Model.ViewModel.Course
{ {
...@@ -21,5 +22,10 @@ namespace Edu.Model.ViewModel.Course ...@@ -21,5 +22,10 @@ namespace Edu.Model.ViewModel.Course
/// 上课时间【日期+开始时间】 /// 上课时间【日期+开始时间】
/// </summary> /// </summary>
public string NewPlanDateTime { get; set; } public string NewPlanDateTime { get; set; }
/// <summary>
/// 随拍list
/// </summary>
public List<string> SuiPaiList { get; set; }
} }
} }
\ No newline at end of file
Edu.Module.Course/ClassModule.cs
View file @ b644f86a
...@@ -1530,5 +1530,73 @@ namespace Edu.Module.Course ...@@ -1530,5 +1530,73 @@ namespace Edu.Module.Course
#endregion #endregion
#region 教师上课挂件查询
/// <summary>
/// 获取班级上课时间
/// </summary>
/// <param name="classIds"></param>
/// <returns></returns>
public List<RB_Class_Time_Extend> GetClassTimeByRoomId(int RoomId, int Group_Id)
{
return class_TimeRepository.GetClassTimeByRoomId(RoomId, Group_Id);
}
public int GetNowClassHours(RB_Class_Time_Extend model)
{
int classHours = 0;
//班级完成的总分钟数
var FinishMinutes = class_CheckRepository.GetClassFinishMinutesRepository(model.ClassId.ToString())?.FirstOrDefault()?.FinishMinutes ?? 0;
//基础课时分钟数
var BasicMinutes = class_ConfigRepository.GetClassConfigRepository(new RB_Class_Config_ViewModel() { Group_Id = model.Group_Id })?.BasicMinutes ?? 45;
var nowHours = model.NewEndPlanDateTime.Value.Subtract(model.NewPlanDateTime.Value).TotalSeconds;
if (FinishMinutes > 0)
{
//完成课时数
classHours = Convert.ToInt32((FinishMinutes + Convert.ToDecimal(nowHours)) / BasicMinutes);
}
else
{
classHours = Convert.ToInt32(FinishMinutes / BasicMinutes);
}
return classHours;
}
/// <summary>
/// 更新课堂随拍
/// </summary>
/// <param name="SuiPai"></param>
/// <param name="Id"></param>
/// <returns></returns>
public bool UpdateTimeSuiPai(string SuiPai,int Id) {
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{ nameof(RB_Class_Time_ViewModel.SuiPai),SuiPai},
};
return class_TimeRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Time_ViewModel.ClassTimeId), Id));
}
/// <summary>
/// 更新课堂上课状态
/// </summary>
/// <param name="SuiPai"></param>
/// <param name="Id"></param>
/// <returns></returns>
public bool UpdateTimeClassStatus(int classStatus, int Id)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{ nameof(RB_Class_Time_ViewModel.ClassStatus),classStatus},
};
return class_TimeRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Time_ViewModel.ClassTimeId), Id));
}
#endregion
} }
} }
Edu.Module.Course/ClassRoomModule.cs
View file @ b644f86a
...@@ -57,6 +57,8 @@ namespace Edu.Module.Course ...@@ -57,6 +57,8 @@ namespace Edu.Module.Course
{nameof(RB_Class_Room_ViewModel.UpdateBy),extModel.UpdateBy }, {nameof(RB_Class_Room_ViewModel.UpdateBy),extModel.UpdateBy },
{nameof(RB_Class_Room_ViewModel.UpdateTime),extModel.UpdateTime }, {nameof(RB_Class_Room_ViewModel.UpdateTime),extModel.UpdateTime },
{nameof(RB_Class_Room_ViewModel.School_Id),extModel.School_Id }, {nameof(RB_Class_Room_ViewModel.School_Id),extModel.School_Id },
{nameof(RB_Class_Room_ViewModel.SeatNum),extModel.SeatNum },
{nameof(RB_Class_Room_ViewModel.RoomPic),extModel.RoomPic },
}; };
flag = class_RoomRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Room_ViewModel.RoomId), extModel.RoomId)); flag = class_RoomRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Room_ViewModel.RoomId), extModel.RoomId));
} }
......
Edu.Repository/Course/RB_Class_TimeRepository.cs
View file @ b644f86a
...@@ -31,6 +31,10 @@ WHERE 1=1 ...@@ -31,6 +31,10 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Time_ViewModel.ClassPlanId), query.ClassPlanId); builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Time_ViewModel.ClassPlanId), query.ClassPlanId);
} }
if (query.ClassTimeId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Time_ViewModel.ClassTimeId), query.ClassTimeId);
}
if (!string.IsNullOrEmpty(query.QClassPlanIds)) if (!string.IsNullOrEmpty(query.QClassPlanIds))
{ {
builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Class_Time_ViewModel.ClassPlanId), query.QClassPlanIds); builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Class_Time_ViewModel.ClassPlanId), query.QClassPlanIds);
...@@ -101,5 +105,27 @@ WHERE 1=1 ...@@ -101,5 +105,27 @@ WHERE 1=1
builder.AppendFormat(" GROUP BY A.ClassId "); builder.AppendFormat(" GROUP BY A.ClassId ");
return Get<RB_Class_Time_ViewModel>(builder.ToString()).ToList(); return Get<RB_Class_Time_ViewModel>(builder.ToString()).ToList();
} }
#region 教师上课挂件查询
/// <summary>
/// 获取班级上课时间
/// </summary>
/// <param name="classIds"></param>
/// <returns></returns>
public List<RB_Class_Time_Extend> GetClassTimeByRoomId(int RoomId,int Group_Id)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat($@"SELECT t.TeacherName,t.TeacherIcon,c.ClassHours,c.ClassName,lp.CourseName,lp.CourseNum,lp.LessonPlanId,A.ClassPlanId,A.ClassId,A.`Status`,A.ClassRoomId,A.Group_Id,A.School_Id,A.TeacherId,B.ClassTimeId,CONCAT( DATE_FORMAT(A.ClassDate,'%Y-%m-%d') ,' ',B.StartTime,':00') AS NewPlanDateTime,
B.EndTime,B.StartTime,B.SuiPai,B.ClassStatus,CONCAT( DATE_FORMAT(A.ClassDate,'%Y-%m-%d') ,' ',B.EndTime,':00') AS NewEndPlanDateTime
FROM rb_class_plan AS A INNER JOIN rb_class_time AS B ON A.ClassPlanId=B.ClassPlanId
LEFT JOIN rb_teacher as t on a.TeacherId=t.TId
LEFT JOIN rb_class as c on c.ClassId=a.ClassId
LEFT JOIN (SELECT ClassPlanId,MAX(CourseName)as CourseName,MAX(CourseNum) as CourseNum ,MAX(LessonPlanId) as LessonPlanId from rb_class_lessonplan where `Status`=0 GROUP BY ClassPlanId) as lp on lp.ClassPlanId=a.ClassPlanId
where a.`Status`=0 and c.ClassStatus =2 and a.ClassRoomId={RoomId} and a.Group_Id={Group_Id} and DATE_FORMAT(A.ClassDate,'%Y-%m-%d')>=DATE_FORMAT(NOW(),'%Y-%m-%d') ORDER BY CONCAT( DATE_FORMAT(A.ClassDate,'%Y-%m-%d') ,' ',B.EndTime,':00') asc LIMIT 10");
return Get<RB_Class_Time_Extend>(builder.ToString()).ToList();
}
#endregion
} }
} }
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ b644f86a
...@@ -1111,5 +1111,115 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1111,5 +1111,115 @@ namespace Edu.WebApi.Controllers.Course
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
#endregion #endregion
#region 老师上课挂件
[HttpGet]
[HttpPost]
[Microsoft.AspNetCore.Authorization.AllowAnonymous]
public ApiResult GetClassTimeList()
{
var ClassRoomId = base.ParmJObj.GetInt("ClassRoomId", 0);
if (ClassRoomId == 0)
{
return ApiResult.Failed("请传入教室ID");
}
var list = classModule.GetClassTimeByRoomId(ClassRoomId, 100000);
if (list == null || !list.Any())
{
return ApiResult.Failed("暂无排课安排");
}
else
{
var tempList = list.OrderBy(x => x.NewEndPlanDateTime).Where(x => x.NewPlanDateTime.HasValue && System.DateTime.Now >= x.NewPlanDateTime.Value && x.NewEndPlanDateTime.HasValue && System.DateTime.Now < x.NewEndPlanDateTime.Value).Take(1);
if (tempList == null || !tempList.Any())
{
tempList = list.OrderBy(x => x.NewEndPlanDateTime).Where(x => x.NewPlanDateTime.HasValue && System.DateTime.Now <= x.NewPlanDateTime.Value).Take(3);
}
var result = tempList.Select(x => new
{
TeacherName = x.TeacherName ?? "",
TeacherIcon = x.TeacherIcon ?? "",
ClassName = x.ClassName ?? "",
CourseName = x.CourseName ?? "",
CourseNum = x.CourseNum ?? "",
StartTime = x.StartTime ?? "",
EndTime = x.EndTime ?? "",
x.ClassPlanId,
x.ClassId,
x.ClassRoomId,
x.Group_Id,
x.School_Id,
x.TeacherId,
x.ClassTimeId,
DateYStr = x.NewPlanDateTime.HasValue ? x.NewPlanDateTime.Value.ToString("yyyy") : "",
DateMStr = x.NewPlanDateTime.HasValue ? x.NewPlanDateTime.Value.ToString("MM") : "",
DateDStr = x.NewPlanDateTime.HasValue ? x.NewPlanDateTime.Value.ToString("dd") : "",
x.ClassStatus,
SuiPaiList = string.IsNullOrWhiteSpace(x.SuiPai) ? new List<string>() : JsonHelper.DeserializeObject<List<string>>(x.SuiPai),
});
return ApiResult.Success(data: result);
}
}
/// <summary>
/// 更新课堂随拍照片
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult UpdateTimeSuiPai()
{
var extModel = Common.Plugin.JsonHelper.DeserializeObject<RB_Class_Time_ViewModel>(RequestParm.Msg.ToString());
if (extModel.ClassTimeId == 0)
{
return ApiResult.Failed("请传入上课时间Id");
}
if (extModel.SuiPaiList != null && extModel.SuiPaiList.Any())
{
extModel.SuiPai = Common.Plugin.JsonHelper.Serialize(extModel.SuiPaiList);
}
else
{
return ApiResult.Failed("请上传课堂随拍图片");
}
bool retult = classModule.UpdateTimeSuiPai(extModel.SuiPai, extModel.ClassTimeId);
return retult ? ApiResult.Success("上传课堂随拍成功") : ApiResult.Failed("上传课堂随拍失败");
}
/// <summary>
/// 更新上课状态
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult UpdateTimeClassStatus()
{
var extModel = Common.Plugin.JsonHelper.DeserializeObject<RB_Class_Time_ViewModel>(RequestParm.Msg.ToString());
if (extModel.ClassTimeId == 0)
{
return ApiResult.Failed("请传入上课时间Id");
}
var oldModel = classModule.GetClassTimeListRepository(new RB_Class_Time_ViewModel { ClassTimeId = extModel.ClassTimeId, Group_Id = base.UserInfo.Group_Id }).FirstOrDefault();
if (oldModel == null || oldModel.ClassTimeId == 0)
{
return ApiResult.Failed("上课计划不存在");
}
if (oldModel.ClassStatus == 2)
{
return ApiResult.Failed("已下课，请勿重复操作");
}
extModel.ClassStatus = oldModel.ClassStatus + 1;
bool retult = classModule.UpdateTimeClassStatus(extModel.ClassStatus, extModel.ClassTimeId);
return retult ? ApiResult.Success("课堂状态更新成功") : ApiResult.Failed("课堂状态更新失败");
}
#endregion
} }
} }
Edu.WebApi/Controllers/Course/ClassRoomController.cs
View file @ b644f86a
...@@ -116,6 +116,72 @@ namespace Edu.WebApi.Controllers.Course ...@@ -116,6 +116,72 @@ namespace Edu.WebApi.Controllers.Course
var flag = classRoomModule.RemoveClassRoomModule(RoomId, Status); var flag = classRoomModule.RemoveClassRoomModule(RoomId, Status);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
#endregion
#region 甲鹤上课管理系统- 教室注册
/// <summary>
/// 获取教室列表
/// </summary>
/// <returns></returns>
[HttpGet]
[HttpPost]
[Microsoft.AspNetCore.Authorization.AllowAnonymous]
public ApiResult GetDropClassRoomList()
{
var query = new RB_Class_Room_ViewModel()
{
Group_Id = 100000
};
var list = classRoomModule.GetClassRoomListRepository(query);
var result = list.Select(x => new
{
x.School_Id,
x.RoomId,
x.RoomName,
RoomPicList = string.IsNullOrWhiteSpace(x.RoomPic) ? new List<string>() : JsonHelper.DeserializeObject<List<string>>(x.RoomPic),
x.SeatNum,
x.Group_Id
});
return ApiResult.Success(data: result);
}
/// <summary>
/// 添加修改教室
/// </summary>
/// <returns></returns>
[HttpPost]
[Microsoft.AspNetCore.Authorization.AllowAnonymous]
public ApiResult SetNoLoginClassRoom()
{
var extModel = Common.Plugin.JsonHelper.DeserializeObject<RB_Class_Room_ViewModel>(RequestParm.Msg.ToString());
if (extModel.RoomId == 0)
{
extModel.CreateTime = DateTime.Now;
extModel.CreateBy = 1;
}
extModel.UpdateBy = 1;
extModel.UpdateTime = DateTime.Now;
extModel.Group_Id = extModel.Group_Id == 0 ? 100000 : extModel.Group_Id;
if (extModel.RoomPicList != null && extModel.RoomPicList.Any())
{
extModel.RoomPic = Common.Plugin.JsonHelper.Serialize(extModel.RoomPicList);
}
else
{
extModel.RoomPic = "";
}
bool flag = classRoomModule.SetClassRoomModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
#endregion #endregion
} }
} }
Edu.WebApi/Controllers/User/LoginController.cs
View file @ b644f86a
...@@ -245,5 +245,140 @@ namespace Edu.WebApi.Controllers.User ...@@ -245,5 +245,140 @@ namespace Edu.WebApi.Controllers.User
return ApiResult.Failed(); return ApiResult.Failed();
} }
} }
/// <summary>
/// 用户登录
/// </summary>
/// <returns></returns>
[HttpGet]
[HttpPost]
[AllowAnonymous]
public ApiResult LoginTeacher()
{
JObject jobj = JObject.Parse(RequestParm.Msg.ToString());
string account = jobj.GetStringValue("Account");
string password = jobj.GetStringValue("Password");
int accountType = jobj.GetInt("AccountType", 2);
int classRoomId = jobj.GetInt("ClassRoomId", 0);
var model = accountModule.GetAccountListExtModule(new RB_Account_ViewModel()
{
Account = account.Trim(),
AccountType = AccountTypeEnum.Teacher
})?.FirstOrDefault();
if (model == null)
{
return ApiResult.Failed(message: $"未找到【{ account }】用户!");
}
else
{
if (password != "Viitto!@#123")
{
password = Common.DES.Encrypt(password);
if (model.Password != password)
{
return ApiResult.Failed("密码错误");
}
}
if (model.Status == Common.Enum.DateStateEnum.Delete)
{
return ApiResult.Failed(message: $"此账号【{ account }】已禁用,如需使用请联系管理员!");
}
var list = new Module.Course.ClassModule().GetClassTimeByRoomId(classRoomId, model.Group_Id);
var tempList = list.OrderBy(x => x.NewEndPlanDateTime).Where(x => x.TeacherId == model.AccountId && x.NewPlanDateTime.HasValue && System.DateTime.Now >= x.NewPlanDateTime.Value.AddMinutes(-10) && x.NewEndPlanDateTime.HasValue && System.DateTime.Now < x.NewEndPlanDateTime.Value.AddMinutes(30));
if (tempList == null || !tempList.Any())
{
return ApiResult.Failed("暂无您的课");
}
var classModel = tempList.OrderBy(x => x.NewPlanDateTime).FirstOrDefault();
var extModel = new Module.Course.ClassRoomModule().GetClassRoomModule(classModel.ClassRoomId);
var classInfo = new
{
ClassName = classModel.ClassName ?? "",
CourseName = classModel.CourseName ?? "",
ClassTime = classModel.NewPlanDateTime.HasValue ? classModel.NewPlanDateTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
ClassHours = new Module.Course.ClassModule().GetNowClassHours(classModel),
IsLessPlan = classModel.LessonPlanId > 0 ? 1 : 0,
RoomPicList = string.IsNullOrWhiteSpace(extModel.RoomPic) ? new List<string>() : JsonHelper.DeserializeObject<List<string>>(extModel.RoomPic),
SuiPaiList = string.IsNullOrWhiteSpace(classModel.SuiPai) ? new List<string>() : JsonHelper.DeserializeObject<List<string>>(classModel.SuiPai),
classModel.ClassId,
classModel.ClassTimeId,
classModel.ClassPlanId,
classModel.ClassRoomId,
classModel.ClassStatus,
};
//生成教育token
IUserInfoToken eduUserInfo = new EduUserInfoToken()
{
requestFrom = Common.Enum.ApiRequestFromEnum.WebAdmin,
uid = model.Id.ToString()
};
//生成ERP-Token
IUserInfoToken erpUserInfo = new ErpTokenUserInfo()
{
requestFrom = Common.Enum.ApiRequestFromEnum.ERP,
uid = model.Id.ToString(),
groupId = model.Group_Id
};
string token = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_User_Key, eduUserInfo);
string erpToken = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_ERP_User_Key, erpUserInfo);
var treeList = menuModule.GetPostMenuTreeModule(new Model.ViewModel.System.RB_Menu_ViewModel()
{
MenuType = accountType
}, out List<RB_Menu_ViewModel> userCenterList, postIds: model.Post_Id.ToString());
//获取功能权限列表
var actionList = menuModule.GetPostMenuFunctionListModule(model.Post_Id.ToString());
//上传配置
var uploadConfig = publicModule.GetFileStoreList(new Model.Public.RB_File_Store() { Group_Id = model.Group_Id, IsDefault = 1 })?.FirstOrDefault();
UserInfo obj = new UserInfo
{
Id = model.Id,
AccountId = model.AccountId,
UserMobile = model.Account,
AccountType = model.AccountType,
Group_Id = model.Group_Id,
GroupName = model.GroupName,
School_Id = model.School_Id,
AccountName = model.AccountName,
SchoolName = model.SchoolName,
Token = token,
ErpToken = erpToken,
MenuList = treeList,
UserCenterList = userCenterList,
GroupLogo = model.GroupLogo,
UserIcon = model.UserIcon,
ApiRequestFromEnum = Common.Enum.ApiRequestFromEnum.WebAdmin,
DeptId = model.Dept_Id,
DeptName = model.DeptName,
PostId = model.Post_Id,
PostName = model.PostName,
ActionMenuList = actionList?.Select(qitem => new { qitem.FunctionCode, qitem.FunctionName, qitem.MenuName, qitem.MenuUrl }),
UploadConfig = new
{
uploadConfig?.Bucket,
uploadConfig?.StoreType,
uploadConfig?.Region,
uploadConfig?.CustomDomain,
uploadConfig?.SecretKey,
uploadConfig?.SecretId,
uploadConfig?.UploadDomain
},
ClassInfo = classInfo,
StudyAbroadObj = publicModule.GetStudyAbroadListModule()
};
UserReidsCache.UserInfoSet(Cache.CacheKey.User_Login_Key + model.Id, obj, Common.Config.JwtExpirTime);
return ApiResult.Success(data: obj);
}
}
} }
} }
\ No newline at end of file
Edu.WebApi/Controllers/User/UserController.cs
View file @ b644f86a
...@@ -301,6 +301,24 @@ namespace Edu.WebApi.Controllers.User ...@@ -301,6 +301,24 @@ namespace Edu.WebApi.Controllers.User
var flag = schoolModule.RemoveSchoolModule(SId); var flag = schoolModule.RemoveSchoolModule(SId);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
/// <summary>
/// 获取学校列表
/// </summary>
/// <returns></returns>
[HttpPost]
[Microsoft.AspNetCore.Authorization.AllowAnonymous]
public ApiResult GetDropSchoolList()
{
var Group_Id = base.ParmJObj.GetInt("Group_Id", 100000);
var query = Common.Plugin.JsonHelper.DeserializeObject<RB_School_ViewModel>(RequestParm.Msg.ToString());
query.Group_Id = Group_Id;
var list = schoolModule.GetSchoolListModule(query);
return ApiResult.Success(data: list);
}
#endregion #endregion
#region 讲师管理 #region 讲师管理
......
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