diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index c28c940..1fe427f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -29,10 +29,10 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.stream.Collectors; /** * 施工添加设备控制器 @@ -248,11 +248,19 @@ List list = appDeviceAddService.reportExport(devcode, devtype, begTime, endTime, project, installPerson); + List dictList = permissionService.findInDictByCode("sluicewellType"); + Map sluiceWellDictMap = dictList.stream() + .collect(Collectors.toMap(e -> e.getCode(), e -> e.getName())); list.forEach(appDeviceAdd -> { - appDeviceAdd.setWelltype(permissionService.getDictNameByCode("sluicewellType", appDeviceAdd.getWelltype())); + appDeviceAdd.setWelltype(sluiceWellDictMap.get(appDeviceAdd.getWelltype())); }); - - appDeviceAddService.exportUsersToExcel(list,response); + ExecutorService cachedExecutorService = Executors.newCachedThreadPool(); + cachedExecutorService.execute(new Runnable() { + @Override + public void run() { + appDeviceAddService.exportUsersToExcel(list, response); + } + }); // List res = new ArrayList<>(); // res.addAll(list); // //获取导出文件header