src/main/java/com/whyc/controller/MaterialApprovingController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/controller/MaterialController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/MaterialMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/MaterialService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/MaterialMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/MaterialApprovingController.java
@@ -12,7 +12,7 @@ import java.io.IOException; /** * 散装件解析 * 物料审批解析 */ @RestController @RequestMapping("materialApproving") src/main/java/com/whyc/controller/MaterialController.java
@@ -1,12 +1,28 @@ package com.whyc.controller; import com.whyc.dto.Response; import com.whyc.pojo.DocUser; import com.whyc.pojo.Material; import com.whyc.pojo.MaterialApproving; import com.whyc.service.MaterialService; import com.whyc.util.ActionUtil; import com.whyc.util.CommonUtil; import com.whyc.util.FileUtil; import com.whyc.util.Zip4jUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.LinkedList; import java.util.List; @Api(tags = "物料管理") @@ -38,10 +54,112 @@ return service.getMaterialLimit(subCode,subName,subModel,pageCurr,pageSize); } @ApiOperation(value = "test") @PostMapping("test") public List test(@RequestBody List<String> codeList){ return service.getListByCodeList(codeList); @PostMapping @ApiOperation(value = "新增",notes = "解析返回的绝对路径,需要回传到字段fileUrl") public Response add(@RequestBody List<Material> materialList){ return service.add(materialList); } @PostMapping("zipParse") @ApiOperation("zip解析") public Response zipParse(MultipartFile file) throws IOException, InvalidFormatException { List<MaterialApproving> list = new LinkedList<>(); Response response = new Response(); //检查是否为zip boolean isZip = Zip4jUtil.checkZipFileParam(file); if(!isZip){ return response.set(1,false,"上传的文件格式不是zip"); } //zip存储路径:doc_file/material_submit/${username}/{dateFormat}/${timeStamp} String rootFile = CommonUtil.getRootFile(); DocUser user = ActionUtil.getUser(); String dateFormat = new SimpleDateFormat("YYYY-MM").format(new Date()); long timeStamp = System.currentTimeMillis(); String filePath = rootFile + File.separator + "material_submit" + File.separator + user.getName() + File.separator + dateFormat+ File.separator + timeStamp; File parentFile = new File(filePath); String originalFilename = file.getOriginalFilename(); File zipFile = new File(filePath+File.separator+ originalFilename); if(!zipFile.exists()){ zipFile.mkdirs(); } file.transferTo(zipFile); //解压文件夹 Zip4jUtil.unPackZip(zipFile,null,filePath); //遍历解压后的文件夹路径,解析excel System.out.println(filePath); List<String> fileList = new ArrayList<>(); fileList = FileUtil.getStaticFilePath(parentFile,fileList); for (int i = 0; i < fileList.size(); i++) { String fileTempUrl = fileList.get(i); //查询到xls数据 if(fileTempUrl.contains(".xls")){ File fileTemp = new File(fileTempUrl); Workbook workbook = null; workbook = WorkbookFactory.create(fileTemp); List<? extends PictureData> allPictures = workbook.getAllPictures(); //取第一个sheet表 Sheet sheet = workbook.getSheetAt(0); int lastRowNum = sheet.getLastRowNum(); //取第三行,并以第三行开始 Row rowTemp = sheet.getRow(1); short lastCellNum = rowTemp.getLastCellNum(); //先单独获取产品型号和版本号/分类 Row row = sheet.getRow(1); String type = row.getCell(1).getStringCellValue(); Row row2 = sheet.getRow(2); String productModel = row2.getCell(5).getStringCellValue(); Row row3 = sheet.getRow(3); String productVersion = row3.getCell(5).getStringCellValue(); for (int l = 8; l < lastRowNum-1; l++) { Cell cellTemp = sheet.getRow(l).getCell(1); cellTemp.setCellType(Cell.CELL_TYPE_STRING); if(cellTemp.getStringCellValue().equals("")){ break; } MaterialApproving approving = new MaterialApproving(); approving.setCreateDate(new Date()); for (int m = 2; m < lastCellNum; m++) { row = sheet.getRow(l); Cell cell = row.getCell(m); String cellValue = null; int cellValueInt = 0; Double cellValueDouble = null; if(m == 3){ //cellValueDouble = cell.getNumericCellValue(); //DecimalFormat decimalFormat = new DecimalFormat("0"); //cellValue = decimalFormat.format(cellValueDouble); cell.setCellType(Cell.CELL_TYPE_STRING); cellValue = cell.getStringCellValue(); } else if(m ==7){ cellValueDouble = cell.getNumericCellValue(); } else { cellValue = cell.getStringCellValue(); } switch (m){ case 2:{approving.setCategory(cellValue);}break; case 3:{approving.setSubCode(cellValue);}break; case 4:{approving.setSubName(cellValue);}break; case 5:{approving.setSubModel(cellValue);}break; case 6:{approving.setUnit(cellValue);}break; case 7:{approving.setQuantity(cellValueDouble.intValue());}break; case 8:{approving.setProducer(cellValue);}break; case 9:{approving.setNotes(cellValue);}break; } } list.add(approving); } } } for (MaterialApproving MaterialApproving : list) { if(MaterialApproving.getSubName()==null ||MaterialApproving.getSubName().equals("")){ return response.set(1,false,"拒绝解析,excel文件中记录包含名称为空的记录"); } } return response.setII(1,true,list,filePath); } } src/main/java/com/whyc/mapper/MaterialMapper.java
@@ -20,4 +20,8 @@ void updateDwgUrl(List<Material> materialDwgUrlNameList); List<Material> getListByCodeAndModelList(List<Material> materialList); void disableStatus(List<Material> materialList); } src/main/java/com/whyc/service/MaterialService.java
@@ -6,10 +6,18 @@ import com.whyc.dto.Response; import com.whyc.mapper.MaterialMapper; import com.whyc.pojo.Material; import com.whyc.util.CommonUtil; import com.whyc.util.FileUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.FileCopyUtils; import java.io.File; import java.io.IOException; import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; @Service public class MaterialService { @@ -75,4 +83,72 @@ public void updateDwgUrl(List<Material> materialDwgUrlNameList) { mapper.updateDwgUrl(materialDwgUrlNameList); } @Transactional public Response add(List<Material> materialList) { String fileUrl = materialList.get(0).getFileUrl(); //校验物料合理性,非空校验:物料名称/物料编号/物料型号 for (int i = 0; i < materialList.size(); i++) { Material material = materialList.get(i); if(material.getSubCode()==null ||material.getSubCode().equals("") || material.getSubName()==null ||material.getSubName().equals("") || material.getSubModel()==null ||material.getSubModel().equals("")){ return new Response().set(1,false,"拒绝新增,物料名称/物料编号/物料型号存在空值"); } } //检验物料重复性,已存在的物料,拒绝重复提交,判断依据:物料编码+物料型号 List<Material> existList = getListByCodeAndModelList(materialList); if(existList!=null && existList.size()!=0){ return new Response().setII(1,false,existList,"拒绝新增,物料重复提交"); } //获取路径下的所有文件 List<String> fileUrlList = new LinkedList<>(); List<String> dwgUrlList = null; List<String> materialUrlList = new LinkedList<>(); fileUrlList = FileUtil.getStaticFilePath(new File(fileUrl),fileUrlList); dwgUrlList = fileUrlList.stream().filter(url->url.contains(".dwg")).collect(Collectors.toList()); //图纸的url预设 dwgUrlList.forEach(dwgUrl-> { materialList.forEach(material -> { String filename = dwgUrl.substring(dwgUrl.lastIndexOf(File.separator) + 1, dwgUrl.length() - 4); String fileFullName = dwgUrl.substring(dwgUrl.lastIndexOf(File.separator) + 1); if (material.getSubModel().toUpperCase().equals(filename.toUpperCase())) { materialUrlList.add(dwgUrl); material.setDwgUrl("doc_file" + File.separator + "material" + File.separator + fileFullName); } }); }); //图纸文件转移到正式文件夹 String projectDir = CommonUtil.getProjectDir(); String materialDir = projectDir + File.separator + "doc_file" + File.separator + "material"; File materialFile = new File(materialDir); if(!materialFile.exists()){ materialFile.mkdirs(); } materialUrlList.forEach(materialUrl->{ String dwgFullName = materialUrl.substring(materialUrl.lastIndexOf(File.separator) + 1); try { FileCopyUtils.copy(new File(materialUrl),new File(materialDir + File.separator + dwgFullName)); } catch (IOException e) { e.printStackTrace(); } }); //新增,同时对于物料编码相同,物料型号不同的,禁用旧物料状态 mapper.disableStatus(materialList); materialList.forEach(material -> { material.setStatus(1); material.setFileUrl(null); }); mapper.insertBatchSomeColumn(materialList); return new Response().set(1,true,"新增完成"); } private List<Material> getListByCodeAndModelList(List<Material> materialList) { return mapper.getListByCodeAndModelList(materialList); } } src/main/resources/mapper/MaterialMapper.xml
@@ -164,6 +164,12 @@ update db_doc.tb_material set dwg_url = #{item.notes} where sub_model = #{item.subModel} </foreach> </update> <update id="disableStatus"> update db_doc.tb_material set status = 0 where sub_code in <foreach collection="list" item="item" separator="," open="(" close=")"> #{item.subCode} </foreach> </update> <select id="getMaterialLimit" resultMap="materialList"> select * from tb_Material @@ -223,4 +229,9 @@ ${code} </foreach> </select> <select id="getListByCodeAndModelList" resultType="com.whyc.pojo.Material"> <foreach collection="list" item="item" separator=" union "> select sub_code,sub_model from db_doc.tb_material where sub_code = #{item.subCode} and sub_model = #{item.subModel} </foreach> </select> </mapper>