修改导出

songhua-admin/src/main/java/com/songhua/web/controller/system/PzRawDataController.java

@@ -11,6 +11,7 @@ import com.songhua.system.domain.PzRawDataVo;
 import com.songhua.system.service.IPzRawDataService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
@@ -56,7 +57,6 @@ public class PzRawDataController extends BaseController {
 //        String message = pzRawDataService.importData(userList, updateSupport, operName);
 //        return success(message);
 //    }
-
     @Log(title = "原始数据导入", businessType = BusinessType.DELETE)
     @PostMapping("/importTicket")
     public DeferredResult<AjaxResult> importTicket(MultipartFile file) {
@@ -130,8 +130,8 @@ public class PzRawDataController extends BaseController {
      */
     @Log(title = "导出原始数据导入列表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public AjaxResult export(PzRawData pzRawData) {
-        pzRawDataService.export(pzRawData);
-        return AjaxResult.success();
+    public void export(HttpServletResponse response, PzRawData pzRawData) throws IOException {
+        pzRawDataService.export(response, pzRawData);
+//        return AjaxResult.success(pzRawDataService.export(response, pzRawData));
     }
 }

songhua-system/src/main/java/com/songhua/system/service/IPzRawDataService.java

@@ -2,8 +2,11 @@ package com.songhua.system.service;
 
 import com.songhua.system.domain.PzRawData;
 import com.songhua.system.domain.PzRawDataVo;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -70,7 +73,7 @@ public interface IPzRawDataService {
 
     Long checkIfDataExists(String ticketName);
 
-    void export(PzRawData pzRawData);
+    void export(HttpServletResponse response, PzRawData pzRawData) throws IOException;
 
     /**
      * 导入用户数据

songhua-system/src/main/java/com/songhua/system/service/impl/PzRawDataServiceImpl.java

@@ -2,6 +2,7 @@ package com.songhua.system.service.impl;
 
 import com.songhua.common.exception.ServiceException;
 import com.songhua.common.utils.DateUtils;
+import com.songhua.common.utils.poi.ExcelUtil;
 import com.songhua.system.domain.PzRawData;
 import com.songhua.system.domain.PzRawDataVo;
 import com.songhua.system.domain.vo.ShhTicketRulesReqVO;
@@ -19,16 +20,20 @@ import org.apache.poi.util.IOUtils;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.nio.file.Paths;
+import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -272,7 +277,8 @@ public class PzRawDataServiceImpl implements IPzRawDataService {
 
 
     @Override
-    public void export(PzRawData pzRawData) {
+    public void export(HttpServletResponse response, PzRawData pzRawData) throws IOException {
+        ExcelUtil<ShhTicketRulesReqVO> util = new ExcelUtil<ShhTicketRulesReqVO>(ShhTicketRulesReqVO.class);
         List<ShhTicketRulesReqVO> list = calculateTotalPrices(pzRawDataMapper.selectPzRawDataList(pzRawData));
         // 创建
         Workbook workbook = new XSSFWorkbook();
@@ -312,20 +318,14 @@ public class PzRawDataServiceImpl implements IPzRawDataService {
             dataCell2.setCellValue(String.valueOf(data.getAmount()));
             dataCell2.setCellStyle(style);
         }
-        // 写入
-        String desktopPath = Paths.get(System.getProperty("user.home"), "Desktop").toString();
-        try (FileOutputStream fileOut = new FileOutputStream(desktopPath + "\\销售汇总表统计" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xlsx")) {
-            workbook.write(fileOut);
-            log.info("Excel 文件已成功导出！");
-        } catch (IOException e) {
+        try {
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(sheet + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xlsx", "UTF-8"));
+            workbook.write(response.getOutputStream());
+            workbook.close();
+        } catch (
+                IOException e) {
             e.printStackTrace();
-        } finally {
-            try {
-                //关闭
-                workbook.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
         }
     }
 

songhua-ui/src/views/system/data/index.vue

@@ -24,48 +24,48 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['system:data:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['system:data:edit']"-->
-<!--        >修改</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['system:data:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['system:data:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['system:data:add']"-->
+      <!--        >新增</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="success"-->
+      <!--          plain-->
+      <!--          icon="el-icon-edit"-->
+      <!--          size="mini"-->
+      <!--          :disabled="single"-->
+      <!--          @click="handleUpdate"-->
+      <!--          v-hasPermi="['system:data:edit']"-->
+      <!--        >修改</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="danger"-->
+      <!--          plain-->
+      <!--          icon="el-icon-delete"-->
+      <!--          size="mini"-->
+      <!--          :disabled="multiple"-->
+      <!--          @click="handleDelete"-->
+      <!--          v-hasPermi="['system:data:remove']"-->
+      <!--        >删除</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="warning"-->
+      <!--          plain-->
+      <!--          icon="el-icon-download"-->
+      <!--          size="mini"-->
+      <!--          @click="handleExport"-->
+      <!--          v-hasPermi="['system:data:export']"-->
+      <!--        >导出</el-button>-->
+      <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:data:import']"
@@ -93,33 +93,33 @@
     </el-row>
 
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="票种名" align="center" prop="ticketName" />
-      <el-table-column label="张数" align="center" prop="number" />
-      <el-table-column label="金额" align="center" prop="money" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="票种名" align="center" prop="ticketName"/>
+      <el-table-column label="张数" align="center" prop="number"/>
+      <el-table-column label="金额" align="center" prop="money"/>
       <el-table-column label="支付类型" align="center" prop="payType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.pay_type" :value="scope.row.payType"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['system:data:edit']"-->
-<!--          >修改</el-button>-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['system:data:remove']"-->
-<!--          >删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-edit"-->
+      <!--            @click="handleUpdate(scope.row)"-->
+      <!--            v-hasPermi="['system:data:edit']"-->
+      <!--          >修改</el-button>-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-delete"-->
+      <!--            @click="handleDelete(scope.row)"-->
+      <!--            v-hasPermi="['system:data:remove']"-->
+      <!--          >删除</el-button>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -134,10 +134,10 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="张数" prop="number">
-          <el-input v-model="form.number" placeholder="请输入张数" />
+          <el-input v-model="form.number" placeholder="请输入张数"/>
         </el-form-item>
         <el-form-item label="金额" prop="money">
-          <el-input v-model="form.money" placeholder="请输入金额" />
+          <el-input v-model="form.money" placeholder="请输入金额"/>
         </el-form-item>
       </el-form>
       <el-form-item label="支付类型" prop="payType">
@@ -173,9 +173,9 @@
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div slot="tip" class="el-upload__tip text-center">
           <span>仅允许导入xls、xlsx格式文件。</span>
-<!--          <el-link :underline="false" style="font-size:12px;vertical-align: baseline;" type="primary"-->
-<!--                   @click="importTemplate">下载模板-->
-<!--          </el-link>-->
+          <!--          <el-link :underline="false" style="font-size:12px;vertical-align: baseline;" type="primary"-->
+          <!--                   @click="importTemplate">下载模板-->
+          <!--          </el-link>-->
         </div>
         <div v-if="upload.showProgressMessage" class="progress-message">
           <el-alert
@@ -196,7 +196,7 @@
 </template>
 
 <script>
-import { listData, getData, delData, addData, updateData } from "@/api/system/data";
+import {listData, getData, delData, addData, updateData} from "@/api/system/data";
 import {getToken} from "@/utils/auth";
 
 export default {
@@ -251,8 +251,7 @@ export default {
         url: process.env.VUE_APP_BASE_API + "/system/data/importTicket"
       },
       // 表单校验
-      rules: {
-      }
+      rules: {}
     };
   },
   created() {
@@ -299,7 +298,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -341,18 +340,34 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除原始数据导入编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除原始数据导入编号为"' + ids + '"的数据项？').then(function () {
         return delData(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/data/export', {
         ...this.queryParams
-      }, `data_${new Date().getTime()}.xlsx`)
+      }, `销售汇总表统计${this.getDatetimeValue()}.xlsx`)
+    },
+    // 获取当前时间
+    getDatetimeValue() {
+      // 获取当前时间
+      const now = new Date();
+      // 格式化时间
+      const year = now.getFullYear();
+      const month = now.getMonth() + 1;
+      const day = now.getDate();
+      const hour = now.getHours();
+      const minute = now.getMinutes();
+      const second = now.getSeconds();
+      const currentTime = `${year}${month >= 10 ? month : '0' + month}${day >= 10 ? day : '0' + day}${hour >= 10 ? hour : '0' + hour}${minute >= 10 ? minute : '0' + minute}${second >= 10 ? second : '0' + second}`;
+      // 将格式化后的时间存入 data 中
+      return currentTime;
     },
     /** 导入按钮操作 */
     handleImport() {