From db95f1a014aae02f59f3e8a95a576e5ac7964c5b Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 09 九月 2022 15:50:16 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/service/SoftwareService.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/whyc/service/SoftwareService.java b/src/main/java/com/whyc/service/SoftwareService.java
index a256d6c..064f702 100644
--- a/src/main/java/com/whyc/service/SoftwareService.java
+++ b/src/main/java/com/whyc/service/SoftwareService.java
@@ -40,7 +40,7 @@
@Autowired
private DocLogService logService;
- public List<Software> excelParse(InputStream inputStream) throws IOException, InvalidFormatException, ParseException {
+ public Response<Object> excelParse(InputStream inputStream) throws IOException, InvalidFormatException, ParseException {
List<Software> softwareList = new LinkedList<>();
Workbook workbook = null;
@@ -54,7 +54,11 @@
//鍙栧浐瀹氶儴鍒嗗��
Software common = new Software();
common.setFileName(sheet.getRow(2).getCell(2).getStringCellValue());
- String typeStr = sheet.getRow(3).getCell(2).getStringCellValue();
+ Cell cellBoardNumber = sheet.getRow(3).getCell(2);
+ if(cellBoardNumber != null){
+ common.setBoardNumber(cellBoardNumber.getStringCellValue());
+ }
+ String typeStr = sheet.getRow(4).getCell(2).getStringCellValue();
String[] typeArr = typeStr.split(" ");
for (int i = 0; i < typeArr.length; i++) {
//excel鍗曞厓鏍间腑鐨勨湐瀵瑰簲瀛楃
@@ -63,31 +67,37 @@
break;
}
}
- common.setVersion(sheet.getRow(4).getCell(2).getStringCellValue());
- common.setBasedVersion(sheet.getRow(4).getCell(4).getStringCellValue());
+ //妫�楠�
+ if(!common.getType().equals("搴旂敤杞欢")){
+ if(common.getBoardNumber() == null){
+ return new Response().set(1,false,"褰撴槸BootLoader 杞欢銆佹搷浣滅郴缁熻蒋浠讹紙鏍稿績鏉匡級杞欢鏃讹紝闇�濉啓PCB鐨勮鏍煎瀷鍙�");
+ }
+ }
+ common.setVersion(sheet.getRow(5).getCell(2).getStringCellValue());
+ common.setBasedVersion(sheet.getRow(5).getCell(4).getStringCellValue());
- common.setOwner(sheet.getRow(5).getCell(2).getStringCellValue());
- common.setFilingDate(sheet.getRow(5).getCell(4).getStringCellValue());
+ common.setOwner(sheet.getRow(6).getCell(2).getStringCellValue());
+ common.setFilingDate(sheet.getRow(6).getCell(4).getStringCellValue());
//鏈�鍚庝竴琛�,鍙栧彂甯冭鏄�
common.setReleaseNotes(sheet.getRow(lastRowNum).getCell(2).getStringCellValue());
- //绗�8琛屽紑濮�,鍊掓暟绗�2琛屾埅姝�
- int applyModelNum = lastRowNum + 1 - 8;
+ //绗�9琛屽紑濮�,鍊掓暟绗�2琛屾埅姝�
+ int applyModelNum = lastRowNum + 1 - 9;
for (int i = 0; i < applyModelNum; i++) {
Software software = new Software();
BeanUtils.copyProperties(common,software);
//鍙栫3鍒�,绗�5鍒�
- Cell cell = sheet.getRow(7 + i).getCell(2);
+ Cell cell = sheet.getRow(8 + i).getCell(2);
cell.setCellType(Cell.CELL_TYPE_STRING);
software.setApplyMaterialCode(cell.getStringCellValue());
- software.setApplyModel(sheet.getRow(7+i).getCell(4).getStringCellValue());
+ software.setApplyModel(sheet.getRow(8+i).getCell(4).getStringCellValue());
softwareList.add(software);
}
softwareList = softwareList.stream().filter(software -> !software.getApplyMaterialCode().equals("")).collect(Collectors.toList());
- return softwareList;
+ return new Response().setII(1,true,softwareList,"鏂囦欢瑙ｆ瀽鎴愬姛");
}
//鏌ヨ杞欢鍒楄〃鐨勪俊鎭�
@@ -145,6 +155,9 @@
String file1Name = file1.getOriginalFilename();
String file2Name = file2.getOriginalFilename();
Software software = softwareList.get(0);
+ if(!software.getFileName().equals(file1Name.substring(0,file1Name.lastIndexOf(".")))){
+ return new Response().set(1,false,"闄勪欢鐨勬枃浠跺悕涓庤蒋浠跺彂甯冭褰昬xcel鍐呯殑鏂囦欢鍚嶇О涓嶄竴鑷�");
+ }
Date date = new Date();
String dateUnion = DateUtil.YYYY_MM_DD_HH_MM_SS_UNION.format(date);
//鏂囦欢閲嶅懡鍚�
@@ -168,7 +181,7 @@
}
//鍐欏叆鏁版嵁搴�
insertBatch(softwareList);
- return new Response().setII(1,"涓婁紶瀹屾垚");
+ return new Response().set(1,true,"涓婁紶瀹屾垚");
}
private void insertBatch(List<Software> softwareList){
--
Gitblit v1.9.1