From a4047b6048ebfe09e66a765b58ea12b5bd0e2e6e Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期一, 28 十一月 2022 16:18:10 +0800 Subject: [PATCH] 店铺管理优化 --- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 357 ++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 291 insertions(+), 66 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 a4b3cd8..5ed3ad7 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 @@ -1,37 +1,48 @@ package com.ycl.service.caseHandler.impl; +import com.alibaba.druid.util.StringUtils; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ycl.bo.casePool.CasePoolIllegalBuildingDO; -import com.ycl.bo.casePool.CasePoolViolationDO; +import com.ycl.bo.AdminUserDetails; +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.dto.caseHandler.QueryForViolationParam; import com.ycl.dto.casePool.IllegalBuildingParam; import com.ycl.dto.casePool.ViolationParam; -import com.ycl.entity.caseHandler.BaseCase; -import com.ycl.entity.caseHandler.IllegalBuilding; -import com.ycl.entity.caseHandler.Violations; +import com.ycl.entity.caseHandler.*; +import com.ycl.entity.dict.DataDictionary; +import com.ycl.entity.resources.ImageResources; import com.ycl.entity.video.VideoAlarmReport; -import com.ycl.mapper.caseHandler.BaseCaseMapper; -import com.ycl.mapper.caseHandler.IllegalBuildingMapper; -import com.ycl.mapper.caseHandler.ViolationsMapper; +import com.ycl.exception.ApiException; +import com.ycl.mapper.caseHandler.*; import com.ycl.mapper.dict.DataDictionaryMapper; +import com.ycl.mapper.resources.ImageResourcesMapper; import com.ycl.remote.dto.*; import com.ycl.remote.service.CityPlatformService; import com.ycl.service.caseHandler.IBaseCaseService; import com.ycl.service.caseHandler.IViolationsService; import com.ycl.service.video.IVideoAlarmReportService; -import com.ycl.vo.casePool.CasePoolIllegalBuildingVO; -import com.ycl.vo.casePool.CasePoolViolationVO; +import com.ycl.vo.casePool.*; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.time.Instant; +import java.time.Duration; import java.time.LocalDateTime; -import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.stream.Collectors; +import java.util.Map; /** * <p> @@ -75,6 +86,27 @@ @Resource IllegalBuildingMapper illegalBuildingMapper; + @Resource + ArrivalSituationMapper arrivalSituationMapper; + @Resource + InvestigationMapper investigationMapper; + @Resource + WritMapper writMapper; + @Resource + DisposeRecordMapper disposeRecordMapper; + + @Resource + WorkflowConfigStepMapper workflowConfigStepMapper; + @Resource + WorkflowConfigMapper workflowConfigMapper; + @Resource + ImageResourcesMapper imageResourcesMapper; + @Resource + DispatchInfoMapper dispatchInfoMapper; + @Resource + PartyInfoMapper partyInfoMapper; + + @Override public String uploadEvent(Integer caseId) { BaseCase baseCase = this.getById(caseId); @@ -89,11 +121,11 @@ medias = stringBuilder.toString(); } } - EventAddParamDto dto = EventAddParamDto.builder().y84(baseCase.getLatitude().toString()).x84(baseCase.getLongitude().toString()) - .source(11).address(baseCase.getSite()).eventDesc(eventDesc).eventSign(baseCase.getCode()).medias(medias).build(); - ResultResponseDto<EventAddResponseDto> result = cityPlatformService.addEvent(dto); + EventAddParamDto dto = EventAddParamDto.builder().y84(baseCase.getLatitude() != null ? baseCase.getLatitude().toString() : "").x84(baseCase.getLongitude() != null ? baseCase.getLongitude().toString() : "").source(11).address(baseCase.getSite()).eventDesc(eventDesc).eventSign(baseCase.getCode()).medias(medias).build(); + String msg = cityPlatformService.addEvent(dto); + ResultResponseDto result = JSONObject.parseObject(msg, ResultResponseDto.class); if (result.getCode() == 0) { - EventAddResponseDto responseDto = result.getResult(); + EventAddResponseDto responseDto = JSONObject.parseObject(result.getResult(), EventAddResponseDto.class); baseCase.setTaskCode(responseDto.getTaskcode()); this.updateById(baseCase); return null; @@ -106,9 +138,10 @@ public String processEvent(Integer caseId) { BaseCase baseCase = this.getById(caseId); EventProcessParamDto paramDto = EventProcessParamDto.builder().eventSign(baseCase.getCode()).taskcode(baseCase.getTaskCode()).build(); - ResultResponseDto<EventProcessResponseDto> responseDto = cityPlatformService.getEventProcess(paramDto); + String msg = cityPlatformService.getEventProcess(paramDto); + ResultResponseDto responseDto = JSONObject.parseObject(msg, ResultResponseDto.class); if (responseDto.getCode() == 0) { - EventProcessResponseDto eventProcessResponseDto = responseDto.getResult(); + EventProcessResponseDto eventProcessResponseDto = JSONObject.parseObject(responseDto.getResult(), EventProcessResponseDto.class); /*********** 鏈鐞嗗競骞冲彴杩斿洖鏁版嵁 ***************/ return null; } else { @@ -119,73 +152,265 @@ @Override public Page listViolationsPage(Page page, Integer state, Integer resource) { Integer type = 01; - Page<CasePoolViolationDO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource); - List<CasePoolViolationVO> violationVOList = violationsPage.getRecords().stream().map(item -> { - CasePoolViolationVO casePoolViolationVO = new CasePoolViolationVO(); - BeanUtils.copyProperties(item, casePoolViolationVO); + Integer hours = 60; + Integer day = 24; + Page<CasePoolViolationVO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource); + violationsPage.getRecords().stream().forEach(item -> { if (item.getCloseTime() == null) { - long nowTime = System.currentTimeMillis(); - long alarmTime = item.getAlarmTime().toEpochSecond(ZoneOffset.ofHours(8)); - LocalDateTime continueTimes = Instant.ofEpochMilli(nowTime - alarmTime).atZone(ZoneOffset.ofHours(8)).toLocalDateTime(); - String continueTime = continueTimes.getHour() + "鏃�" + continueTimes.getSecond() + "鍒嗛挓"; - casePoolViolationVO.setContinueTime(continueTime); + Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now()); + long continueHours = duration.toHours() - (duration.toDays() * day); + long minutes = duration.toMinutes() - (duration.toHours() * hours); + String continueTime = duration.toDays() + "澶�" + continueHours + "鏃�" + minutes + "鍒嗛挓"; + item.setContinueTime(continueTime); } else { - long closeTime = item.getCloseTime().toEpochSecond(ZoneOffset.ofHours(8)); - long alarmTime = item.getAlarmTime().toEpochSecond(ZoneOffset.ofHours(8)); - LocalDateTime continueTimes = Instant.ofEpochMilli(closeTime - alarmTime).atZone(ZoneOffset.ofHours(8)).toLocalDateTime(); - String continueTime = continueTimes.getHour() + "鏃�" + continueTimes.getSecond() + "鍒嗛挓"; - casePoolViolationVO.setContinueTime(continueTime); + Duration duration = Duration.between(item.getAlarmTime(), item.getCloseTime()); + long continueHours = duration.toHours() - (duration.toDays() * day); + long minutes = duration.toMinutes() - (duration.toHours() * hours); + String continueTime = duration.toDays() + "澶�" + continueHours + "鏃�" + minutes + "鍒嗛挓"; + item.setContinueTime(continueTime); } - casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName()); - casePoolViolationVO.setType(dataDictionaryMapper.selectById(item.getTypeId()).getName()); - return casePoolViolationVO; - }).collect(Collectors.toList()); - Page<CasePoolViolationVO> casePoolViolationVOPage = new Page<>(); - BeanUtils.copyProperties(violationsPage, casePoolViolationVOPage); - casePoolViolationVOPage.setRecords(violationVOList); - return casePoolViolationVOPage; + }); + return violationsPage; } @Override public Page listIllegalBuilding(Page page, Integer state, Integer resource) { Integer type = 02; - Page<CasePoolIllegalBuildingDO> casePoolIllegalBuildingDTOPage = baseCaseMapper.listIllegalBuildingsPage(page, state, type, resource); - List<CasePoolIllegalBuildingVO> casePoolIllegalBuildingVOList = casePoolIllegalBuildingDTOPage - .getRecords() - .stream() - .map( - item -> { - CasePoolIllegalBuildingVO casePoolIllegalBuildingVO = new CasePoolIllegalBuildingVO(); - BeanUtils.copyProperties(item, casePoolIllegalBuildingVO); - casePoolIllegalBuildingVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName()); - return casePoolIllegalBuildingVO; - } - ).collect(Collectors.toList()); - Page<CasePoolIllegalBuildingVO> casePoolViolationVOPage = new Page<>(); - BeanUtils.copyProperties(casePoolIllegalBuildingDTOPage, casePoolViolationVOPage); - casePoolViolationVOPage.setRecords(casePoolIllegalBuildingVOList); - return casePoolViolationVOPage; + return baseCaseMapper.listIllegalBuildingsPage(page, state, type, resource); } @Override - public Boolean saveViolationCase(ViolationParam violationParam, Integer id) { - BaseCase baseCase = new BaseCase(); + public Boolean saveViolationCase(ViolationParam violationParam, Long id) { Violations violations = new Violations(); - BeanUtils.copyProperties(violationParam, baseCase); BeanUtils.copyProperties(violationParam, violations); - violations.setId(id); Integer value = 1; + violations.setId(id); + setDisposeRecord(id, violationParam.getLimitTime()); return violationsMapper.insert(violations) == value ? true : false; } + private void setDisposeRecord(Long id, String limitTime) { + String stepName = StepName.DISPATCH.getName(); + QueryWrapper<WorkflowConfigStep> stepQuery = new QueryWrapper<>(); + 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.setCreateTime(LocalDateTime.now()); + AdminUserDetails userDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + disposeRecord.setCreateUser(userDetails.getUserId()); + disposeRecord.setStartTime(LocalDateTime.now()); + disposeRecord.setStepName(stepName); + if (!StringUtils.isEmpty(limitTime)) { + disposeRecord.setLimitTime(LocalDateTime.parse(limitTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + } + disposeRecordMapper.insert(disposeRecord); + } + @Override - public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Integer id) { - BaseCase baseCase = new BaseCase(); + public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Long id) { IllegalBuilding illegalBuilding = new IllegalBuilding(); - BeanUtils.copyProperties(illegalBuilding, baseCase); - BeanUtils.copyProperties(illegalBuilding, illegalBuildingParam); - illegalBuilding.setBaseCaseId(id); + BeanUtils.copyProperties(illegalBuildingParam, illegalBuilding); + setDisposeRecord(id, illegalBuildingParam.getLimitTime()); Integer value = 1; + illegalBuilding.setBaseCaseId(id); return illegalBuildingMapper.insert(illegalBuilding) == value ? true : false; } + + @Override + public BaseCaseDetail baseCaseDetail(String code) { + BaseCaseDetail bcd = new BaseCaseDetail(); + //1.鏌ヨ妗堜欢鍩烘湰淇℃伅 + Map map = new HashMap(); + map.put("code", code); + BaseCase baseCase = baseCaseMapper.selectCondMap(map); + if (baseCase == null) { + return null; + } + //鏌ヨ妗堜欢杩濊淇℃伅 + if (baseCase.getCategory() == 1) { + Map mapV = new HashMap(); + mapV.put("id", baseCase.getId()); + Violations violations = violationsMapper.selectCondMap(mapV); + baseCase.setViolations(violations); + } else { + IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId()); + LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>(); + dict.eq(DataDictionary::getId, illegalBuilding.getCategoryId()); + DataDictionary dictionary = dataDictionaryMapper.selectOne(dict); + if (dictionary != null) { + illegalBuilding.setCategoryText(dictionary.getName()); + } + baseCase.setIllegalBuilding(illegalBuilding); + } + //鑾峰彇璋冨害淇℃伅 + Map mapD = new HashMap(); + mapD.put("baseCaseId", baseCase.getId()); + DispatchInfo dispatchInfo = dispatchInfoMapper.selectCondMap(mapD); + baseCase.setDispatchInfo(dispatchInfo); + bcd.setBaseCase(baseCase); + //妗堜欢鐩稿叧淇℃伅 + //2.鏌ヨ鍔炵悊缁忚繃淇℃伅 + //2.1鏌ヨ澶勭疆娴佺▼閰嶇疆 + HandlePassVo handlePassVo = new HandlePassVo(); + QueryWrapper<WorkflowConfig> wrapperWc = new QueryWrapper<>(); + wrapperWc.lambda().eq(WorkflowConfig::getCode, "ddlc"); + List<WorkflowConfig> wcs = workflowConfigMapper.selectList(wrapperWc); + + //2.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆 + Map mapWcs = new HashMap(); + mapWcs.put("workflowConfigId", wcs.get(0).getId()); + mapWcs.put("baseCaseId", baseCase.getId()); + List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(mapWcs); + //澶勭悊鐢ㄧ幆鑺傛椂闂� + for (WorkflowConfigStep step : listWcs) { + List<DisposeRecord> records = step.getDisposeRecords(); + if (records == null) { + continue; + } + for (DisposeRecord record : records) { + if (record != null && record.getEndTime() != null && record.getStartTime() != null) { + record.setLinkTime(DateUtil.getDistanceDateTime(DateUtil.fromLocalDateTime(record.getStartTime()), DateUtil.fromLocalDateTime(record.getEndTime()))); + } + } + step.setDisposeRecords(records); + } + //2.3璁剧疆璋冨害娴佺▼ + handlePassVo.setWorkflowConfigSteps(listWcs); + bcd.setHandlePassVo(handlePassVo); + //3.鏌ヨ妗堝嵎鍥剧墖淇℃伅 + FilesPictureVo filesPictureVo = new FilesPictureVo(); + QueryWrapper<ImageResources> wrapperIr = new QueryWrapper<>(); + wrapperIr.lambda().eq(ImageResources::getBelongToId, baseCase.getId()); + List<ImageResources> irs = imageResourcesMapper.selectList(wrapperIr); + filesPictureVo.setImageResources(irs); + bcd.setFilesPictureVo(filesPictureVo); + //4.鏌ヨ闂澶勭悊淇℃伅 + /*ProblemProVo problemProVo = new ProblemProVo(); + //4.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆 + List<WorkflowConfigStep> listWcsPp = new ArrayList<>(); + //4.3璁剧疆璋冨害娴佺▼ + problemProVo.setWorkflowConfigSteps(listWcsPp); + bcd.setProblemProVo(problemProVo);*/ + + //5.鏌ヨ鐜板満鎯呭喌淇℃伅 + CurrentSitVo currentSitVo = new CurrentSitVo(); + QueryWrapper<ArrivalSituation> wrapperAs = new QueryWrapper<>(); + wrapperAs.lambda().eq(ArrivalSituation::getBaseCaseId, baseCase.getId()); + //璁剧疆鍒拌揪鐜板満鎯呭喌 + ArrivalSituation as = arrivalSituationMapper.selectOne(wrapperAs); + currentSitVo.setArrivalSituation(as); + //璁剧疆璋冩煡鍙栬瘉 + QueryWrapper<Investigation> wrapperI = new QueryWrapper<>(); + wrapperI.lambda().eq(Investigation::getBaseCaseId, baseCase.getId()); + Investigation investigation = investigationMapper.selectOne(wrapperI); + if (investigation != null && investigation.getPartyId() != null) { + //鑾峰彇褰撲簨浜轰俊鎭� + Map mapP = new HashMap(); + mapP.put("id", investigation.getPartyId()); + PartyInfo partyInfo = partyInfoMapper.selectCondMap(mapP); + //濉厖褰撲簨浜� + investigation.setPartyInfo(partyInfo); + } + currentSitVo.setInvestigation(investigation); + //璁剧疆鍛婄煡杩濇硶 + QueryWrapper<Writ> wrapperW = new QueryWrapper<>(); + wrapperW.lambda().eq(Writ::getBaseCaseId, baseCase.getId()); + Writ writ = writMapper.selectOne(wrapperW); + currentSitVo.setWrit(writ); + bcd.setCurrentSitVo(currentSitVo); + return bcd; + } + + @Override + public ArrayList<String> listCaseImages(Integer id, Integer type) { + Integer illegalBuildingType = 02; + ArrayList<String> caseImages = new ArrayList<>(); + caseImages.add(investigationMapper.selectOne(new LambdaQueryWrapper<Investigation>().eq(Investigation::getBaseCaseId, id)).getPic()); + caseImages.add(arrivalSituationMapper.selectOne(new LambdaQueryWrapper<ArrivalSituation>().eq(ArrivalSituation::getBaseCaseId, id)).getSituationPic()); + if (type == illegalBuildingType) { + Writ writ = writMapper.selectOne(new LambdaQueryWrapper<Writ>().eq(Writ::getBaseCaseId, id)); + caseImages.add(writ.getWritPic()); + caseImages.add(writ.getOriginalPic()); + caseImages.add(writ.getOtherPic()); + caseImages.add(writ.getRectifiedPic()); + } + return caseImages; + } + + @Override + public void endCase(Long caseId, String result, String opinion) { + //鑾峰彇褰撳墠鐧婚檰鐢ㄦ埛淇℃伅 + AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + String endCaseName = StepName.CLOSING_REGISTER.getName(); + BaseCase baseCase = new BaseCase(); + baseCase.setState(BaseCaseStatus.CLOSING_REGISTER); + baseCase.setId(caseId); + baseCase.setFinalOpinion(opinion); + baseCase.setCloseTime(LocalDateTime.now()); + baseCaseMapper.updateById(baseCase); + + QueryWrapper<WorkflowConfigStep> stepQurey = new QueryWrapper<>(); + stepQurey.eq("name", endCaseName); + WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQurey); + if (workflowConfigStep == null) { + throw new ApiException("鏈煡璇㈠埌璇ユ祦绋嬬幆鑺�"); + } + UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("base_case_id", baseCase.getId()).eq("workflow_config_step_id", workflowConfigStep.getId()); + + //淇敼缁撴璁板綍 + DisposeRecord disposeRecord = new DisposeRecord(); + disposeRecord.setHandlerId(user.getUserId()); + //缁撴宸茬粨鏉� + disposeRecord.setState(1); + disposeRecord.setResult(result); + disposeRecord.setEndTime(LocalDateTime.now()); + disposeRecord.setHandlerId(user.getUserId()); + disposeRecordMapper.update(disposeRecord, updateWrapper); + } + + @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); + } + + @Override + public Page<QueryForViolationVO> selectViolation(QueryForViolationParam queryForViolationParam) { + return baseCaseMapper.selectViolationPage( + new Page<QueryForViolationVO>() + .setSize(queryForViolationParam.getPageSize()) + .setCurrent(queryForViolationParam.getCurrent()), queryForViolationParam); + } + + @Override + public Page<BaseCaseVO> selectVideoInspection(Integer current) { + return baseCaseMapper.selectVideoInspection(new Page<>(current, 1)); + } + + @Override + public Map<String, Object> selectCount() { + HashMap<String, Object> map = new HashMap<>(); + Long review = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getState, 1)); + map.put("review", review); + return map; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateCase(ViolationParam violationParam) { + BaseCase baseCase = new BaseCase(); + BeanUtils.copyProperties(violationParam, baseCase); + baseCase.setId(violationParam.getBaseId()); + baseCaseMapper.updateById(baseCase); + Violations violations = new Violations(); + BeanUtils.copyProperties(violationParam, violations); + violations.setId(violations.getId()); + return violationsMapper.updateById(violations) == 1 ? true : false; + } } \ No newline at end of file -- Gitblit v1.8.0