|
@@ -85,7 +85,7 @@ namespace DataSharing.Host.Controllers.YiBin
|
|
|
{
|
|
|
List<WriteOrderResponseDto> responseDtos = new()
|
|
|
{
|
|
|
- new WriteOrderResponseDto() { AcceptCode = "", AcceptPwd = "", msg = "密钥错误", Code = "-900" }
|
|
|
+ new WriteOrderResponseDto() { AcceptCode = "", AcceptPwd = "", Msg = "密钥错误", Code = "-900" }
|
|
|
};
|
|
|
|
|
|
return OpenResponse.Ok(ConvergenceMediaDeResponse<List<WriteOrderResponseDto>>.Failed(responseDtos, "0", "密钥错误"));
|
|
@@ -97,7 +97,7 @@ namespace DataSharing.Host.Controllers.YiBin
|
|
|
{
|
|
|
List<WriteOrderResponseDto> responseDtos = new()
|
|
|
{
|
|
|
- new WriteOrderResponseDto() { AcceptCode = "", AcceptPwd = "", msg = strResult, Code = "0" }
|
|
|
+ new WriteOrderResponseDto() { AcceptCode = "", AcceptPwd = "", Msg = strResult, Code = "0" }
|
|
|
};
|
|
|
return OpenResponse.Ok(ConvergenceMediaDeResponse<List<WriteOrderResponseDto>>.Failed(responseDtos, "0", description: strResult));
|
|
|
}
|
|
@@ -228,7 +228,7 @@ namespace DataSharing.Host.Controllers.YiBin
|
|
|
await _dsReceiveMediaDataRepository.UpdateAsync(dsReceiveMediaData, HttpContext.RequestAborted);
|
|
|
List<WriteOrderResponseDto> responseDtos = new()
|
|
|
{
|
|
|
- new WriteOrderResponseDto() { AcceptCode = result.result.no, AcceptPwd = result.result.password, msg = "写信成功", Code = "1" }
|
|
|
+ new WriteOrderResponseDto() { AcceptCode = result.result.no, AcceptPwd = result.result.password, Msg = "写信成功", Code = "1" }
|
|
|
};
|
|
|
return OpenResponse.Ok(ConvergenceMediaDeResponse<List<WriteOrderResponseDto>>.Success(responseDtos, "您已成功提交数据!"));
|
|
|
}
|
|
@@ -236,7 +236,7 @@ namespace DataSharing.Host.Controllers.YiBin
|
|
|
{
|
|
|
List<WriteOrderResponseDto> responseDtos = new()
|
|
|
{
|
|
|
- new WriteOrderResponseDto() { AcceptCode = "", AcceptPwd = "", msg = "接口调用失败", Code = "0" }
|
|
|
+ new WriteOrderResponseDto() { AcceptCode = "", AcceptPwd = "", Msg = "接口调用失败", Code = "0" }
|
|
|
};
|
|
|
return OpenResponse.Ok(ConvergenceMediaDeResponse<List<WriteOrderResponseDto>>.Failed(responseDtos, "0", description: "接口调用失败!"));
|
|
|
}
|
|
@@ -656,10 +656,10 @@ namespace DataSharing.Host.Controllers.YiBin
|
|
|
case "5":
|
|
|
break;
|
|
|
case "6":
|
|
|
- dto.CType = "4";
|
|
|
+ dto.CType = "6";
|
|
|
break;
|
|
|
default:
|
|
|
- dto.CType = "4";
|
|
|
+ dto.CType = "6";
|
|
|
break;
|
|
|
}
|
|
|
|
|
@@ -736,6 +736,200 @@ namespace DataSharing.Host.Controllers.YiBin
|
|
|
return OpenResponse.Ok(ConvergenceMediaDeResponse<List<MediaArticleDetailsDto>>.Success(dataDto, "成功"));
|
|
|
}
|
|
|
|
|
|
+ /// <summary>
|
|
|
+ /// 7.今日统计
|
|
|
+ /// </summary>
|
|
|
+ /// <param name="Code"></param>
|
|
|
+ /// <returns></returns>
|
|
|
+ [AllowAnonymous]
|
|
|
+ [HttpPost("GetDayCount")]
|
|
|
+ public async Task<OpenResponse> GetDayCount([FromForm] string Code)
|
|
|
+ {
|
|
|
+ //验证密钥
|
|
|
+ var accountDto = await _dsUserTokenInfoService.CheckAccountAsync(Code, HttpContext.RequestAborted);
|
|
|
+ if (accountDto is null || accountDto.IsCheckAccount == false)
|
|
|
+ {
|
|
|
+ List<ConvergenceMediaDeResponse<string>> convergenceMediaDes = new() {
|
|
|
+ new()
|
|
|
+ {
|
|
|
+ msg = "密钥错误",
|
|
|
+ code = "-900",
|
|
|
+ data = ""
|
|
|
+ } };
|
|
|
+
|
|
|
+ return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ConvergenceMediaDeResponse<string>>>.Failed(convergenceMediaDes, "0", "失败"));
|
|
|
+ }
|
|
|
+
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ /// <summary>
|
|
|
+ /// 3.1、工单查询
|
|
|
+ /// </summary>
|
|
|
+ /// <returns></returns>
|
|
|
+ [HttpPost("GetOrderDetailByFlowID")]
|
|
|
+ [AllowAnonymous]
|
|
|
+ public async Task<OpenResponse> GetOrderDetailByFlowID([FromForm] IYBReceiveDto dto)
|
|
|
+ {
|
|
|
+ //验证密钥
|
|
|
+ var accountDto = await _dsUserTokenInfoService.CheckAccountAsync(dto.Code, HttpContext.RequestAborted);
|
|
|
+ if (accountDto is null || accountDto.IsCheckAccount == false)
|
|
|
+ {
|
|
|
+ List<ConvergenceMediaDeResponse<string>> convergenceMediaDes = new() {
|
|
|
+ new()
|
|
|
+ {
|
|
|
+ msg = "密钥错误",
|
|
|
+ code = "-900",
|
|
|
+ data = ""
|
|
|
+ } };
|
|
|
+
|
|
|
+ return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ConvergenceMediaDeResponse<string>>>.Failed(convergenceMediaDes, "0", "失败"));
|
|
|
+ }
|
|
|
+
|
|
|
+ //验证数据
|
|
|
+ string strResult = dto.Validate();
|
|
|
+ if (!string.IsNullOrEmpty(strResult))
|
|
|
+ return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ReturnData>>.Failed(ReturnData.ReturnDataInfo(strResult), "0", "失败"));
|
|
|
+
|
|
|
+ //查询数据
|
|
|
+ var items = await _dataOrderRepository
|
|
|
+ .Queryable()
|
|
|
+ .Where(p => p.OrderNo == dto.AcceptCode)
|
|
|
+ .Where(p => p.Id == dto.FlowID)
|
|
|
+ .Select(it => new
|
|
|
+ {
|
|
|
+ FlowID = it.Id,
|
|
|
+ FlowCode = it.OrderNo,
|
|
|
+ FlowTitle = it.Title,
|
|
|
+ FlowFromName = it.CaseSource,
|
|
|
+ FlowPurTypeName = it.CaseType,
|
|
|
+ FlowConTypeName = it.HotspotName,
|
|
|
+ FlowAddDate = it.CaseDate,
|
|
|
+ FlowLKName = it.FromName,
|
|
|
+ FlowBMName = it.ActualHandleOrgName,
|
|
|
+ FlowRSFlagName = it.HandleState,
|
|
|
+ FlowContent = it.Content,
|
|
|
+ FlowResult = it.ActualOpinion,
|
|
|
+ PubDate = it.PublishDate
|
|
|
+ })
|
|
|
+ .ToListAsync();
|
|
|
+
|
|
|
+ if (items == null || items.Count == 0)
|
|
|
+ return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ReturnData>>.Failed(ReturnData.ReturnDataInfo("编号、密码错误!"), "0", "失败"));
|
|
|
+ else
|
|
|
+ return OpenResponse.Ok(ConvergenceMediaDeResponse<IReadOnlyList<MediaOrderDetailDataDto>>.Success(_mapper.Map<IReadOnlyList<MediaOrderDetailDataDto>>(items), "成功"));
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ /// <summary>
|
|
|
+ /// 3.2、工单查询
|
|
|
+ /// </summary>
|
|
|
+ /// <returns></returns>
|
|
|
+ [HttpPost("GetOrderDetailByFlowID2")]
|
|
|
+ [AllowAnonymous]
|
|
|
+ public async Task<OpenResponse> GetOrderDetailByFlowID2([FromForm] IYBReceiveBaseDto dto)
|
|
|
+ {
|
|
|
+ //验证密钥
|
|
|
+ var accountDto = await _dsUserTokenInfoService.CheckAccountAsync(dto.Code, HttpContext.RequestAborted);
|
|
|
+ if (accountDto is null || accountDto.IsCheckAccount == false)
|
|
|
+ {
|
|
|
+ List<ConvergenceMediaDeResponse<string>> convergenceMediaDes = new() {
|
|
|
+ new()
|
|
|
+ {
|
|
|
+ msg = "密钥错误",
|
|
|
+ code = "-900",
|
|
|
+ data = ""
|
|
|
+ } };
|
|
|
+
|
|
|
+ return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ConvergenceMediaDeResponse<string>>>.Failed(convergenceMediaDes, "0", "失败"));
|
|
|
+ }
|
|
|
+
|
|
|
+ //验证数据
|
|
|
+ string strResult = dto.Validate();
|
|
|
+ if (!string.IsNullOrEmpty(strResult))
|
|
|
+ return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ReturnData>>.Failed(ReturnData.ReturnDataInfo(strResult), "0", "失败"));
|
|
|
+
|
|
|
+ //查询数据
|
|
|
+ var items = await _dataOrderRepository
|
|
|
+ .Queryable()
|
|
|
+ .Where(p => p.OrderNo == dto.AcceptCode)
|
|
|
+ .Select(it => new
|
|
|
+ {
|
|
|
+ FlowID = it.Id,
|
|
|
+ FlowCode = it.OrderNo,
|
|
|
+ FlowTitle = it.Title,
|
|
|
+ FlowAddDate = it.CaseDate,
|
|
|
+ FlowPurTypeName = it.CaseType,
|
|
|
+ FlowConTypeName = it.HotspotName,
|
|
|
+ FlowRSFlagName = it.HandleState,
|
|
|
+ FlowLKName = it.FromName,
|
|
|
+ FlowContent = it.Content,
|
|
|
+ Address = it.FullAddress
|
|
|
+ })
|
|
|
+ .ToListAsync();
|
|
|
+
|
|
|
+ if (items == null || items.Count == 0)
|
|
|
+ return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ReturnData>>.Failed(ReturnData.ReturnDataInfo("编号、密码错误!"), "0", "失败"));
|
|
|
+ else
|
|
|
+ return OpenResponse.Ok(ConvergenceMediaDeResponse<IReadOnlyList<MediaOrderDetailDataDto>>.Success(_mapper.Map<IReadOnlyList<MediaOrderDetailDataDto>>(items), "成功"));
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ /// <summary>
|
|
|
+ /// 附件详情地址
|
|
|
+ /// </summary>
|
|
|
+ [HttpPost("GetFileAll")]
|
|
|
+ [AllowAnonymous]
|
|
|
+ public async Task<OpenResponse> GetFileAll([FromForm] IYBGetFilesDto dto)
|
|
|
+ {
|
|
|
+ //验证密钥
|
|
|
+ var accountDto = await _dsUserTokenInfoService.CheckAccountAsync(dto.Code, HttpContext.RequestAborted);
|
|
|
+ if (accountDto is null || accountDto.IsCheckAccount == false)
|
|
|
+ {
|
|
|
+ List<ConvergenceMediaDeResponse<string>> convergenceMediaDes = new() {
|
|
|
+ new()
|
|
|
+ {
|
|
|
+ msg = "密钥错误",
|
|
|
+ code = "-900",
|
|
|
+ data = ""
|
|
|
+ } };
|
|
|
+
|
|
|
+ return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ConvergenceMediaDeResponse<string>>>.Failed(convergenceMediaDes, "0", "失败"));
|
|
|
+ }
|
|
|
+
|
|
|
+ //验证数据
|
|
|
+ string strResult = dto.Validate();
|
|
|
+ if (!string.IsNullOrEmpty(strResult))
|
|
|
+ return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ReturnData>>.Failed(ReturnData.ReturnDataInfo(strResult), "0", "失败"));
|
|
|
+
|
|
|
+ //查询数据
|
|
|
+ var data = await _dataOrderRepository.GetAsync(p => p.OrderId == dto.FlowID, HttpContext.RequestAborted);
|
|
|
+
|
|
|
+
|
|
|
+ if (data == null)
|
|
|
+ return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ReturnData>>.Failed(ReturnData.ReturnDataInfo("编号错误!"), "0", "失败"));
|
|
|
+ else
|
|
|
+ {
|
|
|
+ var businessFile = _channelConfigurationManager.GetConfigurationBusinessFile();
|
|
|
+ var baseUrl = businessFile.BaseUrl.Remove(businessFile.BaseUrl.Length - 1);
|
|
|
+ List<GetFiles> getFiles = [];
|
|
|
+ if (data.FileJson != null && data.FileJson.Count > 0)
|
|
|
+ {
|
|
|
+ foreach (var item in data.FileJson)
|
|
|
+ {
|
|
|
+ GetFiles files = new()
|
|
|
+ {
|
|
|
+ FileID = item.FileId,
|
|
|
+ FileName = item.FileName + "." + item.FileType,
|
|
|
+ FileContent = baseUrl + item.Path
|
|
|
+ };
|
|
|
+ getFiles.Add(files);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return OpenResponse.Ok(ConvergenceMediaDeResponse<IReadOnlyList<GetFiles>>.Success(_mapper.Map<List<GetFiles>>(getFiles), "成功"));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
#region 私有方法-将文件转化为文件流
|
|
|
|
|
|
/// <summary>
|