From c68a46c7b29a7f5a21a76ea5e230cd140c2694d8 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 19 四月 2023 17:28:44 +0800
Subject: [PATCH] 获取图片将时间有效期参数过滤掉
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java | 76 ++++++++++++++++----------------------
1 files changed, 32 insertions(+), 44 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 012c29b..a8800de 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,12 +1,18 @@
package com.ycl.controller.cockpit.enforcementEvents;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.api.CommonResult;
+import com.ycl.dto.trend.TrendAnalysisParam;
import com.ycl.entity.caseHandler.BaseCase;
+import com.ycl.entity.caseHandler.Violations;
+import com.ycl.mapper.trend.TrendAnalysisMapper;
import com.ycl.service.caseHandler.IBaseCaseService;
+import com.ycl.service.caseHandler.IViolationsService;
import com.ycl.util.CheckApiUtil;
import com.ycl.vo.cockpit.CockpitVO;
import com.ycl.vo.cockpit.enforcementEvents.EnforcementEventsVO;
+import com.ycl.vo.cockpit.enforcementEvents.EventVO;
import com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,11 +24,10 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author Lyq
@@ -38,21 +43,16 @@
@Autowired
IBaseCaseService iBaseCaseService;
+ @Autowired
+ IViolationsService iViolationsService;
+ @Resource
+ TrendAnalysisMapper trendAnalysisMapper;
@ApiOperation(value = "鎵ф硶浜嬩欢缁熻")
@GetMapping("/statistics")
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);
+ return CommonResult.success(iBaseCaseService.statistics());
}
@ApiOperation(value = "浜嬩欢绫诲瀷")
@@ -60,24 +60,11 @@
public CommonResult type(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
EnforcementEventsVO.TypeAndSourceVO typeAndSourceVO = new EnforcementEventsVO.TypeAndSourceVO();
- Long allCount = iBaseCaseService.count();
- Long violationCount = iBaseCaseService.count(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getCategory, "1"));
- Long illegalBuildingCount = iBaseCaseService.count(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getCategory, "2"));
-
- ArrayList<VideoAndAreaVO> typeAndSourceVO1s = new ArrayList<>();
- VideoAndAreaVO violationVO1 = new VideoAndAreaVO();
- violationVO1.setName("杩濊");
- violationVO1.setCount(violationCount);
- violationVO1.setRatio(new BigDecimal(violationCount * 1.0 / allCount).setScale(2, BigDecimal.ROUND_HALF_UP));
- VideoAndAreaVO illegalBuildingVO1 = new VideoAndAreaVO();
- illegalBuildingVO1.setName("杩濆缓");
- illegalBuildingVO1.setCount(illegalBuildingCount);
- illegalBuildingVO1.setRatio(new BigDecimal(illegalBuildingCount * 1.0 / allCount).setScale(2, BigDecimal.ROUND_HALF_UP));
- typeAndSourceVO1s.add(violationVO1);
- typeAndSourceVO1s.add(illegalBuildingVO1);
- typeAndSourceVO.setRecords(typeAndSourceVO1s);
- typeAndSourceVO.setAll(allCount);
- System.out.println(illegalBuildingCount / allCount);
+ Long count = iViolationsService.count();
+ typeAndSourceVO.setAll(iViolationsService.count());
+ List<VideoAndAreaVO> videoAndAreaVOS = iViolationsService.selectType();
+ videoAndAreaVOS.stream().forEach(item -> item.setRatio(new BigDecimal(item.getCount() * 1.0 / count).setScale(4, BigDecimal.ROUND_HALF_UP)));
+ typeAndSourceVO.setRecords(videoAndAreaVOS);
return CommonResult.success(typeAndSourceVO);
}
@@ -85,16 +72,15 @@
@GetMapping("/video")
public CommonResult video(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
- List<VideoAndAreaVO> videoVOS = new ArrayList<>();
- VideoAndAreaVO videoVO = null;
- for (int i = 0; i < 4; i++) {
- videoVO = new VideoAndAreaVO();
- videoVO.setName("鍥㈢粨灞�");
- videoVO.setCount(10L);
- videoVO.setRatio(new BigDecimal("0.65").setScale(2, RoundingMode.HALF_UP));
- videoVOS.add(videoVO);
- }
- return CommonResult.success(videoVOS);
+ Long count = iViolationsService.count(new LambdaQueryWrapper<Violations>().isNotNull(Violations::getVideoPointId));
+ List<VideoAndAreaVO> collect = trendAnalysisMapper.selectTrendInfo(new TrendAnalysisParam()).stream().map(item -> {
+ VideoAndAreaVO videoAndAreaVO = new VideoAndAreaVO();
+ videoAndAreaVO.setName(item.getName());
+ videoAndAreaVO.setCount(item.getCount());
+ videoAndAreaVO.setRatio(new BigDecimal(item.getCount() * 1.0 / count).setScale(4, BigDecimal.ROUND_HALF_UP));
+ return videoAndAreaVO;
+ }).collect(Collectors.toList());
+ return CommonResult.success(collect);
}
@ApiOperation(value = "浜嬩欢鏉ユ簮")
@@ -108,12 +94,12 @@
EnforcementEventsVO.TypeAndSourceVO typeVO = new EnforcementEventsVO.TypeAndSourceVO();
VideoAndAreaVO al = new VideoAndAreaVO();
al.setName("瑙嗛宸℃煡");
- al.setRatio(new BigDecimal(alCount * 1.0 / allCount).setScale(2, BigDecimal.ROUND_HALF_UP));
+ al.setRatio(new BigDecimal(alCount * 1.0 / allCount).setScale(4, BigDecimal.ROUND_HALF_UP));
al.setCount(alCount);
typeVO1s.add(al);
VideoAndAreaVO hand = new VideoAndAreaVO();
- hand.setName("浜哄伐涓婃姤");
- hand.setRatio(new BigDecimal(handCount * 1.0 / allCount).setScale(2, BigDecimal.ROUND_HALF_UP));
+ hand.setName("缃戞牸宸℃煡");
+ hand.setRatio(new BigDecimal(handCount * 1.0 / allCount).setScale(4, BigDecimal.ROUND_HALF_UP));
hand.setCount(handCount);
typeVO1s.add(hand);
typeVO.setAll(allCount);
@@ -144,7 +130,9 @@
infoVO.setWeek(iBaseCaseService.weekCount());
infoVO.setDispatch(iBaseCaseService.dispatchCount());
infoVO.setIdentification(iBaseCaseService.alCount());
- infoVO.setEvent(iBaseCaseService.selectEventList(params.getBeginTime(), params.getEndTime()));
+ IPage<EventVO> page = iBaseCaseService.selectEventList(params.getBeginTime(), params.getEndTime(),params.getPageIndex(),params.getPageSize());
+ infoVO.setEvent(page.getRecords());
+ infoVO.setTotal(page.getTotal());
return CommonResult.success(infoVO);
}
}
\ No newline at end of file
--
Gitblit v1.8.0