From 8689bc6ef13259a2bc2f840b6da5a5f2afed2048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 20 Jun 2025 18:02:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E6=8A=80=E6=9C=AF=E5=8F=82=E6=95=B0=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=8F=82=E6=95=B0=E5=80=BC=E4=B8=BA?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=97=B6=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProductModelController.java | 29 ++----------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java index bcbc3b23..f6967c1e 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java @@ -624,6 +624,7 @@ public class ProductModelController extends ControllerBase{ VUtils.trueThrowBusinessError(!StrUtil.equals(model.getNo(),no)).throwMessage("产品型号不一致"); List datas = new ArrayList<>(); String indexName = null; + DataFormatter dataFormatter = new DataFormatter(); for (int index = 3, count = sheet.getLastRowNum(); index <= count; index++) { // log.info("处理第{}行", index); Row row = sheet.getRow(index); @@ -642,7 +643,7 @@ public class ProductModelController extends ControllerBase{ Cell cell1=row.getCell(1); dto.setName(StrUtil.trim(cell1.getStringCellValue())); Cell cell2=row.getCell(2); - dto.setValue(StrUtil.trim(cell2.getStringCellValue())); + dto.setValue(StrUtil.trim(dataFormatter.formatCellValue(cell2))); Cell cell3=row.getCell(3); dto.setMain(StrUtil.equals(cell3.getStringCellValue(),"是")); Cell cell4=row.getCell(4); @@ -737,32 +738,6 @@ public class ProductModelController extends ControllerBase{ } } return ApiResult.success(resultId); - -// List datas = EecExcelUtil.getExcelContext(file.getInputStream(), ProductModelParamsExcelDTO.class); -// VUtils.trueThrowBusinessError(CollUtil.isEmpty(datas)).throwMessage("导入文件内容为空"); -// Set seen = new HashSet<>(); -// StringBuilder sb=new StringBuilder(); -// datas.forEach(dto->{ -// if(!seen.add(StrUtil.format("{}|{}|{}", dto.getLanguageCode(),dto.getIndexName(),dto.getName()))){ -// sb.append(StrUtil.format("语言编码:{},指标名称:{},参数名称:{}\r\n", dto.getLanguageCode(),dto.getIndexName(),dto.getName())); -// } -// }); -// int resultId; -// VUtils.trueThrowBusinessError(StrUtil.isNotBlank(sb.toString())) -// .throwMessage("以下数据存在重复项:\r\n" + sb); -// if (Objects.isNull(modelParamsId)) { -// resultId = productModelParamsService.add(modelId, IdUtil.getSnowflakeNextIdStr()); -// } else { -// ProductModelParams info = productModelParamsService.getById(modelParamsId); -// VUtils.trueThrowBusinessError(Objects.isNull(info)).throwMessage("无效的数据"); -// resultId = modelParamsId; -// if (Objects.equals(info.getState(), PublishState.Published.getState())) { -// resultId = productModelParamsService.add(modelId, info.getBatchNumber()); -// productModelParamsService.copyItems(modelParamsId, resultId); -// } -// } -// productModelParamsItemService.importModelParamsItem(resultId, datas); -// return ApiResult.success(resultId); } catch (IOException e) { throw new NflgException(STATE.BusinessError, "导入失败：" + e.getMessage()); }