Skip to content

W
WeiPanAPI
Commit c057398b by xiongyuwen
Options

no message

parent 4b5cd287
Showing with 45 additions and 25 deletions
src/Bailun.Discuz.Application/WeiPan/IWeiPanService.cs
......@@ -57,6 +57,6 @@ namespace Bailun.Discuz.Application.WeiPan
Task<WeiPanFileList> GetWeiPanFileByThreadId(long threadId);
Task<WeiPanFileList> GetFileInfo(string fileId);
Task<GetNotificationsResponse> GetNoticeList(GetNotificationsRequest request);
Task<bool> IsVisitFourkByUserId(string userId);
Task<bool> IsVisitFourkByUserId(int? id);
}
}
src/Bailun.Discuz.Application/WeiPan/WeiPanService.cs
......@@ -467,9 +467,7 @@ namespace Bailun.Discuz.Application.WeiPan
string fileUrl = "";
try
{
// string fileUrl =(await GetFileUrl(md5))?.QiniuUrl;
//if (fileUrl == null)
// {
Console.WriteLine($"开始上传七牛云,当前文件名称为:{ fileName}");
GetViewFileReuqest getViewFileRequest = new GetViewFileReuqest();
getViewFileRequest.userid = userId;
getViewFileRequest.fileid = fileId;
......@@ -533,7 +531,7 @@ namespace Bailun.Discuz.Application.WeiPan
{
throw new Exception(apiOutput.errmsg);
}
// }
Console.WriteLine($"上传七牛云成功,当前文件名称为:{ fileName}");
}
catch (Exception ex)
{
......@@ -745,7 +743,8 @@ namespace Bailun.Discuz.Application.WeiPan
//string value = "测试数据";
//RedisHelper.Set("key", filList);
//List<WeiPanFileList> filList = RedisHelper.Get<List<WeiPanFileList>>("key");
// List<WeiPanFileList> filList = RedisHelper.Get<List<WeiPanFileList>>("key");
//filList.RemoveAt(1);
//2：判断当前fileid是否存在于数据库中， 如果不存在则添加
foreach (var file in filList)
......@@ -756,6 +755,7 @@ namespace Bailun.Discuz.Application.WeiPan
//将文档上传至七牛云
string fileUrl = await GetViewFile(userId, file.FileId, file.FileMd5, file.FileName);
file.QiniuUrl = fileUrl;
_weiPanFileListRepository.InsertAndGetId(file);
inserWeiPanFileList.Add(file);
}else
{
......@@ -807,22 +807,32 @@ namespace Bailun.Discuz.Application.WeiPan
if (inserWeiPanFileList.Count>0|| delFiles.Any())//有新增则清除缓存
{
messageSb.Append($"新增帖子数量为:{inserWeiPanFileList.Count},分别为:{string.Join(",", inserWeiPanFileList.Select(u => u.FileName).ToArray()) };");
_weiPanFileListRepository.BulkInsert(inserWeiPanFileList.ToArray());
RedisHelper.Del(Constants.File_List_Tree+companyName);//清除缓存
RedisHelper.Del(Constants.First_File_List+companyName);//清除缓存
// _weiPanFileListRepository.BulkInsert(inserWeiPanFileList.ToArray());
RedisHelper.Del(Constants.File_List_Tree + $"_{companyName}");//清除缓存
RedisHelper.Del(Constants.First_File_List + $"_{companyName}");//清除缓存
await CreateUserFilesTreeRedis(companyName);
}
var noTieZilist=await _weiPanFileListRepository.Query().AsNoTracking().Where(u => u.ThreadId == 0&&u.CompanyName==companyName).ToListAsync();
var noTieZilist=await _weiPanFileListRepository.Query().AsNoTracking().Where(u => u.ThreadId == 0&&u.CompanyName==companyName&&!u.QiniuUrl.IsNullOrEmpty()).ToListAsync();
foreach (var item in noTieZilist)
{
//对新增的文档进行创建帖子
var threadId=await PublishTieZi(item);
if(!string.IsNullOrEmpty(threadId))
try
{
item.ThreadId = Convert.ToInt64(threadId);
await _weiPanFileListRepository.UpdateAsync(item);
//对新增的文档进行创建帖子
var threadId = await PublishTieZi(item);
if (!string.IsNullOrEmpty(threadId))
{
item.ThreadId = Convert.ToInt64(threadId);
_weiPanFileListRepository.UpdateCommit(item);
Console.WriteLine($"生成帖子文件名称为:{item.FileName}成功，帖子ID为{threadId}");
}
}
catch (Exception ex)
{
Console.WriteLine($"生成帖子文件名称为:{item.FileName}异常，异常结果{ex.Message}");
}
}
filList = null;
return messageSb.Length==0?"无新增帖子":messageSb.ToString();
......@@ -1049,9 +1059,16 @@ namespace Bailun.Discuz.Application.WeiPan
}
public async Task<string> PublishTieZi(WeiPanFileList weiPanFile)
{
string userId = weiPanFile.FileCreateUseid;
string resultId = "";
userId = weiPanFile.CompanyName == "四千里数据科技有限公司" ? "gaodesheng" : userId;
//获取token
var response = HttpHelper.HttpGet($"http://discuz.bailuntec.com/api/login?useid={weiPanFile.FileCreateUseid}");
var response = HttpHelper.HttpGet($"http://discuz.bailuntec.com/api/login?useid={userId}");
if(response.IsNullOrEmpty())
{
userId = weiPanFile.CompanyName == "四千里数据科技有限公司" ? "gaodesheng" : "fengxiaoyin";
response = HttpHelper.HttpGet($"http://discuz.bailuntec.com/api/login?useid={userId}");
}
var result = JsonHelper.FromJson<GetDiscuzTokenRespnse>(response);
var token= result.data.attributes.access_token;
//生成附件
......@@ -1084,7 +1101,7 @@ namespace Bailun.Discuz.Application.WeiPan
var apiUrl = $"http://discuz.bailuntec.com/api/threads";
var res = JsonHelper.ToObject<PublishTieZiResponse>(Client_Post(publishTieZiRequest.ToJson(), apiUrl, "Bearer " + token));
//通知对应的用户
var users = await GetNoticeUserNames(weiPanFile.FileId, weiPanFile.FileCreateUseid);
var users = await GetNoticeUserNames(weiPanFile.FileId, userId);
resultId = res.data.id;
PostNoticeByNewTieZi(users, resultId, token);
}
......@@ -1216,7 +1233,7 @@ namespace Bailun.Discuz.Application.WeiPan
weiPanFile.CompanyName = companyName;
weiPanFile.FirstFileId = u.firstfileid;
weiPanFile.QiniuUrl = "";
weiPanFile.FileCreateUseid = u.create_userid;
weiPanFile.FileCreateUseid = u.create_userid.ToLower();
weiPanFile.FirstFileName = u.firstFileName;
weiPanFileLists.Add(weiPanFile);
});
......@@ -1227,12 +1244,15 @@ namespace Bailun.Discuz.Application.WeiPan
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
public async Task<bool> IsVisitFourkByUserId(string userId)
public async Task<bool> IsVisitFourkByUserId(int? id)
{
var user = _usersRepository.Query().AsNoTracking().Where(u => u.UserId == userId).FirstOrDefault();
if (user != null)
if(id.HasValue)
{
return user.VisitFourK;
var user = _usersRepository.Query().AsNoTracking().Where(u => u.Id == id.Value).FirstOrDefault();
if (user != null)
{
return user.VisitFourK;
}
}
return false;
}
......
src/Bailun.Discuz.Service/Controllers/WeiPanController.cs
......@@ -109,10 +109,10 @@ namespace Bailun.Discuz.Service.Controllers
return await _iweiPanService.GetNoticeList(request);
}
[HttpGet("isVisitFourkByUserId")]
public async Task<bool> IsVisitFourkByUserId(string userId)
[HttpGet("IsVisitFourkByUserId")]
public async Task<bool> IsVisitFourkByUserId(int? id)
{
return await _iweiPanService.IsVisitFourkByUserId(userId);
return await _iweiPanService.IsVisitFourkByUserId(id);
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment