From 94e964d96cdacef8bf255c09cb90c0366a074c68 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 29 九月 2022 17:47:25 +0800
Subject: [PATCH] 案件上传优化
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 112 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 353d583..f157999 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,18 +1,38 @@
package com.ycl.service.caseHandler.impl;
+import com.alibaba.fastjson.JSONObject;
+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.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.video.VideoAlarmReport;
import com.ycl.mapper.caseHandler.BaseCaseMapper;
+import com.ycl.mapper.caseHandler.IllegalBuildingMapper;
+import com.ycl.mapper.caseHandler.ViolationsMapper;
+import com.ycl.mapper.dict.DataDictionaryMapper;
import com.ycl.remote.dto.*;
import com.ycl.remote.service.CityPlatformService;
import com.ycl.service.caseHandler.IBaseCaseService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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 org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -47,6 +67,15 @@
this.videoAlarmReportService = videoAlarmReportService;
}
+ @Resource
+ BaseCaseMapper baseCaseMapper;
+ @Resource
+ DataDictionaryMapper dataDictionaryMapper;
+ @Resource
+ ViolationsMapper violationsMapper;
+ @Resource
+ IllegalBuildingMapper illegalBuildingMapper;
+
@Override
public String uploadEvent(Integer caseId) {
BaseCase baseCase = this.getById(caseId);
@@ -61,11 +90,13 @@
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);
+ 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;
@@ -78,13 +109,87 @@
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 {
return responseDto.getMsg();
}
}
-}
+
+ @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);
+ 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());
+ Page<CasePoolViolationVO> casePoolViolationVOPage = new Page<>();
+ BeanUtils.copyProperties(violationsPage, casePoolViolationVOPage);
+ casePoolViolationVOPage.setRecords(violationVOList);
+ return casePoolViolationVOPage;
+ }
+
+ @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;
+ }
+
+ @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;
+ return violationsMapper.insert(violations) == value ? true : false;
+ }
+
+ @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;
+ return illegalBuildingMapper.insert(illegalBuilding) == value ? true : false;
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0