From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +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 |   43 +++++++++++++++----------------------------
 1 files changed, 15 insertions(+), 28 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..3d60970 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,11 +72,11 @@
 
     @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")
+    @PostMapping("/download")
     @ApiOperation("瀵煎嚭")
     @SneakyThrows
     public void downloadExcel(@RequestParam(required = false) String startTime,
@@ -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