From b09e1a8b036553d1e161d127aa738a504593490a Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期三, 19 二月 2020 12:14:55 +0800
Subject: [PATCH] 优化巡检路线查询sql

---
 CommunityService/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 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 250dc78..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,9 @@
 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;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -32,6 +34,8 @@
  **/
 @RestController
 public class RoomInnerServiceSMOImpl extends BaseServiceSMO implements IRoomInnerServiceSMO {
+
+    private static final Logger logger = LoggerFactory.getLogger(RoomInnerServiceSMOImpl.class);
 
     @Autowired
     private IRoomServiceDao roomServiceDaoImpl;
@@ -70,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;
@@ -176,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;
@@ -214,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;
@@ -228,10 +248,7 @@
         if (rooms == null || rooms.size() == 0) {
             return rooms;
         }
-        //澶勭悊涓嬫埛鍨嬭浆涔夐棶棰�
-        for(RoomDto roomds:rooms){
-            roomds.setApartment(MappingCache.getValue(roomds.getApartment().substring(0,2).toString())+MappingCache.getValue(roomds.getApartment().substring(2,5).toString()));
-        }
+
         String[] roomIds = getRoomIds(rooms);
         Map attrParamInfo = new HashMap();
         attrParamInfo.put("roomIds", roomIds);
@@ -243,6 +260,12 @@
         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);
         }
         return rooms;

--
Gitblit v1.8.0