* 新需求

src/main/java/com/huiju/estateagents/controller/TaQrcodeController.java

@@ -1,17 +1,13 @@
 package com.huiju.estateagents.controller;
 
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaQrcode;
-import com.huiju.estateagents.excel.ActivityStatistics.VisitPersonNum;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaQrcodeService;
-import org.apache.poi.sl.usermodel.Sheet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,8 +16,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.OutputStream;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -208,7 +205,7 @@ public class TaQrcodeController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/admin/getStatisticRecord", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/qrCode/getStatisticRecord", method = RequestMethod.GET)
     public ResponseBean getStatisticRecord(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                            Integer qrCodeId, Integer type, HttpServletRequest request) {
@@ -222,18 +219,20 @@ public class TaQrcodeController extends BaseController {
         return responseBean;
     }
 
-    @RequestMapping(value = "/admin/getStatisticRecordExport", method = RequestMethod.GET)
-    public void getStatisticRecordExport(Integer qrCodeId, Integer type, HttpServletRequest request, HttpServletResponse response) {
+    @RequestMapping(value = "/admin/qrCode/getStatisticRecordExport", method = RequestMethod.GET)
+    public void getStatisticRecordExport(@RequestParam(value = "qrCodeId") Integer qrCodeId,
+                                         @RequestParam(value = "type") Integer type, HttpServletRequest request, HttpServletResponse response) throws IOException {
         try {
             iTaQrcodeService.getStatisticRecordExport(type, qrCodeId, getOrgId(request), response);
         } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                response.getOutputStream().close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+            logger.error("getStatisticRecordExport 异常：", e);
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            Map<String, Object> map = new HashMap();
+            map.put("code", ResponseBean.ERROR_UNAVAILABLE);
+            map.put("message", "下载文件失败" + e.getMessage());
+            response.getWriter().println(JSON.toJSONString(map));
         }
     }
 

src/main/java/com/huiju/estateagents/service/impl/TaQrcodeServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -189,22 +190,26 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
 
     @Override
     public void getStatisticRecordExport(Integer type, Integer qrCodeId, Integer orgId, HttpServletResponse response) throws IOException {
-        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
+        String fileName;
         switch (type) {
             case 1:
-                List<QrCodeVisitPersonNum> records = taQrcodeMapper.getVisitPersonsRecordExport(qrCodeId,orgId);
-                response.setHeader("Content-disposition", "attachment;filename=访问人数.xlsx");
+                List<QrCodeVisitPersonNum> records = taQrcodeMapper.getVisitPersonsRecordExport(qrCodeId, orgId);
+                fileName = URLEncoder.encode("访问人数", "UTF-8");
+                response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
                 EasyExcel.write(response.getOutputStream(), QrCodeVisitPersonNum.class).sheet("访问人数").doWrite(records);
                 break;
             case 2:
                 List<QrCodeVisitNum> records2 = taQrcodeMapper.getVisitNumRecordExport(qrCodeId, orgId);
-                response.setHeader("Content-disposition", "attachment;filename=访问次数.xlsx");
+                fileName = URLEncoder.encode("访问次数", "UTF-8");
+                response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
                 EasyExcel.write(response.getOutputStream(), QrCodeVisitNum.class).sheet("访问次数").doWrite(records2);
                 break;
             case 3:
                 List<QrCodeNewPersonNum> records3 = taQrcodeMapper.getNewPersonsRecordExport(qrCodeId, orgId);
-                response.setHeader("Content-disposition", "attachment;filename=新增注册用户.xlsx");
+                fileName = URLEncoder.encode("新增注册用户", "UTF-8");
+                response.setHeader("Content-disposition", "attachment;filename="+fileName+".xlsx");
                 EasyExcel.write(response.getOutputStream(), QrCodeNewPersonNum.class).sheet("新增注册用户").doWrite(records3);
                 break;
             default:

src/main/resources/mapper/TaQrcodeMapper.xml

@@ -113,7 +113,7 @@
             AND t.qrcode_id = #{qrCodeId}
     </select>
 
-    <select id="getVisitPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum">
+    <select id="getVisitNumRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum">
         SELECT
             IFNULL( t2.`name`, t2.nickname ) nickName,
             t2.tel phone,
@@ -147,7 +147,7 @@
     <select id="getNewPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum">
         SELECT
             t2.`name` nickName,
-            t2.tel phone,
+            t2.phone,
             t2.sex gender,
             t2.city province,
             t.create_date registerTime