From 8945b94fc922fc6598f7558b318dc7674f525b70 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 17 八月 2023 10:11:35 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 98 +++++++++++++++++++++++++++++++++----------------
1 files changed, 66 insertions(+), 32 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 03cb985..4ff7bf7 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,5 +1,6 @@
package com.ycl.service.caseHandler.impl;
+import cn.hutool.core.collection.CollUtil;
import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -32,6 +33,7 @@
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IDispatchHandleService;
import com.ycl.service.caseHandler.IViolationsService;
+import com.ycl.service.resources.IImageResourcesService;
import com.ycl.service.video.IVideoAlarmReportService;
import com.ycl.vo.casePool.*;
import com.ycl.vo.cockpit.enforcementEvents.DelayVO;
@@ -50,10 +52,8 @@
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;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -126,33 +126,39 @@
@Resource
IBaseCaseService baseCaseService;
-
+ @Autowired
+ IImageResourcesService imageResourcesService;
@Override
public String uploadEvent(Long caseId) {
BaseCase baseCase = this.getById(caseId);
- Violations violations = violationsService.getById(caseId);
- String medias = "";
- String eventDesc = "";
- if (violations != null) {
- eventDesc = violations.getDescription();
- VideoAlarmReport videoAlarmReport = videoAlarmReportService.getById(violations.getVideoAlarmReportId());
- if (videoAlarmReport != null) {
- StringBuilder stringBuilder = new StringBuilder().append("[{'mediaURL':'").append(fileUrl).append(videoAlarmReport.getPicData()).append("'}]");
- medias = stringBuilder.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();
- 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();
- }
+
+ baseCase.setState(BaseCaseStatus.WAIT_REPORT);
+ this.updateById(baseCase);
+ return null;
+
+ // Violations violations = violationsService.getById(caseId);
+ // String medias = "";
+ // String eventDesc = "";
+ // if (violations != null) {
+ // eventDesc = violations.getDescription();
+ // VideoAlarmReport videoAlarmReport = videoAlarmReportService.getById(violations.getVideoAlarmReportId());
+ // if (videoAlarmReport != null) {
+ // StringBuilder stringBuilder = new StringBuilder().append("[{'mediaURL':'").append(fileUrl).append(videoAlarmReport.getPicData()).append("'}]");
+ // medias = stringBuilder.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();
+ // 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
@@ -171,7 +177,7 @@
}
@Override
- public Page listViolationsPage(Integer current, Integer size, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId,Integer videoId) {
+ public Page listViolationsPage(Integer current, Integer size, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId) {
Integer type = 01;
Integer hours = 60;
Integer day = 24;
@@ -196,7 +202,7 @@
}
@Override
- public Page listIllegalBuilding(Integer size, Integer current, Integer state, Integer resource) {
+ public Page listIllegalBuilding(Integer current, Integer size, Integer state, Integer resource) {
Integer type = 02;
Page page = new Page<>().setCurrent(current).setSize(size);
return baseCaseMapper.listIllegalBuildingsPage(page, state, type, resource);
@@ -397,10 +403,38 @@
disposeRecordMapper.update(disposeRecord, updateWrapper);
}
+
@Override
- public Page<BaseCase> selectPage(Page<BaseCase> page, String number, Integer streetId, Integer categories, String startTime, String endTime, String site) {
- return baseCaseMapper.selectBaseCasePage(page, number, streetId, categories, startTime, endTime, site);
+ public Page<BaseCase> selectPage(Page<BaseCase> page, String number, Integer communityId, Integer categories, String startTime, String endTime, String site, Integer state, Integer streetId, Integer time) {
+ LocalDateTime start = null;
+ LocalDateTime end = null;
+ LocalDateTime now = LocalDateTime.now();
+ if (Objects.nonNull(time) && time == 0) {
+ end = now;
+ start = now.plusWeeks(1);
+
+ }
+ if (Objects.nonNull(time) && time == 1) {
+ end = now;
+ start = now.plusMonths(1);
+
+ }
+ if (Objects.nonNull(time) && time == 2) {
+ end = now;
+ start = now.plusMonths(3);
+ }
+ Page<BaseCase> baseCasePage = baseCaseMapper.selectBaseCasePage(page, number, communityId, categories, start, end, site, state, streetId);
+ if (Objects.isNull(baseCasePage) && CollUtil.isNotEmpty(baseCasePage.getRecords())) {
+ List<BaseCase> records = baseCasePage.getRecords();
+ Set<Long> caseIds = records.stream().map(BaseCase::getId).collect(Collectors.toSet());
+ Map<Long, String> urlMap = imageResourcesService.getUrlMap(caseIds, "01");
+ records.stream().forEach(item -> {
+ item.setUrl(urlMap.get(item.getId()));
+ });
+ }
+ return baseCasePage;
}
+
@Override
public Page<QueryForViolationVO> selectViolation(QueryForViolationParam queryForViolationParam) {
@@ -416,7 +450,7 @@
}
@Override
- public Page<BaseCaseVO> selectVideoInspection(Integer current,Integer pageSize, Long gradeId, Long videoId, String beginTime, String endTime) {
+ public Page<BaseCaseVO> selectVideoInspection(Integer current, Integer pageSize, Long gradeId, Long videoId, String beginTime, String endTime) {
return baseCaseMapper.selectVideoInspection(new Page<>(current, pageSize), gradeId, videoId, beginTime, endTime);
}
--
Gitblit v1.8.0