From ce8304fba4049a99aacc408f7a2e63d1f328b80f Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 12 十二月 2022 09:58:09 +0800
Subject: [PATCH] fix: 实时视频接口
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java | 56 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 34 insertions(+), 22 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 343aa77..ebfe719 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
@@ -1,15 +1,19 @@
package com.ycl.controller.cockpit.enforcementEvents;
import com.ycl.api.CommonResult;
+import com.ycl.service.caseHandler.IBaseCaseService;
+import com.ycl.util.CheckApiUtil;
import com.ycl.vo.cockpit.CockpitVO;
import com.ycl.vo.cockpit.enforcementEvents.EnforcementEventsVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
@@ -26,23 +30,32 @@
@RestController
@RequestMapping("/api/event")
public class EnforcementEventsController {
+ @Resource
+ private CheckApiUtil checkApiUtil;
+
+ @Autowired
+ IBaseCaseService iBaseCaseService;
+
@ApiOperation(value = "鎵ф硶浜嬩欢缁熻")
@GetMapping("/statistics")
- public CommonResult<Map<String, Object>> statistics(@Validated CockpitVO.Params2VO params) {
+ 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("dispositionInTime", eventVO);
map.put("register", eventVO);
return CommonResult.success(map);
}
@ApiOperation(value = "浜嬩欢绫诲瀷")
@GetMapping("/type")
- public CommonResult<EnforcementEventsVO.TypeAndSourceVO> type(@Validated CockpitVO.Params2VO params) {
+ public CommonResult<EnforcementEventsVO.TypeAndSourceVO> type(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
List<EnforcementEventsVO.TypeAndSourceVO1> typeVO1s = new ArrayList<>();
EnforcementEventsVO.TypeAndSourceVO typeVO = new EnforcementEventsVO.TypeAndSourceVO();
EnforcementEventsVO.TypeAndSourceVO1 typeVO1 = null;
@@ -60,13 +73,15 @@
@ApiOperation(value = "瑙嗛鎶撴媿鍛婂彂鐐逛綅")
@GetMapping("/video")
- public CommonResult<List<EnforcementEventsVO.VideoAndAreaVO>> video(@Validated CockpitVO.Params2VO params) {
+ public CommonResult<List<EnforcementEventsVO.VideoAndAreaVO>> video(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
List<EnforcementEventsVO.VideoAndAreaVO> videoVOS = new ArrayList<>();
EnforcementEventsVO.VideoAndAreaVO videoVO = null;
for (int i = 0; i < 4; i++) {
videoVO = new EnforcementEventsVO.VideoAndAreaVO();
videoVO.setName("鍥㈢粨灞�");
videoVO.setCount(10);
+ videoVO.setRatio(new BigDecimal("0.65").setScale(2, RoundingMode.HALF_UP));
videoVOS.add(videoVO);
}
return CommonResult.success(videoVOS);
@@ -74,7 +89,8 @@
@ApiOperation(value = "浜嬩欢鏉ユ簮")
@GetMapping("/source")
- public CommonResult<EnforcementEventsVO.TypeAndSourceVO> source(@Validated CockpitVO.Params2VO params) {
+ public CommonResult<EnforcementEventsVO.TypeAndSourceVO> source(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
List<EnforcementEventsVO.TypeAndSourceVO1> typeVO1s = new ArrayList<>();
EnforcementEventsVO.TypeAndSourceVO typeVO = new EnforcementEventsVO.TypeAndSourceVO();
EnforcementEventsVO.TypeAndSourceVO1 typeVO1 = null;
@@ -92,7 +108,8 @@
@ApiOperation(value = "浜嬩欢鍖哄煙缁熻")
@GetMapping("/area")
- public CommonResult<List<EnforcementEventsVO.VideoAndAreaVO>> area(@Validated CockpitVO.Params2VO params) {
+ public CommonResult<List<EnforcementEventsVO.VideoAndAreaVO>> area(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
List<EnforcementEventsVO.VideoAndAreaVO> videoVOS = new ArrayList<>();
EnforcementEventsVO.VideoAndAreaVO videoVO = null;
for (int i = 0; i < 4; i++) {
@@ -106,7 +123,8 @@
@ApiOperation(value = "寤惰浜嬩欢")
@GetMapping("/delay")
- public CommonResult<List<EnforcementEventsVO.DelayVO>> delay(@Validated CockpitVO.Params2VO params) {
+ public CommonResult<List<EnforcementEventsVO.DelayVO>> delay(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
List<EnforcementEventsVO.DelayVO> delayVOS = new ArrayList<>();
EnforcementEventsVO.DelayVO delayVO = null;
for (int i = 0; i < 4; i++) {
@@ -121,21 +139,15 @@
@ApiOperation(value = "浜嬩欢淇℃伅")
@GetMapping("/info")
- public CommonResult<EnforcementEventsVO.InfoVO> info(@Validated CockpitVO.Params2VO params) {
+ public CommonResult<EnforcementEventsVO.InfoVO> info(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
EnforcementEventsVO.InfoVO infoVO = new EnforcementEventsVO.InfoVO();
- EnforcementEventsVO.EventVO eventVO = new EnforcementEventsVO.EventVO();
- infoVO.setToday(5);
- infoVO.setWeek(10);
- infoVO.setDispatch(20);
- infoVO.setIdentification(20);
- eventVO.setDescription("浜嬩欢鎻忚堪");
- eventVO.setAddress("浜嬪彂鍦板潃");
- eventVO.setAlarmTime("2022-10-15 16:12:13");
- eventVO.setPoint("1鍙风偣浣�");
- eventVO.setPicture("http://12.2.23.4/xx.png");
- eventVO.setSource("AI璇嗗埆");
- infoVO.setEvent(eventVO);
+ infoVO.setToday(iBaseCaseService.dayCount());
+ infoVO.setWeek(iBaseCaseService.weekCount());
+ infoVO.setDispatch(iBaseCaseService.dispatchCount());
+ infoVO.setIdentification(iBaseCaseService.alCount());
+ infoVO.setEvent(iBaseCaseService.selectEventList(params.getBeginTime(),params.getEndTime()));
return CommonResult.success(infoVO);
- }
-}
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0