fix: 新增导出功能

guzijian
1 parent bde82a60
Showing 14 changed files with 346 additions and 6 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/SignInEnum.java
ruoyi-admin/src/main/java/com/ruoyi/controller/ReportController.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/converter/AlcoholFlagConverter.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/converter/SignInConvert.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/converter/SignInStatusConverter.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/converter/SignInTypeConverter.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/request/ReportErrorRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/request/ReportViewRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportErrorResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportViewResponseVo.java
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
ruoyi-admin/src/main/resources/mapper/in/SignInMapper.xml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -9,4 +9,24 @@ public interface SignInEnum {
      * 签退
      */
     Integer SIGNIN_OUT = 2;
+
+    String SIGN_IN_STRING = "签到";
+    String SIGN_IN_OUT_STRING = "签退";
+    String FACE_SIGN_IN = "人脸";
+    String CARD_SIGN_IN = "刷卡";
+    String OTHER_SIGN_IN = "其他";
+    String ALCOHOL_SIGN_IN = "酒精";
+
+    String SIGN_IN_SUCCESS_STRING = "签到成功";
+    Integer SIGN_IN_SUCCESS = 1;
+    String SIGN_IN_FAIL_STRING = "签到失败";
+    Integer SIGN_IN_FAIL = 2;
+
+    Integer ALCOHOL_FLAG_YES = 1;
+    String ALCOHOL_FLAG_YES_STRING = "已测试";
+    Integer ALCOHOL_FLAG_NO = 2;
+    String ALCOHOL_FLAG_NO_STRING = "未测试";
+
+
+
 }
 package com.ruoyi.controller;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
+import com.ruoyi.pojo.response.ReportErrorResponseVo;
+import com.ruoyi.pojo.response.ReportViewResponseVo;
 import com.ruoyi.service.ReportService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -10,6 +13,8 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 /**
  * @author 20412
@@ -33,4 +38,20 @@ public class ReportController {
     public AjaxResult getErrorList(@ApiParam @ModelAttribute ReportErrorRequestVo request) {
         return AjaxResult.success(reportService.getErrorReportList(request));
     }
+
+    @ApiOperation("签到报表导出")
+    @PostMapping("/export")
+    public void exportReport(@ApiParam ReportViewRequestVo requestVo, HttpServletResponse response){
+        List<ReportViewResponseVo> list = reportService.getReportScrollViewTable(requestVo);
+        ExcelUtil<ReportViewResponseVo> util = new ExcelUtil<ReportViewResponseVo>(ReportViewResponseVo.class);
+        util.exportEasyExcel(response, list, "操作日志");
+    }
+
+    @ApiOperation("异常报表导出")
+    @PostMapping("/error/export")
+    public void exportErrorReport(@ApiParam ReportErrorRequestVo requestVo,HttpServletResponse response){
+        List<ReportErrorResponseVo> list = reportService.getErrorReportList(requestVo);
+        ExcelUtil<ReportErrorResponseVo> util = new ExcelUtil<ReportErrorResponseVo>(ReportErrorResponseVo.class);
+        util.exportEasyExcel(response, list, "操作日志");
+    }
 }
+package com.ruoyi.pojo.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import static com.ruoyi.common.SignInEnum.*;
+
+/**
+ * 酒精测试
+ * @author 20412
+ */
+@SuppressWarnings(value = {"unchecked", "rawtypes"})
+public class AlcoholFlagConverter implements Converter<Integer> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return Integer.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public Integer convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(Integer integer, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        String str = "";
+        if (ALCOHOL_FLAG_YES.equals(integer)){
+            str = ALCOHOL_FLAG_NO_STRING;
+        }
+        if (ALCOHOL_FLAG_NO.equals(integer)){
+            str = ALCOHOL_FLAG_NO_STRING;
+        }
+        return new CellData(str);
+    }
+}
+package com.ruoyi.pojo.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import static com.ruoyi.common.SignInEnum.*;
+
+/**
+ * 签到类型
+ * @author 20412
+ */
+@SuppressWarnings(value = {"unchecked", "rawtypes"})
+public class SignInConvert implements Converter<Integer> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return Integer.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public Integer convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(Integer integer, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        String str = "";
+        if (SIGN_IN.equals(integer)){
+            str = SIGN_IN_STRING;
+        }
+        if (SIGNIN_OUT.equals(integer)){
+            str = SIGN_IN_OUT_STRING;
+        }
+        return new CellData(str);
+    }
+}
+package com.ruoyi.pojo.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import static com.ruoyi.common.SignInEnum.*;
+
+/**
+ * @author 20412
+ * 签到成功还是失败转换
+ */
+@SuppressWarnings(value = {"unchecked", "rawtypes"})
+public class SignInStatusConverter implements Converter<Integer> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return Integer.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public Integer convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        String value = cellData.getStringValue();
+        if (SIGN_IN_SUCCESS_STRING.equals(value)){
+            return 1;
+        }
+        if (SIGN_IN_FAIL_STRING.equals(value)){
+            return 2;
+        }
+        return Integer.parseInt(value);
+    }
+
+    @Override
+    public CellData convertToExcelData(Integer integer, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        String str = "";
+        if (SIGN_IN_SUCCESS.equals(integer)){
+            str = SIGN_IN_SUCCESS_STRING;
+        }
+        if (SIGN_IN_FAIL.equals(integer)){
+            str = SIGN_IN_FAIL_STRING;
+        }
+        return new CellData(str);
+    }
+}
+package com.ruoyi.pojo.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import static com.ruoyi.common.SignInEnum.*;
+
+/**
+ * @author 20412
+ * 签到类型
+ */
+// 取消显示的警告
+@SuppressWarnings(value = {"unchecked", "rawtypes"})
+public class SignInTypeConverter implements Converter<String> {
+
+    @Override
+    public Class supportJavaTypeKey() {
+        return String.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    /**
+     * 导入功能 保留
+     * @param cellData
+     * @param excelContentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public String convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        return null;
+    }
+
+    /**
+     * 导出转换
+     * @param value
+     * @param excelContentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CellData convertToExcelData(String value, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        String str = "";
+        String[] values = value.split(",");
+        for (String s : values) {
+            switch (s){
+                case "0": str = str + FACE_SIGN_IN + ",";break;
+                case "1": str = str + CARD_SIGN_IN + ",";break;
+                case "2": str = str + OTHER_SIGN_IN + ",";break;
+                case "3": str = str + ALCOHOL_SIGN_IN + ",";break;
+                default: break;
+            }
+        }
+        return new CellData(str);
+    }
+}
@@ -7,6 +7,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.util.Date;
+import java.util.List;
 /**
  * 异常报表请求
@@ -30,4 +31,5 @@ public class ReportErrorRequestVo {
      */
     @ApiModelProperty("结束时间")
     private String endTime;
+
 }
@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import java.util.List;
+
 /**
  * 接收前端查询vo
  *
@@ -12,6 +14,8 @@ import lombok.Data;
 @ApiModel("可视化大屏请求对象")
 @Data
 public class ReportViewRequestVo {
+
+    private List<String> ids;
     /**
      * 员工工号
      */
 package com.ruoyi.pojo.response;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,22 +15,29 @@ import java.util.Date;
  */
 @Data
 @ApiModel("异常报表对象")
-public class ReportErrorResponseVo {
+public class ReportErrorResponseVo {;
     @ApiModelProperty("异常类型")
+    @ExcelProperty(value = "异常类型")
     private String errorType;
     @ApiModelProperty("姓名")
+    @ExcelProperty(value = "姓名")
     private String name;
     @ApiModelProperty("工号")
+    @ExcelProperty(value = "工号")
     private String jobCode;
     @ApiModelProperty("图片")
+    @ExcelProperty(value = "图片")
     private String image;
     @ApiModelProperty("设备id")
+    @ExcelProperty(value = "设备id")
     private String deviceId;
     @ApiModelProperty("时间")
+    @ExcelProperty(value = "时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss" , timezone = "GMT+8")
     private Date createTime;
     @ApiModelProperty("备注")
+    @ExcelProperty(value = "备注")
     @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss" , timezone = "GMT+8")
     private String remark;
 package com.ruoyi.pojo.response;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.pojo.converter.AlcoholFlagConverter;
+import com.ruoyi.pojo.converter.SignInConvert;
+import com.ruoyi.pojo.converter.SignInStatusConverter;
+import com.ruoyi.pojo.converter.SignInTypeConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,35 +22,52 @@ import java.util.Date;
 public class ReportViewResponseVo {
     @ApiModelProperty("id")
     private Long id;
+
+    @ExcelProperty(value = "工号")
     @ApiModelProperty("工号")
     private String jobCode;
-    @ApiModelProperty("签到类型")
+
+    @ExcelProperty(value = "签到类型" ,converter = SignInTypeConverter.class)
+    @ApiModelProperty("签到类型" )
     private String singnIn;
+
+    @ExcelProperty(value = "姓名")
     @ApiModelProperty("姓名")
     private String name;
+
+    @ExcelProperty(value = "签到时间")
     @ApiModelProperty("签到时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
     private Date createTime;
+
+    @ExcelProperty(value = "签到状态",converter = SignInStatusConverter.class)
     @ApiModelProperty("签到状态1 成功2 异常")
     private Integer status;
     /**
      * 签到签退
      */
     @ApiModelProperty("签到签退")
+    @ExcelProperty(value = "签到签退",converter = SignInConvert.class)
     private Integer type;
     /**
      * 是否酒精检测 1 检查 2 未检
      */
     @ApiModelProperty("是否酒精检测 1 检查 2 未检")
+    @ExcelProperty(value = "酒精检测",converter = AlcoholFlagConverter.class)
     private Integer alcoholFlag;
     /**
      * 酒精含量
      */
+    @ExcelProperty(value = "酒精含量")
     @ApiModelProperty("酒精含量")
     private BigDecimal alcoholIntake;
+
+    @ExcelProperty(value = "头像")
     @ApiModelProperty("头像")
     private String image;
+
+    @ExcelProperty(value = "备注")
     @ApiModelProperty("备注")
     private String remark;
 }
@@ -91,13 +91,15 @@
     <select id="getNameByJobCode" resultMap="DriverResult">
         select personnel_name,job_code
             from driver
+
+        <if test="jobCodes != null and jobCodes.size() > 0">
         <where>
             job_code IN
             <foreach collection="jobCodes" item="item" open="(" separator="," close=")" >
                 #{item}
             </foreach>
-
         </where>
+        </if>
     </select>
     <select id="jobCodeIsEmpty" resultType="java.lang.Integer">
         select count(*)
@@ -75,6 +75,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <if test="name != '' and name != null">
             and driver.personnel_name = #{name}
         </if>
+        <if test="ids != null and ids.size() > 0">
+            and sign_in.id in
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+        </if>
         order by sign_in.create_time desc
     </select>
     <select id="getSignErrorList" resultType="com.ruoyi.in.domain.SignIn">
@@ -16,7 +16,30 @@
     </description>
     <dependencies>
-
+        <!-- easyexcel -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>2.2.6</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi-ooxml</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi-ooxml-schemas</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <!-- Spring框架基本的核心工具 -->
         <dependency>
             <groupId>org.springframework</groupId>
 package com.ruoyi.common.utils.poi;
-
+import com.alibaba.excel.EasyExcel;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -1742,4 +1742,36 @@ public class ExcelUtil&lt;T&gt;
         }
         return method;
     }
+
+
+
+    /**
+     * 对excel表单默认第一个索引名转换成list（EasyExcel）
+     *
+     * @param is 输入流
+     * @return 转换后集合
+     */
+    public List<T> importEasyExcel(InputStream is) throws Exception
+    {
+        return EasyExcel.read(is).head(clazz).sheet().doReadSync();
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单（EasyExcel）
+     *
+     * @param list 导出数据集合
+     * @param sheetName 工作表的名称
+     * @return 结果
+     */
+    public void exportEasyExcel(HttpServletResponse response, List<T> list, String sheetName)
+    {
+        try
+        {
+            EasyExcel.write(response.getOutputStream(), clazz).sheet(sheetName).doWrite(list);
+        }
+        catch (IOException e)
+        {
+            log.error("导出EasyExcel异常{}", e.getMessage());
+        }
+    }
 }