add export data

src/main/java/com/yunzhi/inte/common/ExcelUtils.java

@@ -1,6 +1,14 @@
 package com.yunzhi.inte.common;
 
+import cn.hutool.poi.excel.ExcelUtil;
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder;
+import com.alibaba.excel.write.handler.WriteHandler;
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.yunzhi.inte.common.excel.CustomMergeStrategy;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -24,4 +32,34 @@ public class ExcelUtils {
 
         EasyExcel.write(response.getOutputStream(), dataClass).sheet("sheet1").doWrite(data);
     }
+
+    /**
+     * 导出, 支持复杂一点的自定义
+     * @param response
+     * @param dataClass
+     * @param data
+     * @param fileName
+     * @param writeHandlerList
+     * @throws IOException
+     */
+    public static void flush2(HttpServletResponse response, Class dataClass, List data, String fileName, List<WriteHandler> writeHandlerList) throws IOException {
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+        response.setHeader("Content-Disposition", "attachment;filename="+StringUtils.urlEncode(fileName)+".xlsx");
+
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).excelType(ExcelTypeEnum.XLSX).build();
+        ExcelWriterSheetBuilder writerSheetBuilder = EasyExcel.writerSheet("sheet1").head(dataClass);
+
+        if (null != writeHandlerList && writeHandlerList.size() > 0) {
+            for (WriteHandler writeHandler : writeHandlerList) {
+                writerSheetBuilder.registerWriteHandler(writeHandler);
+            }
+        }
+
+        WriteSheet writeSheet = writerSheetBuilder.build();
+
+        excelWriter.write(data, writeSheet);
+        excelWriter.finish();
+    }
 }

src/main/java/com/yunzhi/inte/common/excel/CustomMergeStrategy.java

@@ -0,0 +1,81 @@
+package com.yunzhi.inte.common.excel;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.util.CollectionUtils;
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddress;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CustomMergeStrategy extends AbstractMergeStrategy {
+
+    /**
+     * 分组，每几行合并一次
+     */
+    private List<Integer> exportFieldGroupCountList;
+
+    /**
+     * 目标合并列index
+     */
+    private Integer targetColumnIndex;
+
+    // 需要开始合并单元格的首行index
+    private Integer rowIndex;
+
+    // exportDataList为待合并目标列的值
+    public CustomMergeStrategy(List<String> exportDataList, Integer targetColumnIndex) {
+        this.exportFieldGroupCountList = getGroupCountList(exportDataList);
+        this.targetColumnIndex = targetColumnIndex;
+    }
+
+
+    @Override
+    protected void merge(Sheet sheet, Cell cell, Head head, int relativeRowIndex) {
+        if (null == rowIndex) {
+            rowIndex = cell.getRowIndex();
+        }
+        // 仅从首行以及目标列的单元格开始合并，忽略其他
+        if (cell.getRowIndex() == rowIndex && cell.getColumnIndex() == targetColumnIndex) {
+            mergeGroupColumn(sheet);
+        }
+    }
+
+    private void mergeGroupColumn(Sheet sheet) {
+        int rowCount = rowIndex;
+        for (Integer count : exportFieldGroupCountList) {
+            if(count == 1) {
+                rowCount += count;
+                continue ;
+            }
+            // 合并单元格
+            CellRangeAddress cellRangeAddress = new CellRangeAddress(rowCount, rowCount + count - 1, targetColumnIndex, targetColumnIndex);
+            sheet.addMergedRegionUnsafe(cellRangeAddress);
+            rowCount += count;
+        }
+    }
+
+    // 该方法将目标列根据值是否相同连续可合并，存储可合并的行数
+    private List<Integer> getGroupCountList(List<String> exportDataList){
+        if (CollectionUtils.isEmpty(exportDataList)) {
+            return new ArrayList<>();
+        }
+
+        List<Integer> groupCountList = new ArrayList<>();
+        int count = 1;
+
+        for (int i = 1; i < exportDataList.size(); i++) {
+            if (exportDataList.get(i).equals(exportDataList.get(i - 1))) {
+                count++;
+            } else {
+                groupCountList.add(count);
+                count = 1;
+            }
+        }
+        // 处理完最后一条后
+        groupCountList.add(count);
+        return groupCountList;
+    }
+}

src/main/java/com/yunzhi/inte/controller/PackageController.java

@@ -1,17 +1,21 @@
 package com.yunzhi.inte.controller;
 
+import com.alibaba.excel.write.handler.WriteHandler;
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.inte.common.BaseController;
-import com.yunzhi.inte.common.Constants;
-import com.yunzhi.inte.common.ResponseBean;
+import com.yunzhi.inte.common.*;
+
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
-import com.yunzhi.inte.common.StringUtils;
+import com.yunzhi.inte.common.excel.CustomMergeStrategy;
 import com.yunzhi.inte.entity.Dishes;
 import com.yunzhi.inte.entity.PackageDetail;
 import com.yunzhi.inte.entity.Store;
+import com.yunzhi.inte.vo.PackageExport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +24,8 @@ import org.springframework.web.bind.annotation.*;
 import com.yunzhi.inte.entity.Package;
 import com.yunzhi.inte.service.PackageService;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 套餐;(package)表控制层
  * @author : http://njyunzhi.com
@@ -75,11 +81,39 @@ public class PackageController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("导出套餐")
-    @GetMapping("/export")
-    public ResponseBean export() throws Exception {
+    @GetMapping("/package/export")
+    public void export(HttpServletResponse response) throws Exception {
         List<PackageDetail> result = packageService.exportAll();
+        List<PackageExport> exportList = new ArrayList<>();
+        if (null != result && result.size() > 0) {
+            int no = 0;
+            String lastName = "";
+            for (int i = 0; i < result.size(); i += 1) {
+                PackageDetail detail = result.get(i);
+                if (!lastName.equals(detail.getPackageName())) {
+                    no += 1;
+                }
+                lastName = detail.getPackageName();
+
+                PackageExport item = new PackageExport();
+                item.setNo(no);
+                item.setPackageName(detail.getPackageName());
+                item.setDishName(String.format("【%s】%s", 1 == detail.getDishKind() ? "主食": "菜肴", detail.getDishName()));
+                exportList.add(item);
+            }
+        }
 
-        return ResponseBean.success(result);
+        // 单元格合并策略
+        List<String> mergeNo = exportList.stream().map(x -> x.getNo().toString()).collect(Collectors.toList());
+        List<String> mergeName = exportList.stream().map(PackageExport::getPackageName).collect(Collectors.toList());
+        CustomMergeStrategy mergeStrategy1 = new CustomMergeStrategy(mergeNo, 0);
+        CustomMergeStrategy mergeStrategy2 = new CustomMergeStrategy(mergeName, 1);
+        List<WriteHandler> mergeStrategyList = new ArrayList<WriteHandler>() {{
+            add(mergeStrategy1);
+            add(mergeStrategy2);
+        }};
+
+        ExcelUtils.flush2(response, PackageExport.class, exportList, "套餐列表", mergeStrategyList);
     }
 
     /**

src/main/java/com/yunzhi/inte/entity/PackageDetail.java

@@ -34,7 +34,7 @@ public class PackageDetail implements Serializable,Cloneable{
     /** 套餐名称 */
     @ApiModelProperty(name = "套餐名称",notes = "")
     @TableField(exist = false)
-    private Integer packageName ;
+    private String packageName ;
     /** 菜肴ID */
     @ApiModelProperty(name = "菜肴ID",notes = "")
     private Integer dishId ;
@@ -42,7 +42,7 @@ public class PackageDetail implements Serializable,Cloneable{
     /** 菜肴名称 */
     @ApiModelProperty(name = "菜肴名称",notes = "")
     @TableField(exist = false)
-    private Integer dishName ;
+    private String dishName ;
     /** 菜肴类型 */
     @ApiModelProperty(name = "菜肴类型",notes = "1主食,2菜肴")
     private Integer dishKind ;

src/main/java/com/yunzhi/inte/vo/PackageExport.java

@@ -1,6 +1,8 @@
 package com.yunzhi.inte.vo;
 
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,6 +11,17 @@ import lombok.Data;
 @ApiModel("套餐导出")
 public class PackageExport {
 
-    @ApiModelProperty("套餐名称")
+    @ExcelProperty(value = "序号", index = 0)
+    @ApiModelProperty("序号")
+    Integer no;
+
+    @ColumnWidth(36)
+    @ExcelProperty(value = "套餐", index = 1)
+    @ApiModelProperty("套餐")
     String packageName;
+
+    @ColumnWidth(36)
+    @ExcelProperty(value = "菜肴", index = 2)
+    @ApiModelProperty("菜肴")
+    String dishName;
 }

src/main/resources/mapper/PackageMapper.xml

@@ -15,6 +15,6 @@
         WHERE
             t.`status` = 1
         ORDER BY
-            t.`name` ASC
+            t.`name` ASC, s.dish_kind ASC
     </select>
 </mapper>