From 22e8a676ee42c0d78b3526bcd9a635abbe8dca03 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 28 六月 2022 11:28:21 +0800
Subject: [PATCH] 优化databus bug
---
service-user/src/main/java/com/java110/user/bmo/rentingPool/impl/GetRentingPoolBMOImpl.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/bmo/rentingPool/impl/GetRentingPoolBMOImpl.java b/service-user/src/main/java/com/java110/user/bmo/rentingPool/impl/GetRentingPoolBMOImpl.java
old mode 100644
new mode 100755
index 0ec0408..d91bf14
--- a/service-user/src/main/java/com/java110/user/bmo/rentingPool/impl/GetRentingPoolBMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/bmo/rentingPool/impl/GetRentingPoolBMOImpl.java
@@ -1,6 +1,10 @@
package com.java110.user.bmo.rentingPool.impl;
+import com.java110.dto.RoomDto;
+import com.java110.dto.file.FileRelDto;
import com.java110.dto.rentingPool.RentingPoolDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.user.IRentingPoolInnerServiceSMO;
import com.java110.user.bmo.rentingPool.IGetRentingPoolBMO;
import com.java110.vo.ResultVo;
@@ -18,6 +22,13 @@
@Autowired
private IRentingPoolInnerServiceSMO rentingPoolInnerServiceSMOImpl;
+ @Autowired
+ private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+
/**
* @param rentingPoolDto
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
@@ -30,6 +41,9 @@
List<RentingPoolDto> rentingPoolDtos = null;
if (count > 0) {
rentingPoolDtos = rentingPoolInnerServiceSMOImpl.queryRentingPools(rentingPoolDto);
+
+ //鍒峰叆鎴垮眿淇℃伅
+ refreshRoomInfo(rentingPoolDtos);
} else {
rentingPoolDtos = new ArrayList<>();
}
@@ -41,4 +55,51 @@
return responseEntity;
}
+ private void refreshRoomInfo(List<RentingPoolDto> rentingPoolDtos) {
+ List<String> roomIds = new ArrayList<>();
+
+ List<String> rentingIds = new ArrayList<>();
+
+ for (RentingPoolDto rentingPoolDto : rentingPoolDtos) {
+ roomIds.add(rentingPoolDto.getRoomId());
+ rentingIds.add(rentingPoolDto.getRentingId());
+ }
+
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
+ roomDto.setCommunityId(rentingPoolDtos.get(0).getCommunityId());
+
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+
+
+ for (RoomDto tmpRoomDto : roomDtos) {
+ for (RentingPoolDto rentingPoolDto : rentingPoolDtos) {
+ if (tmpRoomDto.getRoomId().equals(rentingPoolDto.getRoomId())) {
+ rentingPoolDto.setRoomName(tmpRoomDto.getFloorNum() + "鏍�" + tmpRoomDto.getUnitNum() + "鍗曞厓" + tmpRoomDto.getRoomNum() + "瀹�");
+ rentingPoolDto.setBuiltUpArea(tmpRoomDto.getBuiltUpArea());
+ rentingPoolDto.setApartmentName(tmpRoomDto.getApartmentName());
+ }
+ }
+ }
+
+
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjIds(rentingIds.toArray(new String[rentingIds.size()]));
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+
+ //鍒峰叆鍥剧墖淇℃伅
+ List<String> photoVos = null;
+ String url = null;
+ for (RentingPoolDto rentingPoolDto : rentingPoolDtos) {
+ photoVos = new ArrayList<>();
+ for (FileRelDto tmpFileRelDto : fileRelDtos) {
+ if (rentingPoolDto.getRentingId().equals(tmpFileRelDto.getObjId())){
+ url = "/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + rentingPoolDto.getCommunityId();
+ photoVos.add(url);
+ }
+ }
+ rentingPoolDto.setPhotos(photoVos);
+ }
+ }
+
}
--
Gitblit v1.8.0