Commit 64339f71 authored by suhuiguang's avatar suhuiguang

1.电梯选择行导出 bug

parent 28e12fb3
......@@ -8,6 +8,7 @@ import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
import com.yeejoin.amos.boot.module.elevator.api.common.BizCommonConstant;
import com.yeejoin.amos.boot.module.elevator.api.common.StringUtil;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.ExportDto;
import com.yeejoin.amos.boot.module.elevator.api.entity.TemplateExport;
......@@ -219,12 +220,18 @@ public class TemplateExportController extends BaseController {
String fileName = exportDto.getFileName();
// 查询电梯数据
if("ELEVATOR".equals(exportDto.getExportType())) {
if(StringUtil.isNotEmpty(exportDto.getExportId())){
// 选择指定的行-导出逻辑
list = elevatorServiceImpl.selectExportData(exportDto.getExportId());
} else {
// 全部导出-导出逻辑,由于电梯为老存量数据,只是查看,故全部放到redis,解决全部导出时性能问题
if(redisUtil.hasKey(BizCommonConstant.OLD_ELEVATOR_REDIS_KEY)){
list = JSONObject.parseArray(redisUtil.get(BizCommonConstant.OLD_ELEVATOR_REDIS_KEY).toString(),ElevatorDto.class);
} else {
list = elevatorServiceImpl.selectExportData(exportDto.getExportId());
redisUtil.set(BizCommonConstant.OLD_ELEVATOR_REDIS_KEY,JSONObject.toJSONString(list));
}
}
ExcelUtil.exportWithMplThread2(response,fileName,list,heads,exportDto.getFileType(),customExecutor,10000);
return;
} else if("MAINTENANCE_COMPANY".equals(exportDto.getExportType())) { // 查询维保单位数据
......
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