|
|
@@ -1,11 +1,11 @@
|
|
|
package com.yonge.cooleshow.tenant.controller;
|
|
|
|
|
|
-import cn.hutool.core.date.DateTime;
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
import com.microsvc.toolkit.common.response.paging.PageInfo;
|
|
|
import com.microsvc.toolkit.common.response.paging.QueryInfo;
|
|
|
import com.microsvc.toolkit.common.response.template.R;
|
|
|
@@ -37,11 +37,13 @@ import com.yonge.toolset.utils.easyexcel.ExcelDataReader;
|
|
|
import com.yonge.toolset.utils.easyexcel.ExcelException;
|
|
|
import com.yonge.toolset.utils.easyexcel.ExcelUtils;
|
|
|
import com.yonge.toolset.utils.excel.POIUtil;
|
|
|
+import com.yonge.toolset.utils.http.HttpUtil;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
+import org.joda.time.DateTime;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.http.HttpStatus;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
@@ -189,13 +191,14 @@ public class TenantActivationCodeController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
private TenantActivationCodeWrapper.ExportFile generateExportExcelFile(List<?> orderExports, Class<?> clazz, String fileName, String sheetName) {
|
|
|
|
|
|
// OSS上传文件目录
|
|
|
- String uploadOssPath = MessageFormat.format("excel-download/{0}", DateTime.now().toString("yyyy-MM"));
|
|
|
+ String uploadOssPath = MessageFormat.format("excel-download/{0}", org.joda.time.DateTime.now().toString("yyyy-MM"));
|
|
|
|
|
|
// 文件上传下载地址
|
|
|
- String uploadPath = MessageFormat.format("{0}/{1}-{2}.xlsx", uploadOssPath, fileName, DateTime.now().toString("MMddHHmmss"));
|
|
|
+ String uploadPath = MessageFormat.format("{0}/{1}-{2}.xlsx", uploadOssPath, String.valueOf(IdWorker.getId()), DateTime.now().toString("MMddHHmmss"));
|
|
|
|
|
|
// 本地文件地址
|
|
|
String localPath = DownloadManager.getInstance().path(uploadPath);
|
|
|
@@ -222,12 +225,13 @@ public class TenantActivationCodeController extends BaseController {
|
|
|
return TenantActivationCodeWrapper.ExportFile
|
|
|
.builder()
|
|
|
.fileName(MessageFormat.format("{0}.xlsx", fileName))
|
|
|
- .downloadPath(downloadPath)
|
|
|
+ .downloadPath(HttpUtil.getSortUrl(downloadPath))
|
|
|
.build();
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
@GetMapping("/exportOrderCode")
|
|
|
@ApiOperation(value = "导出订单激活码模板")
|
|
|
public HttpResponseResult<TenantActivationCodeWrapper.ExportFile> exportOrderCode(HttpServletResponse response, String orderNo) {
|
liujc