From 788f57c0f36ce4e625b068b5891c35ed8f8da2c7 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 15 九月 2022 16:08:00 +0800
Subject: [PATCH] 更新excel日期格式判断
---
src/main/java/com/whyc/service/SoftwareService.java | 148 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 127 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/whyc/service/SoftwareService.java b/src/main/java/com/whyc/service/SoftwareService.java
index 8d4757e..0fd23d9 100644
--- a/src/main/java/com/whyc/service/SoftwareService.java
+++ b/src/main/java/com/whyc/service/SoftwareService.java
@@ -1,14 +1,20 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.whyc.constant.UserOperation;
import com.whyc.dto.FileDirPath;
import com.whyc.dto.Response;
import com.whyc.mapper.SoftwareMapper;
+import com.whyc.pojo.AttachLock;
import com.whyc.pojo.DocUser;
import com.whyc.pojo.Software;
import com.whyc.util.ActionUtil;
+import com.whyc.util.CommonUtil;
+import com.whyc.util.DateUtil;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Sheet;
@@ -17,6 +23,8 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -36,7 +44,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;
@@ -50,7 +58,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鍗曞厓鏍间腑鐨勨湐瀵瑰簲瀛楃
@@ -59,44 +71,53 @@
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());
+ Cell cellFilingDate = sheet.getRow(6).getCell(4);
+ if(cellFilingDate.getCellType() == Cell.CELL_TYPE_NUMERIC){
+ Date dateCellValue = cellFilingDate.getDateCellValue();
+ common.setFilingDate(DateUtil.YYYY_MM_DD.format(dateCellValue));
+ System.out.println(dateCellValue);
+ }else {
+ cellFilingDate.setCellType(Cell.CELL_TYPE_STRING);
+ common.setFilingDate(cellFilingDate.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,"鏂囦欢瑙ｆ瀽鎴愬姛");
}
//鏌ヨ杞欢鍒楄〃鐨勪俊鎭�
- public Response getAllSoftware(String fileName, int pageCurr, int pageSize) {
+ public Response getAllSoftware(String fileName,String applyMaterialCode,String applyModel,String owner, String boardNumber,int pageCurr, int pageSize) {
PageHelper.startPage(pageCurr,pageSize);
- QueryWrapper wrapper=new QueryWrapper();
- if(fileName!=null&&!fileName.isEmpty()){
- wrapper.like("file_name",fileName);
- }
- wrapper.orderByAsc("file_name");
- wrapper.orderByAsc("version");
- List list=mapper.selectList(wrapper);
- return new Response().setII(1,list.size()>0,list,"杞欢淇℃伅杩斿洖");
+ List list=mapper.getFileUrl(fileName,applyMaterialCode,applyModel,owner,boardNumber);
+ PageInfo pageInfo=new PageInfo(list);
+ return new Response().setII(1,list.size()>0,pageInfo,"杞欢淇℃伅杩斿洖");
}
//鏍规嵁subcode鏌ヨ杞欢鍒楄〃
public Response getSoftBySubCode(String subCode) {
@@ -118,7 +139,7 @@
try {
// 杞爜闃叉涔辩爜
//resp.addHeader("Content-Disposition", "attachment;filename=" + new String(softwareName.getBytes("UTF-8"), "ISO8859-1"));
- resp.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode ( software.getFileName(), "utf-8"));
+ resp.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode ( software.getFileName()+".zip", "utf-8"));
OutputStream out = resp.getOutputStream();
FileInputStream in = new FileInputStream(fileDirName+File.separator+software.getFileUrl());
int len=0;
@@ -142,4 +163,89 @@
logService.recordOperationLog(docUser.getId(),docUser.getName(), UserOperation.TYPE_DOWNLOAD.getType(),new Date(),terminalIp,opreationMsg,operationDetail);
}
+ public Response upload(MultipartFile file1, MultipartFile file2, List<Software> softwareList) throws IOException {
+ 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鍐呯殑鏂囦欢鍚嶇О涓嶄竴鑷�");
+ }
+ Software softExists = getByFilename(software.getFileName());
+ if(softExists != null){ //鏂囦欢鍚�:瑙勬牸鍨嬪彿_杞欢鐗堟湰,宸插瓨鍦�,涓嶈兘閲嶅涓婁紶;杩欑鎯呭喌灞炰簬杩藉姞鏈哄瀷,鍒鏇存柊
+ return new Response().set(1,false,"鏂囦欢鍚嶇О("+softExists.getFileName()+")宸插瓨鍦�,涓嶈兘閲嶅涓婁紶");
+ }
+ Date date = new Date();
+ String dateUnion = DateUtil.YYYY_MM_DD_HH_MM_SS_UNION.format(date);
+ //鏂囦欢閲嶅懡鍚�(鏆備笉闇�瑕�,涓ユ牸閬靛畧鍚嶇О瑙勫垯鐨勬儏鍐典笅涓嶄細閲嶅悕)
+ //file1Name = file1Name.substring(0,file1Name.lastIndexOf(".")) + "_" + dateUnion +file1Name.substring(file1Name.lastIndexOf("."));
+ //file2Name = file2Name.substring(0,file2Name.lastIndexOf(".")) + "_" + dateUnion +file2Name.substring(file2Name.lastIndexOf("."));
+ //瀛樺偍璺緞
+ String rootFile = CommonUtil.getRootFile();
+ String softwareDir = rootFile + "software" + File.separator + software.getOwner()+ File.separator + software.getFileName();
+ String softwareHttpUrl = softwareDir.substring(softwareDir.lastIndexOf("doc_file"+ File.separator + "software"));
+ File softwareDirFile = new File(softwareDir);
+ if(!softwareDirFile.exists()){
+ softwareDirFile.mkdirs();
+ }
+ file1.transferTo(new File(softwareDir+File.separator+file1Name));
+ file2.transferTo(new File(softwareDir+File.separator+file2Name));
+ //璁剧疆璺緞
+ for (Software software1:softwareList){
+ software1.setFileUrl(softwareHttpUrl+File.separator+file1Name);
+ software1.setExcelUrl(softwareHttpUrl+File.separator+file2Name);
+ software1.setCreateTime(date);
+ }
+ //鍐欏叆鏁版嵁搴�
+ insertBatch(softwareList);
+ return new Response().set(1,true,"涓婁紶瀹屾垚");
+ }
+
+ private Software getByFilename(String fileName) {
+ QueryWrapper<Software> query = Wrappers.query();
+ query.eq("file_name",fileName).last(" limit 1");
+ return mapper.selectOne(query);
+ }
+
+ private void insertBatch(List<Software> softwareList){
+ mapper.insertBatchSomeColumn(softwareList);
+ }
+
+ @Transactional
+ public Response updateApplyModel(MultipartFile multipartFile, List<Software> softwareList) throws IOException {
+ String originalFilename = multipartFile.getOriginalFilename();
+ Software software = softwareList.get(0);
+ QueryWrapper<Software> query = Wrappers.query();
+ query.eq("file_name", software.getFileName()).last(" limit 1");
+ Software softwareDB = mapper.selectOne(query);
+ if(softwareDB == null){
+ return new Response().set(1,false,"瀵瑰簲鐨勮蒋浠跺苟鏈笂浼犺繃,鏃犳硶鏇存柊閫傜敤鏈哄瀷");
+ }else{
+ //鍐欏叆鏂板鐨勮蒋浠跺彂甯冭褰昬xcel
+ String rootFile = CommonUtil.getRootFile();
+ String softwareDir = rootFile + "software" + File.separator + software.getOwner()+ File.separator + software.getFileName();
+ String softwareHttpUrl = softwareDir.substring(softwareDir.lastIndexOf("doc_file"+ File.separator + "software"));
+ multipartFile.transferTo(new File(softwareDir + File.separator + originalFilename));
+ //鍏堝垹闄ゅ搴旂殑閫傜敤鏈哄瀷,鍐嶆柊澧為�傜敤鏈哄瀷璁板綍
+ UpdateWrapper<Software> update = Wrappers.update();
+ update.eq("file_name",softwareDB.getFileName());
+ mapper.delete(update);
+ softwareList.forEach(software2 -> {
+ software2.setFileUrl(softwareDB.getFileUrl());
+ software2.setExcelUrl(softwareHttpUrl + File.separator + originalFilename);
+ software2.setCreateTime(new Date());
+ });
+ mapper.insertBatchSomeColumn(softwareList);
+
+ return new Response().set(1,true,"鏇存柊瀹屾垚");
+ }
+ }
+ //鏍规嵁杞欢id淇敼杞欢閿佸畾鐘舵��
+ public Response updateSoftwareLock(String fileUrl,int lockFlag,String localReason) {
+ UpdateWrapper uwrapper=new UpdateWrapper();
+ uwrapper.set("lock_flag",lockFlag);
+ uwrapper.set("local_reason",localReason);
+ uwrapper.eq("file_url",fileUrl);
+ int flag=mapper.update(null,uwrapper);
+ return new Response().set(1,flag>0,"閿佸畾/瑙ｉ攣鎴愬姛");
+ }
}
--
Gitblit v1.9.1