sss
This commit is contained in:
parent
91983b0b81
commit
a4d00be7bd
@ -1488,10 +1488,10 @@ namespace VOL.Ai.Services
|
|||||||
&& (paramDto.ClassRoomStageId <= 0 || hrd.ClassroomStageId == paramDto.ClassRoomStageId)
|
&& (paramDto.ClassRoomStageId <= 0 || hrd.ClassroomStageId == paramDto.ClassRoomStageId)
|
||||||
select hrd;
|
select hrd;
|
||||||
|
|
||||||
var heartRateDataList = await query.ToListAsync();
|
var heartRateDataList = await query.Select(x => new { x.GradeName, x.StudentNo, x.StudentName, x.Sex, x.ClassName, x.Value, x.Strength, x.Consumption, x.ScoreTime }).ToListAsync();
|
||||||
|
|
||||||
//if (heartRateDataList.Count == 0)
|
if (heartRateDataList.Count == 0)
|
||||||
// return res;
|
return res;
|
||||||
|
|
||||||
var classRoom = await _teacherRepository.DbContext.Set<Ai_ClassRoomRecord>().Include(x => x.ClassroomStudentRecord)
|
var classRoom = await _teacherRepository.DbContext.Set<Ai_ClassRoomRecord>().Include(x => x.ClassroomStudentRecord)
|
||||||
.Where(x => x.SchoolCode == paramDto.SchoolCode && x.Id == paramDto.ClassRoomRecordId)
|
.Where(x => x.SchoolCode == paramDto.SchoolCode && x.Id == paramDto.ClassRoomRecordId)
|
||||||
@ -1583,7 +1583,7 @@ namespace VOL.Ai.Services
|
|||||||
hrd.StudentNo == paramDto.StudentNo
|
hrd.StudentNo == paramDto.StudentNo
|
||||||
select hrd;
|
select hrd;
|
||||||
|
|
||||||
var heartRateDataList = await query.ToListAsync();
|
var heartRateDataList = await query.Select(x => new { x.GradeName, x.StudentNo, x.StudentName, x.Sex, x.ClassName, x.Value, x.Strength, x.Consumption, x.ScoreTime }).ToListAsync();
|
||||||
|
|
||||||
if (heartRateDataList.Count == 0)
|
if (heartRateDataList.Count == 0)
|
||||||
return res;
|
return res;
|
||||||
|
@ -50,7 +50,7 @@ namespace VOL.WebApi
|
|||||||
serverOptions.Limits.MaxRequestLineSize = 81920; // 8 KB
|
serverOptions.Limits.MaxRequestLineSize = 81920; // 8 KB
|
||||||
// Set properties and call methods on options
|
// Set properties and call methods on options
|
||||||
});
|
});
|
||||||
webBuilder.UseKestrel().UseUrls("http://*:9993");
|
webBuilder.UseKestrel().UseUrls("http://*:9992");
|
||||||
webBuilder.UseIIS();
|
webBuilder.UseIIS();
|
||||||
webBuilder.UseStartup<Startup>();
|
webBuilder.UseStartup<Startup>();
|
||||||
}).UseServiceProviderFactory(new AutofacServiceProviderFactory());
|
}).UseServiceProviderFactory(new AutofacServiceProviderFactory());
|
||||||
|
@ -318,18 +318,18 @@ namespace VOL.WebApi
|
|||||||
//配置HttpContext
|
//配置HttpContext
|
||||||
app.UseStaticHttpContext();
|
app.UseStaticHttpContext();
|
||||||
|
|
||||||
//app.UseSwagger();
|
app.UseSwagger();
|
||||||
//app.UseSwaggerUI(c =>
|
app.UseSwaggerUI(c =>
|
||||||
//{
|
{
|
||||||
// //2个下拉框选项 选择对应的文档
|
//2个下拉框选项 选择对应的文档
|
||||||
// //c.SwaggerEndpoint("/swagger/v1/swagger.json", "VOL.Core后台Api");
|
//c.SwaggerEndpoint("/swagger/v1/swagger.json", "VOL.Core后台Api");
|
||||||
// //c.SwaggerEndpoint("/swagger/v2/swagger.json", "测试第三方Api");
|
//c.SwaggerEndpoint("/swagger/v2/swagger.json", "测试第三方Api");
|
||||||
// //c.SwaggerEndpoint("/swagger/v3/swagger.json", "SmartSportsServer-Api");
|
//c.SwaggerEndpoint("/swagger/v3/swagger.json", "SmartSportsServer-Api");
|
||||||
// //c.SwaggerEndpoint("/swagger/v4/swagger.json", "物联网-Api");
|
//c.SwaggerEndpoint("/swagger/v4/swagger.json", "物联网-Api");
|
||||||
// //c.SwaggerEndpoint("/swagger/v5/swagger.json", "Ai-Api");
|
//c.SwaggerEndpoint("/swagger/v5/swagger.json", "Ai-Api");
|
||||||
// c.SwaggerEndpoint("/swagger/v6/swagger.json", "AiApp-Api");
|
c.SwaggerEndpoint("/swagger/v6/swagger.json", "AiApp-Api");
|
||||||
// c.RoutePrefix = "";
|
c.RoutePrefix = "";
|
||||||
//});
|
});
|
||||||
|
|
||||||
app.UseRouting();
|
app.UseRouting();
|
||||||
app.UseCors();
|
app.UseCors();
|
||||||
|
@ -19,15 +19,16 @@
|
|||||||
//"DbConnectionString": "Data Source=DESKTOP-JJQM2OL\\SQLEXPRESS;Initial Catalog=netcoredev;Persist Security Info=True;User ID=sa;Password=123456;Connect Timeout=500;",
|
//"DbConnectionString": "Data Source=DESKTOP-JJQM2OL\\SQLEXPRESS;Initial Catalog=netcoredev;Persist Security Info=True;User ID=sa;Password=123456;Connect Timeout=500;",
|
||||||
|
|
||||||
//mysql连接字符串(升级EFCore3.1到时已将mysql连接字符串修改,2019-12-20)
|
//mysql连接字符串(升级EFCore3.1到时已将mysql连接字符串修改,2019-12-20)
|
||||||
"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
|
//"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
|
||||||
//"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
|
"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
|
||||||
|
|
||||||
//"DbConnectionString": "Server=192.168.10.230;Port=3306;Database=dachentradedb;Uid=root;Pwd=123456;AllowLoadLocalInfile=true;Command Timeout=120;",
|
//"DbConnectionString": "Server=192.168.10.230;Port=3306;Database=dachentradedb;Uid=root;Pwd=123456;AllowLoadLocalInfile=true;Command Timeout=120;",
|
||||||
//"DbConnectionString": "Server=47.101.60.251;Port=3306;Database=smartsports;Uid=root;Pwd=Admin@123;AllowLoadLocalInfile=true;Command Timeout=120;",
|
//"DbConnectionString": "Server=47.101.60.251;Port=3306;Database=smartsports;Uid=root;Pwd=Admin@123;AllowLoadLocalInfile=true;Command Timeout=120;",
|
||||||
|
|
||||||
//PgSql连接字符串
|
//PgSql连接字符串
|
||||||
// "DbConnectionString": "Host=132.232.2.109;Port=5432;User id=postgres;password=jxx_abcd;Database=netcoredev;",
|
// "DbConnectionString": "Host=132.232.2.109;Port=5432;User id=postgres;password=jxx_abcd;Database=netcoredev;",
|
||||||
"RedisConnectionString": "8.153.108.90,Password=yd708090,SyncTimeout=15000,defaultDatabase=2",
|
//"RedisConnectionString": "8.153.108.90,Password=yd708090,SyncTimeout=15000,defaultDatabase=2",
|
||||||
|
"RedisConnectionString": "101.132.164.149,Password=CTZhfum8kwF04hQk,SyncTimeout=15000,defaultDatabase=2",
|
||||||
//redis连接字符串(最好加密)
|
//redis连接字符串(最好加密)
|
||||||
"UseRedis": "true", //是否使用redis,如果不使用,默认使用Memory内置缓存
|
"UseRedis": "true", //是否使用redis,如果不使用,默认使用Memory内置缓存
|
||||||
"UseSignalR": "true" //是否使用SignalR(2022.05.03),注意需要将端的地址配置到下面的CorsUrls属性中
|
"UseSignalR": "true" //是否使用SignalR(2022.05.03),注意需要将端的地址配置到下面的CorsUrls属性中
|
||||||
|
Loading…
x
Reference in New Issue
Block a user