删除多余的文件
This commit is contained in:
@@ -1,30 +1,14 @@
|
||||
using MyCode.Project.Domain.Message.Act.Common;
|
||||
using MyCode.Project.Domain.Message.Request.LxmZHMDReport;
|
||||
using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
|
||||
using MyCode.Project.Infrastructure.Common;
|
||||
using MyCode.Project.Infrastructure.Exceptions;
|
||||
using MyCode.Project.WebApi.App_Filter;
|
||||
using MyCode.Project.WebApi.Controllers;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Net.Http.Headers;
|
||||
using System.Web.Http;
|
||||
using MyCode.Project.Services.BLL.ReportExport;
|
||||
using MyCode.Project.Infrastructure.Enumeration;
|
||||
using MyCode.Project.Infrastructure.Cache;
|
||||
using MyCode.Project.Infrastructure.Common;
|
||||
using MyCode.Project.Infrastructure.Constant;
|
||||
using MyCode.Project.Infrastructure.Enumeration;
|
||||
using MyCode.Project.Infrastructure.Exceptions;
|
||||
using MyCode.Project.Services;
|
||||
using MyCode.Project.Domain.Model;
|
||||
using MyCode.Project.Domain.Config;
|
||||
using MyCode.Project.Domain.Message.Response.User;
|
||||
using MyCode.Project.Domain.Message.Response.Common;
|
||||
using MyCode.Project.Infrastructure.Exports;
|
||||
using MyCode.Project.Domain.Message.Response.Bfy;
|
||||
using MyCode.Project.Domain.Message.Response.AMing;
|
||||
using MyCode.Project.WebApi.App_Filter;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Web.Http;
|
||||
|
||||
namespace MyCode.Project.WebApi.Areas.Admin.Controllers
|
||||
{
|
||||
@@ -85,109 +69,11 @@ namespace MyCode.Project.WebApi.Areas.Admin.Controllers
|
||||
|
||||
//ZIP导出
|
||||
#region ZIP导出(没有特殊处理的方法,不包含旧的ZIP导出)
|
||||
if (act.ReportType == (int)ReportType.TuoKeTiYanGuanKongReportExport){return ZIPExportXls(ansyAct);}
|
||||
if (act.ReportType == (int)ReportType.LiuKeShenKeGuanKongReportExport) { return ZIPExportXls(ansyAct); }
|
||||
if (act.ReportType == (int)ReportType.OldMemberALLDetailsExport||act.ReportType==(int)ReportType.NewMemberALLDetailsExport)
|
||||
{
|
||||
return ZIPExportXls(ansyAct);
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
#region ZIP导出(单独写的方法后续不动)
|
||||
//销售订单属性分析导出ZIP
|
||||
if (act.ReportType == (int)ReportType.SalesOrderAttributeAnalysisExport)
|
||||
{
|
||||
string hasDownloadZipCacheKey = CacheKey.HasDownloadZipCacheKey + $@":{act.ReportType}";
|
||||
var existDowing = _myCodeCacheServie.Exists(hasDownloadZipCacheKey);
|
||||
|
||||
if (existDowing) { throw new BaseException("当前有人正在导出该报表,为了保障性能,请1分钟后再导出"); }
|
||||
|
||||
//下载的标识
|
||||
_myCodeCacheServie.Set($"{hasDownloadZipCacheKey}", 1, new TimeSpan(0, 1, 0));
|
||||
|
||||
//有这个才需要继续执行导出,没有的话,说明是去消息了
|
||||
_myCodeCacheServie.Set($"{CacheKey.ReportZipFileCacheKey}{reportId}", "", new TimeSpan(1, 0, 0));
|
||||
|
||||
_queueProcessService.AddQueue<IReportService>("ReportExportAnsy", DateTime.Now.AddHours(1), ansyAct);
|
||||
|
||||
return reportId;
|
||||
}
|
||||
|
||||
//店铺的报表才使用这个
|
||||
if (act.ReportType == (int)ReportType.ShopDiagnoseDataExport)
|
||||
{
|
||||
var existDowing = _myCodeCacheServie.Exists(CacheKey.HasDownloadZipCacheKey);
|
||||
|
||||
if (existDowing) { throw new BaseException("当前有人正在导出该报表,为了保障性能,请1分钟后再导出"); }
|
||||
|
||||
//下载的标识
|
||||
_myCodeCacheServie.Set($"{CacheKey.HasDownloadZipCacheKey}", 1, new TimeSpan(0, 1, 0));
|
||||
|
||||
//有这个才需要继续执行导出,没有的话,说明是去消息了
|
||||
_myCodeCacheServie.Set($"{CacheKey.ReportZipFileCacheKey}{reportId}", "", new TimeSpan(1, 0, 0));
|
||||
|
||||
_queueProcessService.AddQueue<IReportService>("ReportExportAnsy", DateTime.Now.AddHours(1), ansyAct);
|
||||
|
||||
return reportId;
|
||||
}
|
||||
|
||||
//多个店铺产品销售计划进度详情明细的报表
|
||||
if (act.ReportType == (int)ReportType.BdShopMonthProductSalesPlanDetailExport)
|
||||
{
|
||||
string hasDownloadZipCacheKey = CacheKey.HasDownloadZipCacheKey + $@":{reportId}";
|
||||
var existDowing = _myCodeCacheServie.Exists(hasDownloadZipCacheKey);
|
||||
|
||||
if (existDowing) { throw new BaseException("当前有人正在导出该报表,为了保障性能,请1分钟后再导出"); }
|
||||
|
||||
//下载的标识
|
||||
_myCodeCacheServie.Set(hasDownloadZipCacheKey, 1, new TimeSpan(0, 1, 0));
|
||||
|
||||
//有这个才需要继续执行导出,没有的话,说明是去消息了
|
||||
_myCodeCacheServie.Set($"{CacheKey.ReportZipFileCacheKey}{reportId}", "", new TimeSpan(1, 0, 0));
|
||||
|
||||
_queueProcessService.AddQueue<IReportService>("ReportExportAnsy", DateTime.Now.AddHours(1), ansyAct);
|
||||
|
||||
return reportId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//会员数据-->会员查询
|
||||
if (act.ReportType == (int)ReportType.MemberAssetInquiryExport)
|
||||
{
|
||||
string hasDownloadZipCacheKey = CacheKey.HasDownloadZipCacheKey + $@":{reportId}";
|
||||
var existDowing = _myCodeCacheServie.Exists(hasDownloadZipCacheKey);
|
||||
|
||||
if (existDowing) { throw new BaseException("当前有人正在导出该报表,为了保障性能,请1分钟后再导出"); }
|
||||
|
||||
//下载的标识
|
||||
_myCodeCacheServie.Set(hasDownloadZipCacheKey, 1, new TimeSpan(0, 1, 0));
|
||||
|
||||
//有这个才需要继续执行导出,没有的话,说明是去消息了
|
||||
_myCodeCacheServie.Set($"{CacheKey.ReportZipFileCacheKey}{reportId}", "", new TimeSpan(1, 0, 0));
|
||||
|
||||
_queueProcessService.AddQueue<IReportService>("ReportExportAnsy", DateTime.Now.AddHours(1), ansyAct);
|
||||
|
||||
return reportId;
|
||||
}
|
||||
|
||||
//会员价值报表
|
||||
if (act.ReportType == (int)ReportType.MemberValueReportExport)
|
||||
{
|
||||
string hasDownloadZipCacheKey = CacheKey.HasDownloadZipCacheKey + $@":{reportId}";
|
||||
var existDowing = _myCodeCacheServie.Exists(hasDownloadZipCacheKey);
|
||||
|
||||
if (existDowing) { throw new BaseException("当前有人正在导出该报表,为了保障性能,请1分钟后再导出"); }
|
||||
|
||||
//下载的标识
|
||||
_myCodeCacheServie.Set(hasDownloadZipCacheKey, 1, new TimeSpan(1, 0, 0));
|
||||
|
||||
//有这个才需要继续执行导出,没有的话,说明是去消息了
|
||||
_myCodeCacheServie.Set($"{CacheKey.ReportZipFileCacheKey}{reportId}", "", new TimeSpan(1, 0, 0));
|
||||
|
||||
_queueProcessService.AddQueue<IReportService>("ReportExportAnsy", DateTime.Now.AddHours(1), ansyAct);
|
||||
|
||||
return reportId;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
ansyAct.ExportFileType = (int)ExportFileType.Xls;
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
using MyCode.Project.Domain.Config;
|
||||
using MyCode.Project.Domain.Message.Request.LxmZHMDReport;
|
||||
using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
|
||||
using MyCode.Project.Services;
|
||||
using MyCode.Project.WebApi.Controllers;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using MyCode.Project.Services;
|
||||
using System.Web.Http;
|
||||
|
||||
namespace MyCode.Project.WebApi.Areas.Wechat.Controllers
|
||||
|
||||
Reference in New Issue
Block a user