From dce06d7c00a9d617baa609b3f744f88a9789e754 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 08 十二月 2022 16:17:49 +0800
Subject: [PATCH] fix: 事件Api
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 5c1624b..4d17945 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,11 +1,13 @@
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;
@@ -31,6 +33,9 @@
@Resource
private CheckApiUtil checkApiUtil;
+ @Autowired
+ IBaseCaseService iBaseCaseService;
+
@ApiOperation(value = "鎵ф硶浜嬩欢缁熻")
@GetMapping("/statistics")
public CommonResult<Map<String, Object>> statistics(@Validated CockpitVO params) {
@@ -39,6 +44,7 @@
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);
@@ -136,18 +142,11 @@
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);
}
--
Gitblit v1.8.0