From 7e5bfd8737b33a06cadb433461ed7e52d99ccba7 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 29 九月 2022 13:06:53 +0800
Subject: [PATCH] 案件池修改 案件图片展示
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 86 ++++++++++++++++++++++++++++---------------
1 files changed, 56 insertions(+), 30 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 a4b3cd8..5a1a799 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,21 +1,18 @@
package com.ycl.service.caseHandler.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.caseHandler.*;
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.caseHandler.*;
import com.ycl.mapper.dict.DataDictionaryMapper;
-import com.ycl.remote.dto.*;
-import com.ycl.remote.service.CityPlatformService;
+import com.ycl.remote.dto.EventAddParamDto;
+import com.ycl.remote.dto.EventProcessParamDto;
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IViolationsService;
import com.ycl.service.video.IVideoAlarmReportService;
@@ -30,6 +27,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;
@@ -44,17 +42,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) {
@@ -74,6 +72,12 @@
ViolationsMapper violationsMapper;
@Resource
IllegalBuildingMapper illegalBuildingMapper;
+ @Resource
+ InvestigationMapper investigationMapper;
+ @Resource
+ ArrivalSituationMapper arrivalSituationMapper;
+ @Resource
+ WritMapper writMapper;
@Override
public String uploadEvent(Integer caseId) {
@@ -91,29 +95,31 @@
}
EventAddParamDto dto = EventAddParamDto.builder().y84(baseCase.getLatitude().toString()).x84(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();
- }
+// 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;
}
@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();
- }
+// ResultResponseDto<EventProcessResponseDto> responseDto = cityPlatformService.getEventProcess(paramDto);
+// if (responseDto.getCode() == 0) {
+// EventProcessResponseDto eventProcessResponseDto = responseDto.getResult();
+// /*********** 鏈鐞嗗競骞冲彴杩斿洖鏁版嵁 ***************/
+// return null;
+// } else {
+// return responseDto.getMsg();
+// }
+ return null;
}
@Override
@@ -188,4 +194,24 @@
Integer value = 1;
return illegalBuildingMapper.insert(illegalBuilding) == value ? true : false;
}
+
+ @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