|
|
|
@ -460,6 +460,7 @@ namespace OpenAuth.App.ServiceApp
|
|
|
|
|
JsonConvert.SerializeObject(cancelTaskRequest));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var flag = await db.LasaTask.DeleteAsync(it => it.Id == id);
|
|
|
|
|
var taskId = task.Id;
|
|
|
|
|
var mediaFileList = await db.LasaMediaFile.AsQueryable()
|
|
|
|
@ -1251,6 +1252,7 @@ namespace OpenAuth.App.ServiceApp
|
|
|
|
|
{
|
|
|
|
|
list = list.Where(r => r.WorkSpaceId == workspaceid).ToList();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (type != null && list.Count > 0)
|
|
|
|
|
{
|
|
|
|
|
list = list.Where(r => r.Type == type).ToList();
|
|
|
|
@ -1400,5 +1402,89 @@ namespace OpenAuth.App.ServiceApp
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
public async Task<Response<bool>> CreateAirLoneFolder(string folderName, string parentId)
|
|
|
|
|
{
|
|
|
|
|
LasaLineFolder folder = new LasaLineFolder()
|
|
|
|
|
{
|
|
|
|
|
Id = Guid.NewGuid().ToString(),
|
|
|
|
|
Path = folderName,
|
|
|
|
|
ParentId = parentId,
|
|
|
|
|
CreateTime = DateTime.Now
|
|
|
|
|
};
|
|
|
|
|
if (!string.IsNullOrEmpty(parentId))
|
|
|
|
|
{
|
|
|
|
|
var parent = await Repository
|
|
|
|
|
.ChangeRepository<SugarRepositiry<LasaLineFolder>>()
|
|
|
|
|
.GetByIdAsync(parentId);
|
|
|
|
|
folder.Ancestor = Path.Combine(parent.Ancestor, folderName);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
folder.Ancestor = folderName;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return new Response<bool>()
|
|
|
|
|
{
|
|
|
|
|
Result = await Repository
|
|
|
|
|
.ChangeRepository<SugarRepositiry<LasaLineFolder>>()
|
|
|
|
|
.InsertAsync(folder)
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public async Task<Response<bool>> DeleteAirLineFolder(string folderId)
|
|
|
|
|
{
|
|
|
|
|
var folder = await Repository
|
|
|
|
|
.ChangeRepository<SugarRepositiry<LasaLineFolder>>()
|
|
|
|
|
.GetByIdAsync(folderId);
|
|
|
|
|
var ancestor = folder.Ancestor;
|
|
|
|
|
// 删除文件夹记录
|
|
|
|
|
var x = await Repository.ChangeRepository<SugarRepositiry<LasaLineFolder>>().DeleteByIdAsync(folderId);
|
|
|
|
|
// 删除该文件夹下的航线记录
|
|
|
|
|
var y = await Repository
|
|
|
|
|
.ChangeRepository<SugarRepositiry<LasaAirLine>>()
|
|
|
|
|
.DeleteAsync(r => r.WPML.Contains(ancestor));
|
|
|
|
|
return new Response<bool>()
|
|
|
|
|
{
|
|
|
|
|
Result = x && y
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public async Task<Response<List<LasaLineFolder>>> ListAirLineFolder()
|
|
|
|
|
{
|
|
|
|
|
var nodes = await Repository.ChangeRepository<SugarRepositiry<LasaLineFolder>>()
|
|
|
|
|
.AsQueryable().ToListAsync();
|
|
|
|
|
return new Response<List<LasaLineFolder>>()
|
|
|
|
|
{
|
|
|
|
|
Result = BuildFolderTree(nodes)
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public List<LasaLineFolder> BuildFolderTree(List<LasaLineFolder> folders)
|
|
|
|
|
{
|
|
|
|
|
var folderMap = folders.ToDictionary(f => f.Id, f => new LasaLineFolder
|
|
|
|
|
{
|
|
|
|
|
Id = f.Id,
|
|
|
|
|
Path = f.Path,
|
|
|
|
|
Ancestor = f.Ancestor,
|
|
|
|
|
Children = new List<LasaLineFolder>()
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
var rootNodes = new List<LasaLineFolder>();
|
|
|
|
|
|
|
|
|
|
foreach (var folder in folders)
|
|
|
|
|
{
|
|
|
|
|
if (string.IsNullOrEmpty(folder.ParentId))
|
|
|
|
|
{
|
|
|
|
|
rootNodes.Add(folderMap[folder.Id]);
|
|
|
|
|
}
|
|
|
|
|
else if (folderMap.TryGetValue(folder.ParentId, out var parentNode))
|
|
|
|
|
{
|
|
|
|
|
parentNode.Children.Add(folderMap[folder.Id]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return rootNodes;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|