From df697a1e468c818d4f56f63324abd00ff58a7c8f Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 20 十月 2022 12:33:57 +0800
Subject: [PATCH] 行政区域下拉框接口。
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 87 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 36 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 e8f1740..b23a37c 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
@@ -3,18 +3,21 @@
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.AdminUserDetails;
import com.ycl.bo.casePool.CasePoolIllegalBuildingDO;
import com.ycl.bo.casePool.CasePoolViolationDO;
import com.ycl.common.constant.BaseCaseStatus;
+import com.ycl.common.constant.StepName;
import com.ycl.common.util.DateUtil;
import com.ycl.dto.casePool.IllegalBuildingParam;
import com.ycl.dto.casePool.ViolationParam;
import com.ycl.entity.caseHandler.*;
import com.ycl.entity.common.ImageResources;
import com.ycl.entity.video.VideoAlarmReport;
+import com.ycl.exception.ApiException;
import com.ycl.mapper.caseHandler.*;
import com.ycl.mapper.common.ImageResourcesMapper;
import com.ycl.mapper.dict.DataDictionaryMapper;
@@ -33,6 +36,7 @@
import javax.annotation.Resource;
import java.time.Duration;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -150,6 +154,7 @@
public Page listViolationsPage(Page page, Integer state, Integer resource) {
Integer type = 01;
Integer hours = 60;
+ Integer day = 24;
Page<CasePoolViolationDO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource);
List<CasePoolViolationVO> violationVOList = violationsPage
.getRecords()
@@ -159,13 +164,15 @@
BeanUtils.copyProperties(item, casePoolViolationVO);
if (item.getCloseTime() == null) {
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.toHours() + "鏃�" + minutes + "鍒嗛挓";
+ String continueTime = duration.toDays() + "澶�" + continueHours + "鏃�" + minutes + "鍒嗛挓";
casePoolViolationVO.setContinueTime(continueTime);
} else {
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.toHours() + "鏃�" + minutes + "鍒嗛挓";
+ String continueTime = duration.toDays() + "澶�" + continueHours + "鏃�" + minutes + "鍒嗛挓";
casePoolViolationVO.setContinueTime(continueTime);
}
casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
@@ -207,14 +214,20 @@
BeanUtils.copyProperties(violationParam, violations);
Integer value = 1;
violations.setId(id);
- setDisposeRecord(id);
+ setDisposeRecord(id, violationParam.getLimitTime());
return violationsMapper.insert(violations) == value ? true : false;
}
- private void setDisposeRecord(Long id) {
- String stepName = "璋冨害";
+ 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());
@@ -222,6 +235,7 @@
disposeRecord.setCreateUser(userDetails.getUserId());
disposeRecord.setStartTime(LocalDateTime.now());
disposeRecord.setStepName(stepName);
+ disposeRecord.setLimitTime(LocalDateTime.parse(limitTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
disposeRecordMapper.insert(disposeRecord);
}
@@ -229,7 +243,7 @@
public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Long id) {
IllegalBuilding illegalBuilding = new IllegalBuilding();
BeanUtils.copyProperties(illegalBuildingParam, illegalBuilding);
- setDisposeRecord(id);
+ setDisposeRecord(id, illegalBuildingParam.getLimitTime());
Integer value = 1;
illegalBuilding.setBaseCaseId(id);
return illegalBuildingMapper.insert(illegalBuilding) == value ? true : false;
@@ -257,7 +271,7 @@
}
//鑾峰彇璋冨害淇℃伅
Map mapD = new HashMap();
- mapD.put("baseCaseId",baseCase.getId());
+ mapD.put("baseCaseId", baseCase.getId());
DispatchInfo dispatchInfo = dispatchInfoMapper.selectCondMap(mapD);
baseCase.setDispatchInfo(dispatchInfo);
bcd.setBaseCase(baseCase);
@@ -266,20 +280,12 @@
//2.1鏌ヨ澶勭疆娴佺▼閰嶇疆
HandlePassVo handlePassVo = new HandlePassVo();
QueryWrapper<WorkflowConfig> wrapperWc = new QueryWrapper<>();
- wrapperWc.lambda().eq(WorkflowConfig::getCode, "ddlc").or().eq(WorkflowConfig::getCode, "wtcllc");
+ wrapperWc.lambda().eq(WorkflowConfig::getCode, "ddlc");
List<WorkflowConfig> wcs = workflowConfigMapper.selectList(wrapperWc);
- Integer ddlcId = 0, wtcllcId = 0;
- for (WorkflowConfig wc : wcs) {
- if ("ddlc".equals(wc.getCode())) {
- ddlcId = wc.getId();
- }
- if ("wtcllc".equals(wc.getCode())) {
- wtcllcId = wc.getId();
- }
- }
+
//2.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
Map mapWcs = new HashMap();
- mapWcs.put("workflowConfigId", ddlcId);
+ mapWcs.put("workflowConfigId", wcs.get(0).getId());
mapWcs.put("baseCaseId", baseCase.getId());
List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(mapWcs);
//澶勭悊鐢ㄧ幆鑺傛椂闂�
@@ -289,11 +295,11 @@
continue;
}
for (DisposeRecord record : records) {
- if (record != null && record.getCreateTime() != null) {
+ if (record != null && record.getEndTime() != null) {
record.setLinkTime(
DateUtil.getDistanceDateTime(
DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
- DateUtil.fromLocalDateTime(record.getCreateTime())));
+ DateUtil.fromLocalDateTime(record.getEndTime())));
}
}
step.setDisposeRecords(records);
@@ -309,13 +315,13 @@
filesPictureVo.setImageResources(irs);
bcd.setFilesPictureVo(filesPictureVo);
//4.鏌ヨ闂澶勭悊淇℃伅
- ProblemProVo problemProVo = new ProblemProVo();
+ /*ProblemProVo problemProVo = new ProblemProVo();
//4.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
- mapWcs.put("workflowConfigId", wtcllcId);
- List<WorkflowConfigStep> listWcsPp = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(mapWcs);
+ List<WorkflowConfigStep> listWcsPp = new ArrayList<>();
//4.3璁剧疆璋冨害娴佺▼
problemProVo.setWorkflowConfigSteps(listWcsPp);
- bcd.setProblemProVo(problemProVo);
+ bcd.setProblemProVo(problemProVo);*/
+
//5.鏌ヨ鐜板満鎯呭喌淇℃伅
CurrentSitVo currentSitVo = new CurrentSitVo();
QueryWrapper<ArrivalSituation> wrapperAs = new QueryWrapper<>();
@@ -366,23 +372,32 @@
}
@Override
- public void endCase(Long caseId, String result) {
+ public void endCase(Long caseId, String result, String opinion) {
+ //鑾峰彇褰撳墠鐧婚檰鐢ㄦ埛淇℃伅
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
- Integer state = 1;
- String endCaseName = "缁撴";
+ String endCaseName = StepName.CLOSING_REGISTER.getName();
BaseCase baseCase = new BaseCase();
baseCase.setState(BaseCaseStatus.CLOSING_REGISTER);
baseCase.setId(caseId);
+ baseCase.setFinalOpinion(opinion);
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.setBaseCaseId(caseId);
- disposeRecord.setWorkflowConfigStepId(workflowConfigStepMapper
- .selectOne(new LambdaQueryWrapper<WorkflowConfigStep>().eq(WorkflowConfigStep::getName, endCaseName))
- .getWorkflowConfigId());
- disposeRecord.setCreateUser(user.getUserId().longValue());
- disposeRecord.setResult(result);
- disposeRecord.setState(state);
- disposeRecord.setCreateTime(LocalDateTime.now());
- disposeRecordMapper.insert(disposeRecord);
+ disposeRecord.setHandlerId(user.getUserId());
+ //缁撴宸茬粨鏉�
+ disposeRecord.setState(1);
+ disposeRecord.setEndTime(LocalDateTime.now());
+ disposeRecord.setHandlerId(user.getUserId());
+ disposeRecordMapper.update(disposeRecord, updateWrapper);
}
}
\ No newline at end of file
--
Gitblit v1.8.0