From 05af069d9d1eb900a3e9202a5e03d4b8b79e1640 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 08 十二月 2022 13:42:31 +0800
Subject: [PATCH] fix: 案卷查询参数
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 102 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 95 insertions(+), 7 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 52b1d17..fc96219 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,8 +11,11 @@
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.entity.caseHandler.*;
import com.ycl.entity.dict.DataDictionary;
@@ -25,14 +28,18 @@
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.EnforcementEventsVO;
+import com.ycl.vo.cockpit.enforcementEvents.EventVO;
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.Duration;
@@ -57,6 +64,7 @@
private CityPlatformService cityPlatformService;
private IViolationsService violationsService;
private IVideoAlarmReportService videoAlarmReportService;
+
@Value("${fdfs.fileUrl}")
private String fileUrl;
@@ -105,9 +113,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 = "";
@@ -194,12 +211,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());
@@ -235,8 +251,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<>();
@@ -375,8 +391,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
@@ -386,4 +402,76 @@
.setSize(queryForViolationParam.getPageSize())
.setCurrent(queryForViolationParam.getCurrent()), queryForViolationParam);
}
+
+ @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));
+ }
+
+ @Override
+ 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 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(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());
+ 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.insert(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);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0