Commit 11c91ca0 authored by suhuiguang's avatar suhuiguang

1.实现类复制错误

parent 3baf70fc
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.equipmanage.common.dto.AnalysisReportLogDto; import com.yeejoin.equipmanage.common.dto.AnalysisReportLogDto;
import com.yeejoin.equipmanage.service.IFireAutoSysManageReportService;
import com.yeejoin.equipmanage.service.IFirePatrolReportService; import com.yeejoin.equipmanage.service.IFirePatrolReportService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -33,7 +34,7 @@ import java.util.Date; ...@@ -33,7 +34,7 @@ import java.util.Date;
public class FireAutoSysManageReportController extends BaseController { public class FireAutoSysManageReportController extends BaseController {
@Autowired @Autowired
IFirePatrolReportService iFirePatrolReportService; IFireAutoSysManageReportService iFireAutoSysManageReportService;
@ApiOperation(value = "下载报表", notes = "下载报表") @ApiOperation(value = "下载报表", notes = "下载报表")
@GetMapping(value = "/download") @GetMapping(value = "/download")
...@@ -42,7 +43,7 @@ public class FireAutoSysManageReportController extends BaseController { ...@@ -42,7 +43,7 @@ public class FireAutoSysManageReportController extends BaseController {
@ApiParam(value = "换流站编码", required = true) @RequestParam String stationCode, @ApiParam(value = "换流站编码", required = true) @RequestParam String stationCode,
@ApiParam(value = "开始日期", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, @ApiParam(value = "开始日期", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
@ApiParam(value = "结束日期", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) { @ApiParam(value = "结束日期", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) {
iFirePatrolReportService.download(request, response, stationCode, startDate, endDate); iFireAutoSysManageReportService.download(request, response, stationCode, startDate, endDate);
} }
@ApiOperation(value = "预览报表", notes = "预览报表") @ApiOperation(value = "预览报表", notes = "预览报表")
...@@ -52,7 +53,7 @@ public class FireAutoSysManageReportController extends BaseController { ...@@ -52,7 +53,7 @@ public class FireAutoSysManageReportController extends BaseController {
@ApiParam(value = "换流站编码", required = true) @RequestParam String stationCode, @ApiParam(value = "换流站编码", required = true) @RequestParam String stationCode,
@ApiParam(value = "开始日期", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, @ApiParam(value = "开始日期", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
@ApiParam(value = "结束日期", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) { @ApiParam(value = "结束日期", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) {
return iFirePatrolReportService.preview(stationCode, startDate, endDate); return iFireAutoSysManageReportService.preview(stationCode, startDate, endDate);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
...@@ -63,7 +64,7 @@ public class FireAutoSysManageReportController extends BaseController { ...@@ -63,7 +64,7 @@ public class FireAutoSysManageReportController extends BaseController {
@ApiParam(value = "开始日期") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, @ApiParam(value = "开始日期") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
@ApiParam(value = "结束日期") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate, @ApiParam(value = "结束日期") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate,
@ApiParam(value = "换流站编码") @RequestParam(required = false) String stationCode) { @ApiParam(value = "换流站编码") @RequestParam(required = false) String stationCode) {
return iFirePatrolReportService.allPage(page, reportType, startDate, endDate, stationCode); return iFireAutoSysManageReportService.allPage(page, reportType, startDate, endDate, stationCode);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment