From 306edc156e365af506552c4a070ada91deeacfb1 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 16 十二月 2022 12:01:17 +0800
Subject: [PATCH] fix: 预警研判案件确定不走上报接口

---
 ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java |   21 ++++++++++++---------
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java                     |    9 ++++++++-
 ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java                             |    2 ++
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
index 244ee39..c6df34a 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ycl.api.CommonResult;
+import com.ycl.controller.video.common.constant.BaseCaseStatus;
 import com.ycl.dto.trend.TrendAnalysisParam;
 import com.ycl.entity.caseHandler.BaseCase;
 import com.ycl.entity.caseHandler.Violations;
@@ -29,6 +30,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -55,15 +57,16 @@
     public CommonResult<Map<String, Object>> statistics(@Validated CockpitVO params) {
         checkApiUtil.cockpit(params);
         Map<String, Object> map = new HashMap<>();
-        EnforcementEventsVO.StatisticsEventVO eventVO = new EnforcementEventsVO.StatisticsEventVO();
-        eventVO.setCount(10);
-        eventVO.setRatio(new BigDecimal("0.69").setScale(2, RoundingMode.HALF_UP));
-        eventVO.setUp(true);
-        map.put("reported", eventVO);
-        map.put("disposition", eventVO);
-        map.put("dispositionInTime", eventVO);
-        map.put("register", eventVO);
-        return CommonResult.success(map);
+//        EnforcementEventsVO.StatisticsEventVO eventVO = new EnforcementEventsVO.StatisticsEventVO();
+//        eventVO.setCount(10);
+//        eventVO.setRatio(new BigDecimal("0.69").setScale(2, RoundingMode.HALF_UP));
+//        eventVO.setUp(true);
+//        iBaseCaseService.count();
+//        map.put("reported", eventVO);
+//        map.put("disposition", eventVO);
+//        map.put("dispositionInTime", eventVO);
+//        map.put("register", eventVO);
+        return CommonResult.success(iBaseCaseService.statistics());
     }
 
     @ApiOperation(value = "浜嬩欢绫诲瀷")
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
index bef1bc3..1256f76 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
@@ -86,4 +86,6 @@
     List<VideoAndAreaVO> areaCount();
 
     List<DelayVO> selectDelayList();
+
+    Map<String,Object> statistics();
 }
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index 7229b90..ff7582a 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -449,7 +449,8 @@
             iDispatchHandleService.dispatch(dispatchInfoParam);
         }
         if (violationParam.getState() == 2) {
-            baseCaseService.uploadEvent(violationParam.getBaseId());
+//            baseCaseService.uploadEvent(violationParam.getBaseId());
+            /// TODO: 2022/12/16 涓婃姤鎺ュ彛鏈疄鐜�
         }
         return violationsMapper.updateById(violations) == 1 ? true : false;
     }
@@ -509,4 +510,10 @@
         return delayVOS;
     }
 
+    @Override
+    public Map<String, Object> statistics() {
+        baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getState, BaseCaseStatus.REPORT));
+        return null;
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.8.0