Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

lxw

2022-09-05 c547bc1777b566e46445b0e74325f1ec69baff94

 src/main/java/com/whyc/controller/MaterialController.java

@@ -1,28 +1,17 @@
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 = "物料管理")
@@ -63,103 +52,32 @@
    @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();
        return service.zipParse(file);
    }

                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());
    @ApiOperation(value = "根据物料id查询返回附件文件夹下所有的文件列表",notes = "9.3修改后使用")
    @GetMapping("getAttachByMaterialId")
    public Response getAttachByMaterialId(@RequestParam int materialId){
        return service.getAttachByMaterialId(materialId);
    }

                    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();
                        }
    @ApiOperation(value = "根据物料型号（'-','_'之前的部分）查询物料的历史版本",notes = "9.3修改后使用")
    @GetMapping("getMaterialVersion")
    public Response getMaterialVersion(@RequestParam String subModel){
        return service.getMaterialVersion(subModel);
    }

                        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);
    @ApiOperation(value = "根据物料id查询物料信息",notes = "9.3修改后使用")
    @GetMapping("getMaterialById")
    public Response getMaterialById(@RequestParam int materialId){
        return service.getMaterialById(materialId);
    }

    /**物料id-物料编码-物料型号*/
    @ApiOperation(value = "追加附件",notes = "materialStr为json字符串,包含id,subCode,subModel")
    @PostMapping("attachment")
    public Response addAttachment(@RequestParam MultipartFile multipartFile,@RequestParam String materialStr){
        Material material = ActionUtil.getGson().fromJson(materialStr, Material.class);
        return service.addAttachment(multipartFile,material);
    }
}