From ddd9d82bcda5cb6e8be8f1dd142dbae2e07b25c3 Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期二, 13 十二月 2022 17:56:28 +0800 Subject: [PATCH] feat: 添加批量接口处理 --- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 105 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 5ed3ad7..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 @@ -11,9 +11,13 @@ import com.ycl.controller.video.common.constant.BaseCaseStatus; import com.ycl.controller.video.common.constant.StepName; import com.ycl.controller.video.common.util.DateUtil; +import com.ycl.controller.video.common.util.UtilNumber; +import com.ycl.dto.caseHandler.DispatchInfoParam; import com.ycl.dto.caseHandler.QueryForViolationParam; 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; @@ -25,9 +29,13 @@ import com.ycl.remote.dto.*; import com.ycl.remote.service.CityPlatformService; import com.ycl.service.caseHandler.IBaseCaseService; +import com.ycl.service.caseHandler.IDispatchHandleService; 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; @@ -35,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; @@ -58,6 +68,7 @@ private CityPlatformService cityPlatformService; private IViolationsService violationsService; private IVideoAlarmReportService videoAlarmReportService; + @Value("${fdfs.fileUrl}") private String fileUrl; @@ -106,9 +117,18 @@ @Resource PartyInfoMapper partyInfoMapper; + @Resource + UtilNumber utilNumber; + + @Resource + IDispatchHandleService iDispatchHandleService; + + @Resource + IBaseCaseService baseCaseService; + @Override - public String uploadEvent(Integer caseId) { + public String uploadEvent(Long caseId) { BaseCase baseCase = this.getById(caseId); Violations violations = violationsService.getById(caseId); String medias = ""; @@ -195,12 +215,11 @@ stepQuery.eq("name", stepName); WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQuery); - Integer state = 0; DisposeRecord disposeRecord = new DisposeRecord(); disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId()); disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId()); disposeRecord.setBaseCaseId(id); - disposeRecord.setState(state); + disposeRecord.setState(1); disposeRecord.setCreateTime(LocalDateTime.now()); AdminUserDetails userDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); disposeRecord.setCreateUser(userDetails.getUserId()); @@ -236,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<>(); @@ -376,8 +395,8 @@ } @Override - public List<BaseCase> selectPage(Page<BaseCase> page, String number, Integer communityId, Integer categories, String startTime, String endTime, String site) { - return baseCaseMapper.selectBaseCasePage(page, number, communityId, categories, startTime, endTime, site); + public Page<BaseCase> selectPage(Page<BaseCase> page, String number, Integer streetId, Integer categories, String startTime, String endTime, String site) { + return baseCaseMapper.selectBaseCasePage(page, number, streetId, categories, startTime, endTime, site); } @Override @@ -389,6 +408,11 @@ } @Override + public List<QueryForViolationVO> selectViolationList(QueryForViolationParam queryForViolationParam) { + return baseCaseMapper.selectViolationPage(queryForViolationParam); + } + + @Override public Page<BaseCaseVO> selectVideoInspection(Integer current) { return baseCaseMapper.selectVideoInspection(new Page<>(current, 1)); } @@ -397,20 +421,92 @@ 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.selectRegisterCount(); + Long study = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getState, 3)); map.put("review", review); + map.put("register", register); + map.put("study", study); return map; } @Override @Transactional(rollbackFor = Exception.class) - public Boolean updateCase(ViolationParam violationParam) { + public Boolean updateCase(VideoInspectParam violationParam) { BaseCase baseCase = new BaseCase(); BeanUtils.copyProperties(violationParam, baseCase); baseCase.setId(violationParam.getBaseId()); + baseCase.setCode(utilNumber.createCaseCode()); 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()); + DispatchInfoParam dispatchInfoParam = new DispatchInfoParam(); + BeanUtils.copyProperties(violationParam, dispatchInfoParam); + dispatchInfoParam.setBaseCaseId(violationParam.getBaseId()); + iDispatchHandleService.dispatch(dispatchInfoParam); + } + if (violationParam.getState() == 2) { + baseCaseService.uploadEvent(violationParam.getBaseId()); + } return violationsMapper.updateById(violations) == 1 ? true : false; } + + @Override + public Integer dayCount() { + return baseCaseMapper.dayCount(); + } + + @Override + public Integer weekCount() { + return baseCaseMapper.weekCount(); + } + + @Override + public Integer dispatchCount() { + return baseCaseMapper.dispatchCount(); + } + + @Override + public Integer alCount() { + return baseCaseMapper.alCount(); + } + + @Override + 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