From 3cf5e9483f60c94d29df1a79bc0c1ca910ca46ef Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 13 十二月 2022 14:58:24 +0800
Subject: [PATCH] fix: 执法事件对外接口
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 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 cc0a770..9acb354 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,8 +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.EnforcementEventsVO;
+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;
@@ -41,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;
@@ -251,8 +255,8 @@
if (baseCase.getCategory() == 1) {
Map mapV = new HashMap();
mapV.put("id", baseCase.getId());
- Violations violations = violationsMapper.selectCondMap(mapV);
- baseCase.setViolations(violations);
+ ViolationsVO violationsVO = violationsMapper.selectCondMap(mapV);
+ baseCase.setViolationsVO(violationsVO);
} else {
IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>();
@@ -417,11 +421,11 @@
public Map<String, Object> selectCount() {
HashMap<String, Object> map = new HashMap<>();
Long review = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getState, 1));
- Long register = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().in(BaseCase::getState, 2,6));
+ Long register = baseCaseMapper.selectRegisterCount();
Long study = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getState, 3));
map.put("review", review);
- map.put("register",register);
- map.put("study",study);
+ map.put("register", register);
+ map.put("study", study);
return map;
}
@@ -435,7 +439,7 @@
baseCaseMapper.updateById(baseCase);
Violations violations = new Violations();
BeanUtils.copyProperties(violationParam, violations);
- violations.setId(violations.getId());
+ violations.setId(violationParam.getBaseId());
if (violationParam.getState() == 6) {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
violationParam.setCreateUser(user.getUserId());
@@ -447,7 +451,7 @@
if (violationParam.getState() == 2) {
baseCaseService.uploadEvent(violationParam.getBaseId());
}
- return violationsMapper.insert(violations) == 1 ? true : false;
+ return violationsMapper.updateById(violations) == 1 ? true : false;
}
@Override
@@ -472,6 +476,37 @@
@Override
public List<EventVO> selectEventList(String beginTime, String endTime) {
- return baseCaseMapper.selectEventList(beginTime,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