Compare commits
3 Commits
b8dd571fc8
...
64a366a744
| Author | SHA1 | Date |
|---|---|---|
|
|
64a366a744 | |
|
|
9c01de7695 | |
|
|
c3246c0b82 |
|
|
@ -392,7 +392,7 @@ namespace OpenAuth.App.ServiceApp
|
||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public async Task<Response<PageInfo<List<LasaTask>>>> GetTaskPageList(int page, int limit, string key,
|
public async Task<Response<PageInfo<List<LasaTask>>>> GetTaskPageList(int page, int limit, string key,
|
||||||
int? status)
|
int? status,string airLineId)
|
||||||
{
|
{
|
||||||
RefAsync<int> totalCount = 0;
|
RefAsync<int> totalCount = 0;
|
||||||
using (var db = UnitWork.CreateContext())
|
using (var db = UnitWork.CreateContext())
|
||||||
|
|
@ -400,6 +400,7 @@ namespace OpenAuth.App.ServiceApp
|
||||||
var list = await db.LasaTask.AsQueryable()
|
var list = await db.LasaTask.AsQueryable()
|
||||||
.WhereIF(!string.IsNullOrEmpty(key), a => a.TaskName.Contains(key))
|
.WhereIF(!string.IsNullOrEmpty(key), a => a.TaskName.Contains(key))
|
||||||
.WhereIF(status != null, a => a.Status.Equals(status))
|
.WhereIF(status != null, a => a.Status.Equals(status))
|
||||||
|
.WhereIF(!string.IsNullOrEmpty(airLineId), a => a.AirLineId == airLineId)
|
||||||
.OrderByDescending(a => a.CreateTime)
|
.OrderByDescending(a => a.CreateTime)
|
||||||
.ToPageListAsync(page, limit, totalCount);
|
.ToPageListAsync(page, limit, totalCount);
|
||||||
return new Response<PageInfo<List<LasaTask>>>
|
return new Response<PageInfo<List<LasaTask>>>
|
||||||
|
|
|
||||||
|
|
@ -106,8 +106,8 @@ public class ConfigSubscribe : IJob
|
||||||
//_logger.LogInformation($"主题:{topic}\n消息:{message}");
|
//_logger.LogInformation($"主题:{topic}\n消息:{message}");
|
||||||
long code = 0;
|
long code = 0;
|
||||||
// rtmp://175.27.168.120:6019/live/
|
// rtmp://175.27.168.120:6019/live/
|
||||||
//var rtmp = "rtmp://box.wisestcity.com:1935/live/7";
|
var rtmp = "rtmp://box.wisestcity.com:1935/live/7";
|
||||||
var rtmp = "rtmp://175.27.168.120:6019/live/7";
|
//var rtmp = "rtmp://175.27.168.120:6019/live/7";
|
||||||
switch (tempStr)
|
switch (tempStr)
|
||||||
{
|
{
|
||||||
case "thing/product/*/requests":
|
case "thing/product/*/requests":
|
||||||
|
|
|
||||||
|
|
@ -231,12 +231,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
public async Task<Response<PageInfo<List<LasaTask>>>> GetTaskPageList(int page, int limit, string key,
|
public async Task<Response<PageInfo<List<LasaTask>>>> GetTaskPageList(int page, int limit, string key,
|
||||||
int? status)
|
int? status,string airLineId)
|
||||||
{
|
{
|
||||||
var result = new Response<PageInfo<List<LasaTask>>>();
|
var result = new Response<PageInfo<List<LasaTask>>>();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
result = await _app.GetTaskPageList(page, limit, key, status);
|
result = await _app.GetTaskPageList(page, limit, key, status,airLineId);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,6 @@
|
||||||
},
|
},
|
||||||
"AIModelApi": {
|
"AIModelApi": {
|
||||||
"Url": "http://192.168.10.131:9025",
|
"Url": "http://192.168.10.131:9025",
|
||||||
//"PushUrl":"rtmp://192.168.3.17:1935/live/11"
|
"PushUrl":"rtmp://192.168.3.17:1935/live/11"
|
||||||
"PushUrl": "rtmp://175.27.168.120:6019/live/"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue