scc
This commit is contained in:
parent
4af2ed6c7d
commit
b11ae8d679
@ -97,25 +97,29 @@ namespace YD_AllHeartRates.Api.Mqtt
|
|||||||
|
|
||||||
if (studentList == null || devices == null)
|
if (studentList == null || devices == null)
|
||||||
{
|
{
|
||||||
studentList = (from d in _smartSportsContext.Device
|
studentList = (
|
||||||
join s in _smartSportsContext.Student on d.StudentNo equals s.StudentNo
|
from s in _smartSportsContext.Student
|
||||||
join c in _smartSportsContext.Class on s.ClassId equals c.Id
|
join c in _smartSportsContext.Class on s.ClassId equals c.Id
|
||||||
where s.SchoolCode == AppSettings.SchoolCode && s.StudentStatus == 1
|
join d in _smartSportsContext.Device on s.StudentNo equals d.StudentNo into sd
|
||||||
select new StudentDto
|
from d in sd.DefaultIfEmpty()
|
||||||
{
|
where s.SchoolCode == AppSettings.SchoolCode && s.StudentStatus == 1
|
||||||
SchoolCode = s.SchoolCode,
|
select new StudentDto
|
||||||
StudentNo = s.StudentNo,
|
{
|
||||||
StudentName = s.StudentName,
|
SchoolCode = s.SchoolCode,
|
||||||
Sex = s.Sex,
|
StudentNo = s.StudentNo,
|
||||||
Age = s.Age,
|
StudentName = s.StudentName,
|
||||||
HeartRateId = d.Code,
|
Sex = s.Sex,
|
||||||
JumpRopeId = d.Code,
|
Age = s.Age,
|
||||||
ClassId = s.ClassId,
|
HeartRateId = d != null ? d.Code : "",
|
||||||
ClassName = s.ClassName,
|
JumpRopeId = d != null ? d.Code : "",
|
||||||
GradeId = c.GradeId,
|
ClassId = s.ClassId,
|
||||||
GradeName = c.GradeName ?? "",
|
ClassName = s.ClassName,
|
||||||
DeviceType = d.DeviceType,
|
GradeId = c.GradeId,
|
||||||
}).ToList();
|
GradeName = c.GradeName ?? "",
|
||||||
|
DeviceType = d != null ? d.DeviceType : 0
|
||||||
|
}
|
||||||
|
).ToList();
|
||||||
|
|
||||||
|
|
||||||
devices = _smartSportsContext.Device.Where(x => x.SchoolCode == AppSettings.SchoolCode && !string.IsNullOrWhiteSpace(x.StudentNo)).ToList();
|
devices = _smartSportsContext.Device.Where(x => x.SchoolCode == AppSettings.SchoolCode && !string.IsNullOrWhiteSpace(x.StudentNo)).ToList();
|
||||||
|
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
namespace YD_AllHeartRates.Api
|
|
||||||
{
|
|
||||||
public class XS
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
「」
|
|
||||||
为了确定魏恒是否喝了酒,
|
|
||||||
我去电话亭给他打了一个电话,
|
|
||||||
我故意用言语激怒他,听到杯子摔碎得声音,
|
|
||||||
我知道我的计划成功了。
|
|
||||||
随后便是魏恒倒下得声音。
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
}
|
|
@ -14,7 +14,7 @@ using System.Reflection;
|
|||||||
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Api")]
|
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Api")]
|
||||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+adb7a5132ba408ee1c99d16fb2ead9bed7a7ccc5")]
|
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+4af2ed6c7dde8915d38199959dc15eb0626ad29e")]
|
||||||
[assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Api")]
|
[assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Api")]
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Api")]
|
[assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Api")]
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||||
|
@ -1 +1 @@
|
|||||||
6198966bba43cd9c423a58fba5f3c39b124d08b73c11ccc008ce22ad17ebb10f
|
beaa3e786d777e801e865749bc1ed887c9c8bed6062702fc86efc5e999ecbaef
|
||||||
|
Loading…
x
Reference in New Issue
Block a user