Commit 9ba48532 authored by liuChang's avatar liuChang

bug修复

parent 64ef994c
...@@ -8,6 +8,7 @@ import com.dsk.common.constant.Constants; ...@@ -8,6 +8,7 @@ import com.dsk.common.constant.Constants;
import com.dsk.common.core.domain.AjaxResult; import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.excel.ExcelUtils; import com.dsk.common.excel.ExcelUtils;
import com.dsk.common.exception.ServiceException; import com.dsk.common.exception.ServiceException;
import com.dsk.common.utils.redis.RedisUtils;
import com.dsk.jsk.domain.JskCombineSearchDto; import com.dsk.jsk.domain.JskCombineSearchDto;
import com.dsk.jsk.domain.bo.ComposeQueryDto; import com.dsk.jsk.domain.bo.ComposeQueryDto;
import com.dsk.jsk.service.EnterpriseService; import com.dsk.jsk.service.EnterpriseService;
...@@ -24,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -24,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException; import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.Duration;
import java.util.*; import java.util.*;
/** /**
...@@ -42,18 +44,25 @@ public class ExportService { ...@@ -42,18 +44,25 @@ public class ExportService {
private String EXPORT_BACK_URL; private String EXPORT_BACK_URL;
public AjaxResult aptitudeFile(MultipartFile file) throws Exception { public AjaxResult aptitudeFile(MultipartFile file) throws Exception {
int exportCount = 1;
if (RedisUtils.hasKey("aptitudeFileExportCount")){
exportCount = RedisUtils.getCacheObject("aptitudeFileExportCount");
if (exportCount>=3){
return AjaxResult.error("每天最多导出3次");
}
}
ComposeQueryDto composeQueryDto = new ComposeQueryDto(); ComposeQueryDto composeQueryDto = new ComposeQueryDto();
//识别Excel内容 //识别Excel内容
List<AptitudeVo> companyNameList = new ExcelUtils<>(AptitudeVo.class).importExcel(file.getInputStream(), 2); List<AptitudeVo> companyNameList = new ExcelUtils<>(AptitudeVo.class).importExcel(file.getInputStream(), 2);
if (companyNameList.isEmpty()) { if (companyNameList.isEmpty()) {
throw new ServiceException("表格中不存在待导入数据!"); throw new ServiceException("表格中不存在待查询数据!");
} }
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
for (int i = 0; i < companyNameList.size(); i++) { for (int i = 0; i < companyNameList.size(); i++) {
if (i>499){ if (i<500){
break; list.add(companyNameList.get(i).getCompanyName());
} }
list.add(companyNameList.get(i).getCompanyName());
} }
composeQueryDto.setKeyword(String.join(",",list)); composeQueryDto.setKeyword(String.join(",",list));
SimpleDateFormat sdf =new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat sdf =new SimpleDateFormat("yyyyMMdd");
...@@ -72,6 +81,8 @@ public class ExportService { ...@@ -72,6 +81,8 @@ public class ExportService {
composeQueryDto.setExportBackUrl(EXPORT_BACK_URL); composeQueryDto.setExportBackUrl(EXPORT_BACK_URL);
composeQueryDto.setExportExeclName(fileName); composeQueryDto.setExportExeclName(fileName);
dskOpenApiUtil.requestBody("/operate/export/zjyj/aptitude", BeanUtil.beanToMap(composeQueryDto,false,false)); dskOpenApiUtil.requestBody("/operate/export/zjyj/aptitude", BeanUtil.beanToMap(composeQueryDto,false,false));
RedisUtils.setCacheObject("aptitudeFileExportCount",exportCount);
RedisUtils.expire("aptitudeFileExportCount", Duration.ofHours(24));
return AjaxResult.success(); return AjaxResult.success();
} }
......
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