From 983acc56b667c90804dbf5f46dae8f0161876380 Mon Sep 17 00:00:00 2001
From: 曾成 <121184950@qq.com>
Date: 星期六, 28 三月 2020 19:36:36 +0800
Subject: [PATCH] Merge branch 'back' of https://github.com/java110/MicroCommunity into back
---
CommunityService/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/CommunityService/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java b/CommunityService/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java
index c16c437..48dc39e 100644
--- a/CommunityService/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java
+++ b/CommunityService/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java
@@ -12,7 +12,7 @@
import com.java110.dto.PageDto;
import com.java110.dto.RoomAttrDto;
import com.java110.dto.RoomDto;
-import com.java110.dto.UserDto;
+import com.java110.dto.user.UserDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -74,6 +74,11 @@
List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
for (RoomDto room : rooms) {
+ try {
+ room.setApartmentName(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);
}
return rooms;
@@ -180,6 +185,11 @@
List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
for (RoomDto room : rooms) {
+ try {
+ room.setApartmentName(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);
}
return rooms;
@@ -218,6 +228,12 @@
List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
for (RoomDto room : rooms) {
+ //澶勭悊涓嬫埛鍨嬭浆涔夐棶棰�
+ try {
+ room.setApartmentName(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);
}
return rooms;
--
Gitblit v1.8.0