From 97414c0256de8dd519956243a022f4335c3cfbc9 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Tue, 6 Feb 2024 11:09:53 +0800 Subject: [PATCH] =?UTF-8?q?bug:=E3=80=90ID1000395=E3=80=91=20=20=20=20=20?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E3=80=81=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8F=B7=E5=88=97=E8=A1=A8=E5=AF=BC=E5=85=A5pdf=E6=96=87?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=9C=89=E4=B8=A4=E7=A7=8D=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E6=96=87=E4=BB=B6=E5=B7=B2=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxInstrumentSerialController.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentSerialController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentSerialController.java index 1632224..9b8df48 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentSerialController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentSerialController.java @@ -11,6 +11,7 @@ import com.flossom.common.core.domain.req.WxInstrumentSerialExportVm; import com.flossom.common.core.domain.req.WxInstrumentSerialImportVm; import com.flossom.common.core.domain.req.WxUserInstrumentExportVm; import com.flossom.common.core.exception.ServiceException; +import com.flossom.common.core.exception.UtilException; import com.flossom.common.core.utils.StringUtils; import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.web.controller.BaseController; @@ -120,7 +121,7 @@ public class WxInstrumentSerialController extends BaseController */ @RequiresPermissions("system:instrumentSerial:remove") @Log(title = "仪器序列号关联", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(wxInstrumentSerialService.deleteWxInstrumentSerialByIds(ids)); @@ -164,15 +165,17 @@ public class WxInstrumentSerialController extends BaseController { String fileName = file.getOriginalFilename(); String suffix = fileName.substring(fileName.lastIndexOf(".")); - if (!StringUtils.equals(suffix, "xls") || !StringUtils.equals(suffix, "xlsx")) { + if (!(StringUtils.equals(suffix, ".xls") || StringUtils.equals(suffix, ".xlsx"))) { throw new ServiceException("请使用模板文件导入数据"); } ExcelUtil util = new ExcelUtil(WxInstrumentSerialImportVm.class); List WxInstrumentSerialImportList = util.importExcel(file.getInputStream()); - String message = wxInstrumentSerialService.handleImportData(WxInstrumentSerialImportList); -// String operName = SecurityUtils.getUsername(); -// String message = userService.importUser(userList, updateSupport, operName); - return success(message); + if(WxInstrumentSerialImportList == null ||WxInstrumentSerialImportList.isEmpty() || WxInstrumentSerialImportList.get(0) == null) { + throw new ServiceException("数据格式不正确，请检查模板数据"); + } + + String result = wxInstrumentSerialService.handleImportData(WxInstrumentSerialImportList); + return success(result); } }