feats

pom.xml

@@ -85,7 +85,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>easyexcel</artifactId>
-			<version>2.0.4</version>
+			<version>3.1.2</version>
 		</dependency>
 		<!--excel end-->
 

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

@@ -1,10 +1,17 @@
 package com.yunzhi.nanyang.common;
 
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.fill.FillConfig;
+import org.springframework.core.io.ClassPathResource;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
+import java.util.function.BiConsumer;
 
 public class ExcelUtils {
 
@@ -23,4 +30,36 @@ public class ExcelUtils {
 
         EasyExcel.write(response.getOutputStream(), dataClass).sheet("sheet1").doWrite(data);
     }
+
+    /**
+     * 模板导出
+     * @param response
+     * @param tpl
+     * @param data
+     * @param fileName
+     * @param callback
+     * @throws IOException
+     */
+    public static void tplExport(HttpServletResponse response, String tpl, List data, String fileName, BiConsumer<ExcelWriter, WriteSheet> callback) throws IOException {
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename="+StringUtils.urlEncode(fileName)+".xlsx");
+
+        ClassPathResource tplResource = new ClassPathResource(tpl);
+        InputStream tplResourceInputStream = tplResource.getInputStream();
+
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(tplResourceInputStream).build();
+        WriteSheet writeSheet = EasyExcel.writerSheet().build();
+        // 这里注意 入参用了forceNewRow 代表在写入list的时候不管list下面有没有空行 都会创建一行，然后下面的数据往后移动。默认 是false，会直接使用下一行，如果没有则创建。
+        // forceNewRow 如果设置了true,有个缺点 就是他会把所有的数据都放到内存了，所以慎用
+        // 简单的说 如果你的模板有list,且list不是最后一行，下面还有数据需要填充 就必须设置 forceNewRow=true 但是这个就会把所有数据放到内存 会很耗内存
+        // 如果数据量大 list不是最后一行 参照下一个
+        FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
+        excelWriter.fill(data, fillConfig, writeSheet);
+
+        // 回填部分数据
+        callback.accept(excelWriter, writeSheet);
+
+        excelWriter.finish();
+    }
 }

src/main/java/com/yunzhi/nanyang/controller/TaDeviceJobController.java

@@ -4,10 +4,12 @@ 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.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.ExcelUtils;
 import com.yunzhi.nanyang.common.ResponseBean;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.yunzhi.nanyang.common.StringUtils;
 import io.swagger.annotations.Api;
@@ -18,6 +20,8 @@ import org.springframework.web.bind.annotation.*;
 import com.yunzhi.nanyang.entity.TaDeviceJob;
 import com.yunzhi.nanyang.service.TaDeviceJobService;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 设备作业表;(ta_device_job)表控制层
  *
@@ -45,7 +49,7 @@ public class TaDeviceJobController extends BaseController {
 //    }
 
     /**
-     * 分页查询
+     * 设备作业列表
      *
      * @param pageNum  当前页码
      * @param pageSize 每页条数
@@ -70,21 +74,21 @@ public class TaDeviceJobController extends BaseController {
 
 
     /**
-     * 分页查询
+     * 设备作业统计
      *
      * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
-    @ApiOperation("设备作业列表")
+    @ApiOperation("设备作业统计")
     @GetMapping("/device-job/by-org")
     public ResponseBean statis(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                @ApiParam("合作社名称") @RequestParam(value = "orgName", required = false) String orgName,
                                @ApiParam("设备分类") @RequestParam(value = "deviceKind", required = false) String deviceKind,
                                @ApiParam("设备编号") @RequestParam(value = "deviceNo", required = false) String deviceNo,
-                               @ApiParam(value = "开始时间", example = "2022-10-01") @RequestParam(value = "startDate", required = false) String startDate,
-                               @ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate", required = false) String endDate) throws Exception {
+                               @ApiParam(value = "开始时间", example = "2022-10-01") @RequestParam(value = "startDate") String startDate,
+                               @ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate") String endDate) throws Exception {
 
         IPage<TaDeviceJob> pg = new Page<>(pageNum, pageSize);
         IPage<TaDeviceJob> list = taDeviceJobService.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate);
@@ -96,6 +100,60 @@ public class TaDeviceJobController extends BaseController {
         }});
     }
 
+    /**
+     * 设备作业统计-导出
+     * @param orgName
+     * @param deviceKind
+     * @param deviceNo
+     * @param startDate
+     * @param endDate
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation("设备作业统计-导出")
+    @GetMapping("/device-job/by-org/export")
+    public ResponseBean export(@ApiParam("合作社名称") @RequestParam(value = "orgName", required = false) String orgName,
+                               @ApiParam("设备分类") @RequestParam(value = "deviceKind", required = false) String deviceKind,
+                               @ApiParam("设备编号") @RequestParam(value = "deviceNo", required = false) String deviceNo,
+                               @ApiParam(value = "开始时间", example = "2022-10-01") @RequestParam(value = "startDate") String startDate,
+                               @ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate") String endDate,
+                               HttpServletResponse response) throws Exception {
+
+        List<TaDeviceJob> list = taDeviceJobService.listOrgBy(orgName, deviceKind, deviceNo, startDate, endDate);
+
+        Double total = 0.0;
+        if (list != null || list.size() > 0) {
+            for (TaDeviceJob item : list) {
+                if ("shensong".equals(item.getDeviceKind())) {
+                    item.setDeviceKind("深松机");
+                } else {
+                    item.setDeviceKind("无人机");
+                }
+
+                if (null != item.getJobArea()) {
+                    total += item.getJobArea();
+                }
+            }
+        }
+
+        try {
+            String date = String.format("%s 至 %s", startDate, endDate);
+            Double finalTotal = total;
+            ExcelUtils.tplExport(response, "job.xlsx", list, "作业统计", (excelWriter, writeSheet) -> {
+                Map<String, Object> map = new HashMap<>();
+                map.put("date", date);
+                map.put("total", finalTotal);
+                excelWriter.fill(map, writeSheet);
+            });
+
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ResponseBean.error("导出失败, 请重试");
+    }
+
 //    /**
 //     * 新增数据
 //     *

src/main/java/com/yunzhi/nanyang/mapper/TaDeviceJobMapper.java

@@ -6,7 +6,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.yunzhi.nanyang.entity.TaDeviceJob;
 
- /**
+import java.util.List;
+
+/**
  * 设备作业表;(ta_device_job)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-11-3
@@ -26,4 +28,10 @@ public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
                             @Param("deviceNo") String deviceNo,
                             @Param("startDate") String startDate,
                             @Param("endDate") String endDate);
+
+     List<TaDeviceJob> listOrgBy(@Param("orgName") String orgName,
+                                 @Param("deviceKind") String deviceKind,
+                                 @Param("deviceNo") String deviceNo,
+                                 @Param("startDate") String startDate,
+                                 @Param("endDate") String endDate);
  }

src/main/java/com/yunzhi/nanyang/service/TaDeviceJobService.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.nanyang.entity.TaDeviceJob;
 
- /**
+import java.util.List;
+
+/**
  * 设备作业表;(ta_device_job)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2022-11-3
@@ -14,4 +16,6 @@ public interface TaDeviceJobService extends IBaseService<TaDeviceJob> {
      IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgName, String deviceKind, String deviceNo, String startDate, String endDate);
 
      Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate);
+
+     List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate);
  }

src/main/java/com/yunzhi/nanyang/service/impl/TaDeviceJobServiceImpl.java

@@ -7,6 +7,8 @@ import com.yunzhi.nanyang.entity.TaDeviceJob;
 import com.yunzhi.nanyang.mapper.TaDeviceJobMapper;
 import com.yunzhi.nanyang.service.TaDeviceJobService;
 
+import java.util.List;
+
 /**
  * 设备作业表;(ta_device_job)表服务实现类
  *
@@ -25,4 +27,9 @@ public class TaDeviceJobServiceImpl extends BaseServiceImpl<TaDeviceJobMapper, T
     public Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate) {
         return baseMapper.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate);
     }
+
+    @Override
+    public List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate) {
+        return baseMapper.listOrgBy(orgName, deviceKind, deviceNo, startDate, endDate);
+    }
 }

src/main/resources/mapper/TaDeviceJobMapper.xml

@@ -37,4 +37,11 @@
         SELECT SUM(t.job_area)
         <include refid="statisOrg"></include>
     </select>
+    <select id="listOrgBy" resultType="com.yunzhi.nanyang.entity.TaDeviceJob">
+        SELECT
+            m.`name` AS org_name,
+            s.`name` AS machinery_name,
+            t.*
+        <include refid="statisOrg"></include>
+    </select>
 </mapper>