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

Edu.Module.Course/ClassModule.cs

@@ -813,6 +813,52 @@ namespace Edu.Module.Course
             return list;
         }
 
+
+
+        /// <summary>
+        /// 获取班级计划列表
+        /// </summary>
+        /// <param name="classId">班级编号</param>
+        /// <param name="monthStr">月份</param>
+        /// <returns></returns>
+        public object GetClassPlan_V2(RB_Class_Plan_ViewModel model)
+        {
+            List<object> list = new List<object>();
+            var timeList = new List<RB_Class_Time_ViewModel>();
+            var planList = class_PlanRepository.GetClassPlanListRepository(model)?.OrderBy(qitem => qitem.ClassDate);
+            if (planList != null && planList.Count() > 0)
+            {
+                string Ids = string.Join(",", planList.Select(qitem => qitem.ClassPlanId));
+                if (!string.IsNullOrEmpty(Ids))
+                {
+                    timeList = class_TimeRepository.GetClassTimeListRepository(new RB_Class_Time_ViewModel() { QClassPlanIds = Ids });
+                }
+                DateTime today = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd"));
+                foreach (var item in planList)
+                {
+                    item.PlanTimeList = timeList?.Where(qitem => qitem.ClassPlanId == item.ClassPlanId)?.ToList();
+                    list.Add(new
+                    {
+                        IsEndDate = item.ClassDate <= today,
+                        item.ClassPlanId,
+                        item.ClassId,
+                        item.ClassDate,
+                        ClassDateStr = Common.ConvertHelper.FormatDate(item.ClassDate),
+                        item.ClassRoomId,
+                        item.RoomName,
+                        item.TeacherId,
+                        item.TeacherName,
+                        item.UserIcon,
+                        TimeList = item?.PlanTimeList?.Select(qitem => new { qitem.ClassTimeId, qitem.StartTime, qitem.EndTime })?.OrderBy(qitem => qitem.StartTime)
+                    });
+                }
+            }
+            return list;
+        }
+
+
+
+
         /// <summary>
         /// 根据计划编号删除上课计划
         /// </summary>

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -227,7 +227,7 @@ SELECT a.*,c.Teacher_Id,c.ClassName,c.ClassType,T.TeacherName
 FROM rb_class_plan as a 
     LEFT JOIN rb_class c on a.ClassId = c.ClassId
     LEFT JOIN rb_teacher AS T ON a.TeacherId=T.TId
-where  a.`Status`=0 ");
+where  a.`Status`=0 and c.ClassStatus=2  and c.`Status`=0");
             if (query != null)
             {
                 if (query.Group_Id > 0)

Edu.Repository/Course/RB_Class_TimeRepository.cs

@@ -161,7 +161,7 @@ WHERE 1=1
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@" SELECT a.*,c.ClassName,b.ClassRoomId from rb_class_time as a LEFT JOIN rb_class_plan as b on a.ClassPlanId=b.ClassPlanId 
 LEFT JOIN rb_class as c on a.ClassId=c.ClassId
-where b.`Status`=0 and DATE_FORMAT(b.ClassDate,'%y/%m/%d')=DATE_FORMAT(NOW(),'%y/%m/%d') and b.`Status`=0 and c.`Status`=0 and c.ClassStatus=2 ");
+where b.`Status`=0 and DATE_FORMAT(b.ClassDate,'%y/%m/%d')=DATE_FORMAT(NOW(),'%y/%m/%d')  and c.`Status`=0 and c.ClassStatus=2 ");
             if (query != null)
             {
                 if (query.ClassPlanId > 0)

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -589,6 +589,26 @@ namespace Edu.WebApi.Controllers.Course
 
         #region 上课计划
 
+
+
+        /// <summary>
+        /// 获取上课计划
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetAllClassPlan()
+        {
+            var query = new RB_Class_Plan_ViewModel()
+            {
+                ClassId = base.ParmJObj.GetInt("ClassId"),
+                QMonth = base.ParmJObj.GetStringValue("QMonth"),
+                TeacherId = base.ParmJObj.GetInt("TeacherId"),
+                Group_Id = base.UserInfo.Group_Id,
+                School_Id = base.ParmJObj.GetInt("School_Id",-1),
+            };
+            var data = classModule.GetClassPlan_V2(query);
+            return ApiResult.Success(data: data);
+        }
+
         /// <summary>
         /// 获取上课计划
         /// </summary>

Edu.WebApi/Controllers/Course/ClassRoomController.cs

@@ -133,6 +133,8 @@ namespace Edu.WebApi.Controllers.Course
             {
                 extModel.RoomPicList = new List<string>();
             }
+            extModel.EndTime = extModel.EndTime ?? "09:30";
+            extModel.StartTime = extModel.StartTime ?? "21:30";
             return ApiResult.Success(data: extModel);
         }
 

Edu.WebApi/Controllers/Video/VideoController.cs

@@ -71,5 +71,53 @@ namespace Edu.WebApi.Controllers.Video
                 return ApiResult.Failed("获取失败");
             }
         }
+
+
+
+
+        /// <summary>
+        /// 获取播放地址
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetPlayInfo()
+        {
+            JObject jobj = JObject.Parse(RequestParm.Msg.ToString());
+            string VideoId = jobj.GetStringValue("strVid");
+
+            try
+            {
+                string regionId = "cn-shanghai";
+                IClientProfile profile = DefaultProfile.GetProfile(regionId, "LTAI5tBoku6yPFSkacA3sbAT", "zcjzTpMGyPwchaKAyUFeKNEBcqAxvL");
+                var acsClient = new Aliyun.Acs.Core.DefaultAcsClient(profile);
+
+                if (string.IsNullOrEmpty(VideoId))
+                {
+                    return ApiResult.Failed("获取失败");
+                }
+                GetPlayInfoRequest request = new GetPlayInfoRequest();
+                request.VideoId = VideoId;
+                // 初始化客户端
+                // DefaultAcsClient client = InitVodClient();
+                // 发起请求，并得到 response
+
+                GetPlayInfoResponse response = acsClient.GetAcsResponse(request);
+                List<GetPlayInfoResponse.GetPlayInfo_PlayInfo> playInfoList = response.PlayInfoList;
+                GetPlayInfoResponse.GetPlayInfo_VideoBase videoBase = response.VideoBase;
+                if (playInfoList.Count > 0)
+                {
+                    return ApiResult.Success("",new { URL= playInfoList[0].PlayURL ,VideoImg= videoBase.CoverURL});
+                }
+                else
+                {
+                    return ApiResult.Failed("获取失败");
+                }
+            }
+            catch (Exception)
+            {
+                return ApiResult.Failed("获取失败");
+            }
+        }
     }
 }