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

lxw

2022-07-19 ba89dd173829b71924bf80ca6b132b6375181104

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

 src/main/java/com/whyc/service/ProductBomApprovingService.java

@@ -1,15 +1,22 @@
package com.whyc.service;

import com.whyc.pojo.DocUser;
import com.whyc.pojo.ProductBomApproving;
import com.whyc.pojo.WorksheetMain;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.*;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;

import javax.xml.crypto.Data;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;

@@ -59,9 +66,27 @@
                        int k = i-2;
                        if(k<allPictures.size()){
                            PictureData pictureData = allPictures.get(k);
                            //图片存储
                            CommonUtil.getRootFile();
                            bomApproving.setPictureUrl(bomApproving.getSubModel()+"."+pictureData.suggestFileExtension());
                            //图片存储 product_approving/username/2022-07/
                            DocUser user = ActionUtil.getUser();
                            String dateFormat = new SimpleDateFormat("YYYY-MM").format(new Date());
                            String rootFile = CommonUtil.getRootFile();
                            String approvingPath = rootFile + File.separator + "product_approving" + File.separator + user.getName() + File.separator + dateFormat;
                            File provingFile = new File(approvingPath);
                            if(!provingFile.exists()){
                                provingFile.mkdirs();
                            }
                            String suffix = pictureData.suggestFileExtension();
                            String picturePath = approvingPath + File.separator + bomApproving.getSubModel() + File.separator + suffix;
                            byte[] data = pictureData.getData();
                            FileOutputStream fileOutputStream = null;
                            try {
                                File pictureFile = new File(picturePath);
                                fileOutputStream = new FileOutputStream(pictureFile);
                                fileOutputStream.write(data);
                            }finally {
                                fileOutputStream.close();
                            }
                            bomApproving.setPictureUrl(picturePath);
                        }
                    }break;
                }

 src/main/java/com/whyc/util/CommonUtil.java

@@ -38,7 +38,7 @@
     * 获取存放文件的根路径
     * @return 返回存放文件的根路径
     */
    public static File getRootFile(){
    public static String getRootFile(){
        ApplicationHome applicationHome = new ApplicationHome(CommonUtil.class);
        File jarFile = applicationHome.getDir();
        String baseDirPath;
@@ -49,7 +49,7 @@
            //打包路径
            baseDirPath = jarFile.toString()+File.separator+"doc_file"+File.separator;
        }
        return new File(baseDirPath);
        return baseDirPath;
    }

    /**手动记录特定日志*/