From fd071f321fb967f36cf795fc40b4f2e87e89e69d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 12 十二月 2022 22:38:24 +0800
Subject: [PATCH] 预警研判

---
 ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index 471cbb8..875717f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -11,6 +11,7 @@
 import com.ycl.controller.BaseController;
 import com.ycl.dto.caseHandler.QueryForViolationParam;
 import com.ycl.dto.casePool.IllegalBuildingParam;
+import com.ycl.dto.casePool.VideoInspectParam;
 import com.ycl.dto.casePool.ViolationParam;
 import com.ycl.entity.caseHandler.BaseCase;
 import com.ycl.entity.caseHandler.BaseCaseDetail;
@@ -71,7 +72,7 @@
 
     @ApiOperation(value = "涓婁紶甯傚钩鍙�")
     @PostMapping("/upload-event")
-    public CommonResult uploadEvent(@RequestParam Integer caseId, CommonResult<Object> success) {
+    public CommonResult uploadEvent(@RequestParam Long caseId, CommonResult<Object> success) {
         String msg = baseCaseService.uploadEvent(caseId);
         if (StringUtils.isEmpty(msg)) {
             return success;
@@ -98,16 +99,13 @@
                                         @RequestParam(required = false) Integer type,
                                         @RequestParam(required = false) Integer resource) {
         if (state != null) {
-            Page<Object> page = new Page<>();
-            page.setCurrent(current);
-            page.setSize(size);
             Page<Object> queryList;
             Integer violation = 1;
             Integer illegalBuilding = 2;
             if (type == violation) {
-                queryList = baseCaseService.listViolationsPage(page, state, resource);
+                queryList = baseCaseService.listViolationsPage(new Page<>().setCurrent(current).setSize(size), state, resource);
             } else if (type == illegalBuilding) {
-                queryList = baseCaseService.listIllegalBuilding(page, state, resource);
+                queryList = baseCaseService.listIllegalBuilding(new Page<>().setCurrent(current).setSize(size), state, resource);
             } else {
                 return CommonResult.failed("bad request url");
             }
@@ -297,7 +295,7 @@
     @ApiOperation("杩濊妫�绱�-瀵煎嚭")
     public void queryForViolationExport(HttpServletResponse response, QueryForViolationParam queryForViolationParam) {
         String sheetName = "杩濊鏁版嵁";
-        EasyExcelUtils.export(response, sheetName, QueryForViolationVO.class, baseCaseService.selectViolation(queryForViolationParam).getRecords());
+        EasyExcelUtils.export(response, sheetName, QueryForViolationVO.class, baseCaseService.selectViolationList(queryForViolationParam));
     }
 
     @GetMapping("/video_inspection")
@@ -314,8 +312,7 @@
 
     @PutMapping("/video_inspection")
     @ApiOperation("棰勮鐮斿垽纭畾")
-    public CommonResult searchCount(ViolationParam violationParam){
+    public CommonResult searchCount(@RequestBody VideoInspectParam violationParam){
         return  CommonResult.success(baseCaseService.updateCase(violationParam));
     }
-
 }
\ No newline at end of file

--
Gitblit v1.8.0