From cbb807c80c747c37005d3a282b10782fc458f07f Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 29 九月 2022 18:34:44 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 129 +++++++++++++++++++++++++++++++-----------
1 files changed, 94 insertions(+), 35 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 ff3c5dc..1758bfd 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,24 +1,26 @@
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.casePool.CasePoolIllegalBuildingDO;
import com.ycl.bo.casePool.CasePoolViolationDO;
-import com.ycl.bo.casePool.CurrentSitVo;
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.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;
-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;
@@ -28,6 +30,7 @@
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -42,17 +45,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) {
@@ -80,6 +83,15 @@
@Resource
WritMapper writMapper;
+ @Resource
+ WorkflowConfigStepMapper workflowConfigStepMapper;
+ @Resource
+ WorkflowConfigMapper workflowConfigMapper;
+ @Resource
+ ImageResourcesMapper imageResourcesMapper;
+
+
+
@Override
public String uploadEvent(Integer caseId) {
@@ -95,33 +107,34 @@
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
@@ -177,9 +190,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;
@@ -188,9 +199,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;
@@ -206,12 +215,42 @@
BaseCase baseCase = baseCaseMapper.selectOne(wrapper);
bcd.setBaseCase(baseCase);
//2.鏌ヨ鍔炵悊缁忚繃淇℃伅
+ //2.1鏌ヨ澶勭疆娴佺▼閰嶇疆
+ HandlePassVo handlePassVo = new HandlePassVo();
+ 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;
+ for (WorkflowConfig wc : wcs) {
+ if ("ddlc".equals(wc.getCode())) {
+ ddlcId = wc.getId();
+ }
+ if ("wtcllc".equals(wc.getCode())) {
+ wtcllcId = wc.getId();
+ }
+ }
+ //2.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
+ List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(ddlcId);
+ //2.3璁剧疆璋冨害娴佺▼
+ handlePassVo.setWorkflowConfigSteps(listWcs);
+ bcd.setHandlePassVo(handlePassVo);
//3.鏌ヨ妗堝嵎鍥剧墖淇℃伅
+ FilesPictureVo filesPictureVo = new FilesPictureVo();
+ QueryWrapper<ImageResources> wrapperIr = new QueryWrapper<>();
+ wrapperIr.lambda().eq(ImageResources::getType, "01").or().eq(ImageResources::getType, "02");
+ List<ImageResources> irs = imageResourcesMapper.selectList(wrapperIr);
+ filesPictureVo.setImageResources(irs);
+ bcd.setFilesPictureVo(filesPictureVo);
//4.鏌ヨ闂澶勭悊淇℃伅
+ ProblemProVo problemProVo = new ProblemProVo();
+ //4.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
+ List<WorkflowConfigStep> listWcsPp = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(wtcllcId);
+ //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);
@@ -228,4 +267,24 @@
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;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0