From 1cad14bca191807e18705c3a5526eda8151be439 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 14 四月 2025 23:10:22 +0800
Subject: [PATCH] 批量审核和图片保存bug
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 83 +++++++++++++++++++++++++++++++++--------
1 files changed, 66 insertions(+), 17 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 684cf46..863e7f6 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
@@ -143,12 +143,13 @@
medias = stringBuilder.toString();
}
}
+ eventDesc += "[澶у崕瑙嗛鎺ュ叆娴嬭瘯]";
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());
+// EventAddResponseDto responseDto = JSONObject.parseObject(result.getResult(), EventAddResponseDto.class);
+ baseCase.setTaskCode(result.getResult());
this.updateById(baseCase);
return null;
} else {
@@ -172,7 +173,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, List<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;
@@ -197,7 +198,7 @@
}
@Override
- public Page listIllegalBuilding(Integer current, Integer size, Integer state, Integer resource) {
+ public Page listIllegalBuilding(Integer current, Integer size, List<Integer> state, Integer resource) {
Integer type = 02;
Page page = new Page<>().setCurrent(current).setSize(size);
return baseCaseMapper.listIllegalBuildingsPage(page, state, type, resource);
@@ -263,13 +264,15 @@
baseCase.setViolationsVO(violationsVO);
} else {
IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
- LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>();
- dict.eq(DataDictionary::getId, illegalBuilding.getCategoryId());
- DataDictionary dictionary = dataDictionaryMapper.selectOne(dict);
- if (dictionary != null) {
- illegalBuilding.setCategoryText(dictionary.getName());
+ if(illegalBuilding!=null) {
+ LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>();
+ dict.eq(DataDictionary::getId, illegalBuilding.getCategoryId());
+ DataDictionary dictionary = dataDictionaryMapper.selectOne(dict);
+ if (dictionary != null) {
+ illegalBuilding.setCategoryText(dictionary.getName());
+ }
+ baseCase.setIllegalBuilding(illegalBuilding);
}
- baseCase.setIllegalBuilding(illegalBuilding);
}
//鑾峰彇璋冨害淇℃伅
Map mapD = new HashMap();
@@ -406,21 +409,48 @@
LocalDateTime now = LocalDateTime.now();
if (Objects.nonNull(time) && time == 0) {
end = now;
- start = now.plusWeeks(1);
+ start = now.minusWeeks(1);
}
if (Objects.nonNull(time) && time == 1) {
end = now;
- start = now.plusMonths(1);
+ start = now.minusMonths(1);
}
if (Objects.nonNull(time) && time == 2) {
end = now;
- start = now.plusMonths(3);
+ start = now.minusMonths(3);
}
Page<BaseCase> baseCasePage = baseCaseMapper.selectBaseCasePage(page, number, communityId, categories, start, end, site, state, streetId);
- if (Objects.isNull(baseCasePage) && CollUtil.isNotEmpty(baseCasePage.getRecords())) {
+ if (!Objects.isNull(baseCasePage) && CollUtil.isNotEmpty(baseCasePage.getRecords())) {
List<BaseCase> records = baseCasePage.getRecords();
+ //TODO:灏嗙姸鎬乻tate鏀逛负鐘舵�佸悕stateName
+ records.stream().forEach(baseCase -> {
+ Integer stateInt = baseCase.getState();
+ if (stateInt == 0) {
+ baseCase.setStateName("寰呭鐞�");
+ } else if (stateInt == 1) {
+ baseCase.setStateName("鎶ヨ");
+ } else if (stateInt == 2) {
+ baseCase.setStateName("涓婃姤");
+ } else if (stateInt == 3) {
+ baseCase.setStateName("鍦ㄥ涔�");
+ } else if (stateInt == 4) {
+ baseCase.setStateName("鏆備笉澶勭悊");
+ } else if (stateInt == 5) {
+ baseCase.setStateName("绔嬫");
+ } else if (stateInt == 6) {
+ baseCase.setStateName("璋冨害");
+ } else if (stateInt == 7) {
+ baseCase.setStateName("澶勭疆");
+ } else if (stateInt == 8) {
+ baseCase.setStateName("鏍告煡");
+ } else if (stateInt == 9) {
+ baseCase.setStateName("缁撴");
+ } else if (stateInt == 10) {
+ baseCase.setStateName("寰呬笂鎶�");
+ }
+ });
Set<Long> caseIds = records.stream().map(BaseCase::getId).collect(Collectors.toSet());
Map<Long, String> urlMap = imageResourcesService.getUrlMap(caseIds, "01");
records.stream().forEach(item -> {
@@ -445,8 +475,8 @@
}
@Override
- 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);
+ public Page<BaseCaseVO> selectVideoInspection(Integer current, Integer pageSize, Long gradeId, Long videoId, String beginTime, String endTime, Integer type) {
+ return baseCaseMapper.selectVideoInspection(new Page<>(current, pageSize), gradeId, videoId, beginTime, endTime, type);
}
@Override
@@ -620,7 +650,7 @@
registerState.add(BaseCaseStatus.REPORT);
Long registerLastMonthCount = baseCaseMapper.selectLastMonthCount(registerState);
Long registerRecentlyMonthCount = baseCaseMapper.selectRecentlyMonthCount(registerState);
- System.out.println(disposeRecentlyMonthCount);
+// System.out.println(disposeRecentlyMonthCount);
Double v3 = (registerRecentlyMonthCount - registerLastMonthCount) * 1.0 / registerLastMonthCount;
if (disposeLastMonthCount == 0) {
register.setRatio(null);
@@ -638,4 +668,23 @@
map.put("register", register);
return map;
}
+
+ @Override
+ public IPage<WorkOrderVO> getWorkOrder(Integer pageIndex, Integer pageSize, String keyword) {
+ if (pageIndex == null) {
+ pageIndex = 1;
+ }
+ if (pageSize == null) {
+ pageSize = 20;
+ }
+ IPage<WorkOrderVO> page = new Page<>(pageIndex, pageSize);
+ return baseCaseMapper.getWorkOrder(page, keyword);
+ }
+
+ @Override
+ public List<WorkOrderVO> getWorkOrderList(String keyword) {
+ IPage<WorkOrderVO> page = new Page<>(1, 5000);
+ IPage<WorkOrderVO> page1 = baseCaseMapper.getWorkOrder(page, keyword);
+ return page1.getRecords();
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0