From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
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 d49fcf2..7229b90 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
@@ -17,6 +17,7 @@
import com.ycl.dto.casePool.IllegalBuildingParam;
import com.ycl.dto.casePool.VideoInspectParam;
import com.ycl.dto.casePool.ViolationParam;
+import com.ycl.dto.cockpitManage.DelayDO;
import com.ycl.entity.caseHandler.*;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.resources.ImageResources;
@@ -32,7 +33,9 @@
import com.ycl.service.caseHandler.IViolationsService;
import com.ycl.service.video.IVideoAlarmReportService;
import com.ycl.vo.casePool.*;
+import com.ycl.vo.cockpit.enforcementEvents.DelayVO;
import com.ycl.vo.cockpit.enforcementEvents.EventVO;
+import com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -40,7 +43,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.time.Duration;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -48,7 +53,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.function.Consumer;
/**
* <p>
@@ -418,7 +422,7 @@
HashMap<String, Object> map = new HashMap<>();
Long review = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getState, 1));
Long register = baseCaseMapper.selectRegisterCount();
- Long study = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getState, 3));
+ Long study = baseCaseMapper.selectStudyCount();
map.put("review", review);
map.put("register", register);
map.put("study", study);
@@ -474,4 +478,35 @@
public List<EventVO> selectEventList(String beginTime, String endTime) {
return baseCaseMapper.selectEventList(beginTime, endTime);
}
+
+ @Override
+ public List<VideoAndAreaVO> areaCount() {
+ List<VideoAndAreaVO> areaCountList = baseCaseMapper.areaCount();
+ Long allCount = baseCaseMapper.selectCount(new LambdaQueryWrapper<>());
+ areaCountList.stream().forEach(item -> item.setRatio(new BigDecimal(item.getCount() * 1.0 / allCount).setScale(2, BigDecimal.ROUND_HALF_UP)));
+ return areaCountList;
+ }
+
+ @Override
+ public List<DelayVO> selectDelayList() {
+ List<DelayDO> delayDOS = baseCaseMapper.selectDelayVOList();
+ ArrayList<DelayVO> delayVOS = new ArrayList<>();
+ delayDOS.stream().forEach(item->{
+ DelayVO delayVO = new DelayVO();
+ delayVO.setDescription(item.getDescription());
+ delayVO.setCode(item.getCode());
+ Duration between;
+ if (item.getEndTime()!=null){
+ between = Duration.between(item.getEndTime(), item.getLimitTime());
+ }else {
+ between = Duration.between(LocalDateTime.now(), item.getLimitTime());
+ }
+ if (between.isNegative()){
+ delayVO.setDuration(between.toMinutes());
+ delayVOS.add(delayVO);
+ }
+ });
+ return delayVOS;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0