Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem

DELL

6 天以前 88abda34da2c7437c8191da83972279d18ff9418

 src/main/java/com/whyc/controller/ExportFileController.java

@@ -1,5 +1,6 @@
package com.whyc.controller;

import com.whyc.dto.Real.ExportTinfDataDto;
import com.whyc.dto.Statistic.MonStic;
import com.whyc.service.ExportService;
import io.swagger.annotations.Api;
@@ -9,6 +10,7 @@

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.ParseException;

@RestController
@@ -20,7 +22,13 @@

    @PostMapping("exportBattTinfStatistic")
    @ApiOperation(value = "单节数量统计导出（1.2.14）")
    public void exportBattTinfStatistic(HttpServletRequest req, HttpServletResponse resp ) throws ParseException {
        service.exportBattTinfStatistic(req,resp);
    public void exportBattTinfStatistic(HttpServletRequest req, HttpServletResponse resp ,@RequestBody MonStic stic) throws ParseException {
        service.exportBattTinfStatistic(req,resp,stic);
    }

    @PostMapping("exportTinfDataByTestRecordCount")
    @ApiOperation(value = "历史测试数据导出")
    public void exportTinfDataByTestRecordCount(HttpServletRequest req, HttpServletResponse resp ,@RequestBody ExportTinfDataDto dto) throws ParseException, IOException {
        service.exportTinfDataByTestRecordCount(req,resp,dto);
    }
}