From 479e74ab6fbeb149516152fdd2b6f3db904007ec Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 14 Nov 2021 09:22:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87excel=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/ImportExcelDatas/comment/Analysis.java | 2 -- .../ImportExcelDatas/comment/PathMatcher.java | 16 +++++++++------- .../ImportExcelDatas/comment/StandMatcher.java | 10 +++++----- .../controller/ImportExcelController.java | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java index a9356585..b5b83639 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java @@ -14,10 +14,8 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.time.Year; import java.util.HashSet; import java.util.List; -import java.util.regex.Pattern; import java.util.stream.Collectors; @Component diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/PathMatcher.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/PathMatcher.java index a046b6f5..caeecca1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/PathMatcher.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/PathMatcher.java @@ -29,17 +29,19 @@ public class PathMatcher { for (Row row : sheet) { - - String latter = row.getCell(1).getStringCellValue().trim();//标准号 - String fileId=""; - if (row.getCell(10)!=null){ - fileId = row.getCell(10).getStringCellValue().trim();//文档id - }else { + if(row.getCell(1)==null || row.getCell(10)==null){ logger.info("+"); continue; } + String latter = row.getCell(1).getStringCellValue().trim();//标准号 + String fileId=""; + + fileId = row.getCell(10).getStringCellValue().trim();//文档id + + + StringBuilder builder = new StringBuilder(); builder.append(fileId) .append(latter); @@ -55,7 +57,7 @@ public class PathMatcher { } - File file = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\匹配带入文件路径-国内库.xlsx"); + File file = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\匹配带入文件路径-企标.xlsx"); FileOutputStream os = new FileOutputStream(file); workbook.write(os); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/StandMatcher.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/StandMatcher.java index 041a0c47..bd613908 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/StandMatcher.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/StandMatcher.java @@ -40,13 +40,13 @@ public class StandMatcher { String letter =convertCellValueToString(row.getCell(1));//标准号 - String publish = convertCellValueToString(row.getCell(3));//发布日期 + String publish = convertCellValueToString(row.getCell(4));//发布日期 - String impl= convertCellValueToString(row.getCell(4));//实施日期 + String impl= convertCellValueToString(row.getCell(5));//实施日期 - String state = convertCellValueToString(row.getCell(2));//状态 + String state = convertCellValueToString(row.getCell(3));//状态 - String replace= convertCellValueToString(row.getCell(5));//代替标准号 + String replace= convertCellValueToString(row.getCell(6));//代替标准号 @@ -72,7 +72,7 @@ public class StandMatcher { } - File result = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\匹配带入文件id-国内库.xlsx"); + File result = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\匹配带入文件id-企标.xlsx"); FileOutputStream os = new FileOutputStream(result); workbook.write(os); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java index ab6ad83d..016a6797 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java @@ -163,7 +163,7 @@ public class ImportExcelController extends BaseController { } - @ApiOperation("根据文件id和标准匹配文件路径") + @ApiOperation("根据文件id和标准号匹配文件路径") @PostMapping("/matchingPath") public void matchingPath(MultipartFile targetExcel,MultipartFile attachExcel) throws IOException {