From 3f9ebf19e687c33287b0eaec64d4564a212f57db Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 12 十月 2022 16:59:57 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java | 41 ++++++++++++++---------------------------
1 files changed, 14 insertions(+), 27 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java b/ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java
index 2c8763c..cd11cac 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java
@@ -4,10 +4,11 @@
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import com.ycl.entity.platform.zf.VideowarmEventsreport;
-import com.ycl.service.platform.zf.IVideowarmEventsreportService;
+import com.ycl.entity.zf.VideoWarnEventsReport;
+import com.ycl.service.zf.IVideowarmEventsreportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
@@ -18,7 +19,6 @@
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.stream.Collectors;
/**
* <p>
@@ -47,34 +47,21 @@
@RequestParam(required = false) Integer current,
@RequestParam(required = false) Integer size
) {
- QueryWrapper<VideowarmEventsreport> videowarmEventsreportQueryWrapper = new QueryWrapper<>();
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
- videowarmEventsreportQueryWrapper.between("cTime", startTime, endTime);
- }
- if (StringUtils.isNotBlank(eventName)) {
- videowarmEventsreportQueryWrapper.eq("eventName", eventName);
- }
- if (StringUtils.isNotBlank(eventType)) {
- videowarmEventsreportQueryWrapper.eq("eventType", eventType);
- }
- if (StringUtils.isNotBlank(eventLocation)) {
- videowarmEventsreportQueryWrapper.eq("eventLocation", eventLocation);
- }
- if (StringUtils.isNotBlank(eventRegion)) {
- videowarmEventsreportQueryWrapper.eq("eventRegion", eventRegion);
- }
- return CommonResult.success(iVideowarmEventsreportService.list(videowarmEventsreportQueryWrapper).stream().skip((current-1)*size).limit(size).collect(Collectors.toList()));
+ Page<VideoWarnEventsReport> page = new Page<>();
+ page.setCurrent(current);
+ page.setSize(size);
+ return CommonResult.success(iVideowarmEventsreportService.selectPageVo(page,startTime,endTime,eventName,eventType,eventLocation,eventRegion));
}
@GetMapping("/search/one")
@ApiOperation("鏌ヨ杩濊鎯呭喌璇︽儏")
public CommonResult getOne(@RequestParam Integer id) {
- return CommonResult.success(iVideowarmEventsreportService.getOne(new QueryWrapper<VideowarmEventsreport>().eq("id", id)));
+ return CommonResult.success(iVideowarmEventsreportService.getOne(new QueryWrapper<VideoWarnEventsReport>().eq("id", id)));
}
@PostMapping("/add")
@ApiOperation("娣诲姞杩濊鎯呭喌璇︽儏")
- public CommonResult add(@RequestBody VideowarmEventsreport videowarmEventsreport) {
- return CommonResult.success(iVideowarmEventsreportService.save(videowarmEventsreport));
+ public CommonResult add(@RequestBody VideoWarnEventsReport videoWarnEventsReport) {
+ return CommonResult.success(iVideowarmEventsreportService.save(videoWarnEventsReport));
}
@DeleteMapping("/delete")
@@ -85,8 +72,8 @@
@PutMapping("/update")
@ApiOperation("淇敼杩濊鎯呭喌璇︽儏")
- public CommonResult modify(@RequestBody VideowarmEventsreport videowarmEventsreport) {
- return CommonResult.success(iVideowarmEventsreportService.updateById(videowarmEventsreport));
+ public CommonResult modify(@RequestBody VideoWarnEventsReport videoWarnEventsReport) {
+ return CommonResult.success(iVideowarmEventsreportService.updateById(videoWarnEventsReport));
}
@GetMapping("/download")
@@ -99,7 +86,7 @@
@RequestParam(required = false) String eventLocation,
@RequestParam(required = false) String eventRegion,
HttpServletResponse response) {
- QueryWrapper<VideowarmEventsreport> VideowarmEventsreportQueryWrapper = new QueryWrapper<>();
+ QueryWrapper<VideoWarnEventsReport> VideowarmEventsreportQueryWrapper = new QueryWrapper<>();
if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
VideowarmEventsreportQueryWrapper.between("cTime", startTime, endTime);
}
@@ -118,6 +105,6 @@
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + URLEncoder.encode("杩濊鎯呭喌" + ".xlsx", "utf-8"));
- EasyExcel.write(response.getOutputStream(), VideowarmEventsreport.class).sheet("鍒楄〃").doWrite(iVideowarmEventsreportService.list(VideowarmEventsreportQueryWrapper));
+ EasyExcel.write(response.getOutputStream(), VideoWarnEventsReport.class).sheet("鍒楄〃").doWrite(iVideowarmEventsreportService.list(VideowarmEventsreportQueryWrapper));
}
}
\ No newline at end of file
--
Gitblit v1.8.0