From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java
index d059400..5a486e2 100755
--- a/service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java
@@ -1,6 +1,5 @@
package com.java110.community.smo.impl;
-
import com.java110.community.dao.IRoomAttrServiceDao;
import com.java110.community.dao.IRoomServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
@@ -8,10 +7,12 @@
import com.java110.dto.PageDto;
import com.java110.dto.RoomAttrDto;
import com.java110.dto.RoomDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.user.UserDto;
import com.java110.entity.assetImport.ImportCustomCreateFeeDto;
import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.room.RoomPo;
import com.java110.utils.cache.MappingCache;
@@ -50,6 +51,9 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+ @Autowired
+ private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
+
@Override
public List<RoomDto> queryRooms(@RequestBody RoomDto roomDto) {
@@ -64,6 +68,10 @@
List<RoomDto> rooms = BeanConvertUtil.covertBeanList(roomServiceDaoImpl.getRoomInfoByCommunityId(BeanConvertUtil.beanCovertMap(roomDto)), RoomDto.class);
if (rooms == null || rooms.size() == 0) {
+ return rooms;
+ }
+
+ if (rooms.size() > 50) {
return rooms;
}
@@ -254,33 +262,31 @@
@Override
public List<RoomDto> queryRoomsByOwner(@RequestBody RoomDto roomDto) {
- List<RoomDto> rooms = BeanConvertUtil.covertBeanList(roomServiceDaoImpl.getRoomInfoByOwner(BeanConvertUtil.beanCovertMap(roomDto)),
- RoomDto.class);
+// List<RoomDto> rooms = BeanConvertUtil.covertBeanList(roomServiceDaoImpl.getRoomInfoByOwner(BeanConvertUtil.beanCovertMap(roomDto)),
+// RoomDto.class);
+//
+// if (rooms == null || rooms.size() == 0) {
+// return rooms;
+// }
- if (rooms == null || rooms.size() == 0) {
- return rooms;
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setOwnerId(roomDto.getOwnerId());
+ ownerRoomRelDto.setOwnerNameLike(roomDto.getOwnerNameLike());
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+ if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) {
+ return new ArrayList<>();
}
- String[] roomIds = getRoomIds(rooms);
- Map attrParamInfo = new HashMap();
- attrParamInfo.put("roomIds", roomIds);
- attrParamInfo.put("statusCd", StatusConstant.STATUS_CD_VALID);
- List<RoomAttrDto> roomAttrDtos = BeanConvertUtil.covertBeanList(roomAttrServiceDaoImpl.getRoomAttrInfo(attrParamInfo), RoomAttrDto.class);
-
- String[] userIds = getUserIds(rooms);
- //鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
- List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
-
- for (RoomDto room : rooms) {
- //澶勭悊涓嬫埛鍨嬭浆涔夐棶棰�
- try {
- room.setApartment(MappingCache.getValue(room.getApartment().substring(0, 2).toString()) + MappingCache.getValue(room.getApartment().substring(2, 5).toString()));
- } catch (Exception e) {
- logger.error("璁剧疆鎴垮眿鎴峰瀷澶辫触", e);
- }
- refreshRoom(room, users, roomAttrDtos);
+ List<String> roomIds = new ArrayList<>();
+ for (OwnerRoomRelDto tmpOwnerRoomRelDto : ownerRoomRelDtos) {
+ roomIds.add(tmpOwnerRoomRelDto.getRoomId());
}
- return rooms;
+ RoomDto tmpRoomDto = new RoomDto();
+ tmpRoomDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
+ tmpRoomDto.setRoomNum(roomDto.getRoomNum());
+ tmpRoomDto.setCommunityId(roomDto.getCommunityId());
+ return queryRooms(tmpRoomDto);
+
}
/**
--
Gitblit v1.8.0