fix: 审批管理/待审批/已审批列表查询接口

谢茂盛
1 parent c94daedf
Showing 6 changed files with 122 additions and 4 deletions
src/main/java/com/order/erp/common/excel4j/handler/SheetTemplateHandler.java
src/main/java/com/order/erp/common/utils/FileUtil.java
src/main/java/com/order/erp/domain/dto/order/OrderFieldLockApplyDO.java
src/main/java/com/order/erp/domain/excel/OrderExcelVO.java
src/main/java/com/order/erp/domain/vo/order/OrderApplyResultVO.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
 package com.order.erp.common.excel4j.handler;
  
 import com.order.erp.common.excel4j.exceptions.Excel4JException;
+import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
  
 import java.io.File;
 import java.io.FileInputStream;
@@ -257,12 +262,57 @@ public class SheetTemplateHandler {
             template.currentColumnIndex++;
             return;
         }
+
+        if (value instanceof byte[]) {
+            byte[] data = (byte[]) value;
+            // 5.1anchor主要用于设置图片的属性
+            short x = (short) cell.getColumnIndex();
+            int y = cell.getRowIndex();
+            // 5.2插入图片
+            addImage(cell.getSheet(), new Integer[]{y, y, (int) x, (int) x}, data);
+            cell.setCellValue("");
+            template.currentColumnIndex++;
+            return;
+        }
+
         // default value#toString
         cell.setCellValue(value.toString());
         template.currentColumnIndex++;
     }
  
     /**
+     * 指定单元格，添加图片
+     *
+     * @param position 下标位置， row start, row end, col start, col end
+     * @param images   图片数据
+     */
+    public static void addImage(Sheet sheet, Integer[] position, byte[] images) {
+        Drawing<?> drawingPatriarch = sheet.createDrawingPatriarch();
+        Workbook workbook = sheet.getWorkbook();
+        // 5.2插入图片
+        ClientAnchor anchor;
+        int add1;
+        Integer startRow = position[0];
+        Integer endRow = position[1] + 1;
+        Integer startCol = position[2];
+        Integer endCol = position[3] + 1;
+        if (workbook instanceof XSSFWorkbook) {
+            anchor = new XSSFClientAnchor(0, 0, 0, 0, startCol, startRow, endCol, endRow);
+            anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_AND_RESIZE);
+            add1 = workbook.addPicture(images, XSSFWorkbook.PICTURE_TYPE_PNG);
+        } else if (workbook instanceof HSSFWorkbook) {
+            anchor = new HSSFClientAnchor(0, 0, 0, 0, startCol.shortValue(), startRow, endCol.shortValue(), endRow);
+            anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_AND_RESIZE);
+            add1 = workbook.addPicture(images, SXSSFWorkbook.PICTURE_TYPE_PNG);
+        } else {
+            anchor = new XSSFClientAnchor(0, 0, 0, 0, startCol, startRow, endCol, endRow);
+            anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_AND_RESIZE);
+            add1 = workbook.addPicture(images, XSSFWorkbook.PICTURE_TYPE_PNG);
+        }
+        drawingPatriarch.createPicture(anchor, add1);
+    }
+
+    /**
      * 设置某个元素的样式
      *
      * @param cell     cell元素
@@ -114,7 +114,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
     /**
      * inputStream 转 File
      */
-    static File inputStreamToFile(InputStream ins, String name) throws Exception {
+    public static File inputStreamToFile(InputStream ins, String name) throws Exception {
         File file = new File(System.getProperty("java.io.tmpdir") + File.separator + name);
         if (file.exists()) {
             return file;
@@ -132,6 +132,52 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
     }
  
     /**
+     * 将文件转换为byte数组，作为图片数据导入
+     *
+     * @param file
+     * @return byte[]
+     */
+    public static byte[] imageParseBytes(File file) {
+        FileInputStream fileInputStream = null;
+        try {
+            fileInputStream = new FileInputStream(file);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+        return imageParseBytes(fileInputStream);
+    }
+
+    /**
+     * 将流转换为byte数组，作为图片数据导入
+     *
+     * @param fis
+     * @return byte[]
+     */
+    public static byte[] imageParseBytes(InputStream fis) {
+        byte[] buffer = null;
+        ByteArrayOutputStream bos = null;
+        try {
+            bos = new ByteArrayOutputStream(1024);
+            byte[] b = new byte[1024];
+            int n;
+            while ((n = fis.read(b)) != -1) {
+                bos.write(b, 0, n);
+            }
+            buffer = bos.toByteArray();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                fis.close();
+                bos.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return buffer;
+    }
+
+    /**
      * 将文件名解析成文件的上传路径
      */
     public static File upload(MultipartFile file, String filePath) {
@@ -40,7 +40,7 @@ public class OrderFieldLockApplyDO extends BaseDO implements Serializable {
      */
     private String fields;
     /**
-     * 状态：0 待审批，1 通过，2 拒绝
+     * 状态：0 待审批，10 通过，20 拒绝
      */
     private Integer status;
  
@@ -68,9 +68,14 @@ public class OrderExcelVO implements Serializable {
     /**
      * pic图片地址
      */
-    @ExcelField(title = "pic图片地址", order = 11)
+//    @ExcelField(title = "pic图片地址", order = 11)
     private String picUrl;
     /**
+     * pic图片
+     */
+    @ExcelField(title = "pic图片", order = 11)
+    private byte[] picDate;
+    /**
      * 生产要求
      */
     @ExcelField(title = "生产要求", order = 12)
@@ -44,7 +44,7 @@ public class OrderApplyResultVO implements Serializable {
      */
     private OrderLockFieldVO fieldInfos;
     /**
-     * 状态：0 待审批，1 通过，2 拒绝
+     * 状态：0 待审批，10 通过，20 拒绝
      */
     private Integer status;
  
@@ -16,6 +16,7 @@ import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.excel4j.ExcelUtils;
 import com.order.erp.common.excel4j.exceptions.Excel4JException;
 import com.order.erp.common.exception.BusinessException;
+import com.order.erp.common.utils.FileUtil;
 import com.order.erp.common.utils.OrderFieldUtils;
 import com.order.erp.common.utils.ProfitUtils;
 import com.order.erp.config.DataScope;
@@ -33,11 +34,13 @@ import com.order.erp.mapper.order.OrderBaseInfoMapper;
 import com.order.erp.service.order.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.IOException;
 import java.util.*;
 import java.util.function.Function;
@@ -53,6 +56,11 @@ import java.util.stream.Collectors;
 @Service
 public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, OrderBaseInfoDO> implements OrderBaseInfoService {
  
+    @Value("${file.path}")
+    private String path;
+
+    @Value("${file.host}")
+    private String host;
  
     @Resource
     private OrderProfitAnalysisService profitAnalysisService;
@@ -184,6 +192,15 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 List<OrderExcelVO> excelVOS = resultVOList.stream().map(x -> {
                     OrderExcelVO excelVO = new OrderExcelVO();
                     BeanUtils.copyProperties(x, excelVO);
+                    if (StringUtils.isNotBlank(x.getPicUrl())) {
+                        String filename = x.getPicUrl().replaceAll(host + "/images/", "");
+                        try {
+                            excelVO.setPicDate(FileUtil.imageParseBytes(new File(path + File.separator + filename)));
+                        } catch (Exception e) {
+                            log.error("图片转换异常,订单：{}，e:{}", x.getId(), e.getMessage());
+                        }
+
+                    }
                     return excelVO;
                 }).collect(Collectors.toList());
                 //response为HttpServletResponse对象