From cfeeefcf48d654d86191bcfe9b4dd1476ba9ec5f Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期日, 02 十月 2022 14:57:48 +0800
Subject: [PATCH] 修改审核接口
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 152 ++++++++++++++++++++++++++++++++------------------
1 files changed, 96 insertions(+), 56 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 e5220d4..f884485 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,11 +1,14 @@
package com.ycl.service.caseHandler.impl;
+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.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.util.DateUtil;
import com.ycl.dto.casePool.IllegalBuildingParam;
import com.ycl.dto.casePool.ViolationParam;
import com.ycl.entity.caseHandler.*;
@@ -14,8 +17,8 @@
import com.ycl.mapper.caseHandler.*;
import com.ycl.mapper.common.ImageResourcesMapper;
import com.ycl.mapper.dict.DataDictionaryMapper;
-import com.ycl.remote.dto.EventAddParamDto;
-import com.ycl.remote.dto.EventProcessParamDto;
+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;
@@ -23,12 +26,12 @@
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 javax.annotation.Resource;
-import java.time.Instant;
+import java.time.Duration;
import java.time.LocalDateTime;
-import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -44,17 +47,17 @@
@Service
public class BaseCaseServiceImpl extends ServiceImpl<BaseCaseMapper, BaseCase> implements IBaseCaseService {
- // private CityPlatformService cityPlatformService;
+ private CityPlatformService cityPlatformService;
private IViolationsService violationsService;
private IVideoAlarmReportService videoAlarmReportService;
@Value("${fdfs.fileUrl}")
private String fileUrl;
-// @Autowired
-// public void setCityPlatformService(CityPlatformService cityPlatformService) {
-// this.cityPlatformService = cityPlatformService;
-// }
+ @Autowired
+ public void setCityPlatformService(CityPlatformService cityPlatformService) {
+ this.cityPlatformService = cityPlatformService;
+ }
@Autowired
public void setViolationsService(IViolationsService violationsService) {
@@ -81,6 +84,8 @@
InvestigationMapper investigationMapper;
@Resource
WritMapper writMapper;
+ @Resource
+ DisposeRecordMapper disposeRecordMapper;
@Resource
WorkflowConfigStepMapper workflowConfigStepMapper;
@@ -88,8 +93,6 @@
WorkflowConfigMapper workflowConfigMapper;
@Resource
ImageResourcesMapper imageResourcesMapper;
-
-
@Override
@@ -106,59 +109,62 @@
medias = stringBuilder.toString();
}
}
- EventAddParamDto dto = EventAddParamDto.builder().y84(baseCase.getLatitude().toString()).x84(baseCase.getLongitude().toString())
+ 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();
-// ResultResponseDto<EventAddResponseDto> result = cityPlatformService.addEvent(dto);
-// if (result.getCode() == 0) {
-// EventAddResponseDto responseDto = result.getResult();
-// baseCase.setTaskCode(responseDto.getTaskcode());
-// this.updateById(baseCase);
-// return null;
-// } else {
-// return result.getMsg();
-// }
- return null;
+ String msg = cityPlatformService.addEvent(dto);
+ ResultResponseDto result = JSONObject.parseObject(msg, ResultResponseDto.class);
+ if (result.getCode() == 0) {
+ EventAddResponseDto responseDto = JSONObject.parseObject(result.getResult(), EventAddResponseDto.class);
+ baseCase.setTaskCode(responseDto.getTaskcode());
+ this.updateById(baseCase);
+ return null;
+ } else {
+ return result.getMsg();
+ }
}
@Override
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);
-// if (responseDto.getCode() == 0) {
-// EventProcessResponseDto eventProcessResponseDto = responseDto.getResult();
-// /*********** 鏈鐞嗗競骞冲彴杩斿洖鏁版嵁 ***************/
-// return null;
-// } else {
-// return responseDto.getMsg();
-// }
- return null;
+ String msg = cityPlatformService.getEventProcess(paramDto);
+ ResultResponseDto responseDto = JSONObject.parseObject(msg, ResultResponseDto.class);
+ if (responseDto.getCode() == 0) {
+ EventProcessResponseDto eventProcessResponseDto = JSONObject.parseObject(responseDto.getResult(), EventProcessResponseDto.class);
+ /*********** 鏈鐞嗗競骞冲彴杩斿洖鏁版嵁 ***************/
+ return null;
+ } else {
+ return responseDto.getMsg();
+ }
}
@Override
public Page listViolationsPage(Page page, Integer state, Integer resource) {
Integer type = 01;
+ Integer hours = 60;
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);
- 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);
- } 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);
- }
- casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
- casePoolViolationVO.setType(dataDictionaryMapper.selectById(item.getTypeId()).getName());
- return casePoolViolationVO;
- }).collect(Collectors.toList());
+ List<CasePoolViolationVO> violationVOList = violationsPage
+ .getRecords()
+ .stream()
+ .map(item -> {
+ CasePoolViolationVO casePoolViolationVO = new CasePoolViolationVO();
+ BeanUtils.copyProperties(item, casePoolViolationVO);
+ if (item.getCloseTime() == null) {
+ Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
+ long minutes = duration.toMinutes() - (duration.toHours() * hours);
+ String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
+ casePoolViolationVO.setContinueTime(continueTime);
+ } else {
+ Duration duration = Duration.between(item.getAlarmTime(), item.getCloseTime());
+ long minutes = duration.toMinutes() - (duration.toHours() * hours);
+ String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
+ casePoolViolationVO.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);
@@ -188,9 +194,7 @@
@Override
public Boolean saveViolationCase(ViolationParam violationParam, Integer id) {
- BaseCase baseCase = new BaseCase();
Violations violations = new Violations();
- BeanUtils.copyProperties(violationParam, baseCase);
BeanUtils.copyProperties(violationParam, violations);
violations.setId(id);
Integer value = 1;
@@ -199,9 +203,7 @@
@Override
public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Integer id) {
- BaseCase baseCase = new BaseCase();
IllegalBuilding illegalBuilding = new IllegalBuilding();
- BeanUtils.copyProperties(illegalBuilding, baseCase);
BeanUtils.copyProperties(illegalBuilding, illegalBuildingParam);
illegalBuilding.setBaseCaseId(id);
Integer value = 1;
@@ -222,7 +224,7 @@
QueryWrapper<WorkflowConfig> wrapperWc = new QueryWrapper<>();
wrapperWc.lambda().eq(WorkflowConfig::getCode, "ddlc").or().eq(WorkflowConfig::getCode, "wtcllc");
List<WorkflowConfig> wcs = workflowConfigMapper.selectList(wrapperWc);
- Integer ddlcId=0,wtcllcId=0;
+ Integer ddlcId = 0, wtcllcId = 0;
for (WorkflowConfig wc : wcs) {
if ("ddlc".equals(wc.getCode())) {
ddlcId = wc.getId();
@@ -233,6 +235,22 @@
}
//2.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(ddlcId);
+ //澶勭悊鐢ㄧ幆鑺傛椂闂�
+ for (WorkflowConfigStep step : listWcs) {
+ DisposeRecord record = step.getDisposeRecord();
+ System.out.println(baseCase.getAlarmTime());
+ System.out.println(record.getCreateTime());
+ System.out.println(DateUtil.fromLocalDateTime(baseCase.getAlarmTime()));
+ System.out.println(DateUtil.fromLocalDateTime(record.getCreateTime()));
+ System.out.println( DateUtil.getDistanceDateTime(
+ DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
+ DateUtil.fromLocalDateTime(record.getCreateTime())));
+ record.setLinkTime(
+ DateUtil.getDistanceDateTime(
+ DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
+ DateUtil.fromLocalDateTime(record.getCreateTime())));
+ step.setDisposeRecord(record);
+ }
//2.3璁剧疆璋冨害娴佺▼
handlePassVo.setWorkflowConfigSteps(listWcs);
bcd.setHandlePassVo(handlePassVo);
@@ -289,4 +307,26 @@
}
return caseImages;
}
+
+ @Override
+ public void endCase(Integer caseId, String result) {
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ Integer endCaseState = 6;
+ Integer state = 2;
+ String endCaseName = "缁撴";
+ BaseCase baseCase = new BaseCase();
+ baseCase.setState(endCaseState);
+ baseCase.setId(caseId);
+ baseCaseMapper.updateById(baseCase);
+ DisposeRecord disposeRecord = new DisposeRecord();
+ disposeRecord.setBaseCaseId(caseId);
+ disposeRecord.setWorkflowConfigStepId(workflowConfigStepMapper
+ .selectOne(new LambdaQueryWrapper<WorkflowConfigStep>().eq(WorkflowConfigStep::getName, endCaseName))
+ .getWorkflowConfigId());
+ disposeRecord.setCreateUser(user.getUserId().intValue());
+ disposeRecord.setResult(result);
+ disposeRecord.setState(state);
+ disposeRecord.setCreateTime(LocalDateTime.now());
+ disposeRecordMapper.insert(disposeRecord);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0