From 54fd6efe041bff97ca679c3bc598e8f927dbfbea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Thu, 6 Feb 2025 14:40:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E9=83=A8=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceComponentController.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java index 6fdeb7fb..43ddd772 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java @@ -111,7 +111,7 @@ public class DeviceComponentController extends ControllerBase { @MethodInfoMark(value = "删除部件",menuName = "机型部件") @Transactional(rollbackFor = Exception.class) public ApiResult del(@RequestBody List ids){ - if(CollUtil.isNotEmpty(ids)){ + if(CollUtil.isEmpty(ids)){ throw new NflgException(STATE.ParamErr,"请选择要删除的部件"); } deviceComponentService.batchDelComponent(ids); @@ -134,7 +134,7 @@ public class DeviceComponentController extends ControllerBase { deviceComponentService.saveOrUpdateBatchComponent(Convert.toList(DeviceComponent.class, data)); } catch (IOException e) { - throw new NflgException(STATE.BusinessError, "导出失败："+e.getMessage()); + throw new NflgException(STATE.BusinessError, "导入失败："+e.getMessage()); } return ApiResult.success(true); } @@ -148,10 +148,19 @@ public class DeviceComponentController extends ControllerBase { @GetMapping("exportData") @MethodInfoMark(value = "导出部件",menuName = "机型部件") public void exportData(HttpServletResponse response) throws IOException { + EecExcelUtil.setResponseExcelHeader(response,"部件列表"); List list = deviceComponentService.list(); - List excelList = Convert.toList(DevComponentExcel.class, list); - new Workbook("部件列表", "").addSheet(new ListSheet<>("sheet1", excelList)).writeTo(response.getOutputStream()); - + if(CollUtil.isEmpty(list)) { + throw new NflgException(STATE.BusinessError, "没有可导出的数据"); + } + try { + List excelList = Convert.toList(DevComponentExcel.class, list); + new Workbook("部件列表", "") + .addSheet(new ListSheet<>("sheet1", excelList)) + .writeTo(response.getOutputStream()); + } catch (IOException e) { + throw new NflgException(STATE.BusinessError, "导出失败：" + e.getMessage()); + } }