From a9c836c2f0ccb5b44b005682aecb278a4709f502 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 28 三月 2020 18:57:14 +0800
Subject: [PATCH] 优化 巡检查询功能
---
CommunityService/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 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 2f79f54..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
@@ -1,8 +1,9 @@
package com.java110.community.smo.impl;
-import com.java110.common.constant.StatusConstant;
-import com.java110.common.util.BeanConvertUtil;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.StatusConstant;
+import com.java110.utils.util.BeanConvertUtil;
import com.java110.community.dao.IRoomAttrServiceDao;
import com.java110.community.dao.IRoomServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
@@ -11,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 +35,8 @@
@RestController
public class RoomInnerServiceSMOImpl extends BaseServiceSMO implements IRoomInnerServiceSMO {
+ private static final Logger logger = LoggerFactory.getLogger(RoomInnerServiceSMOImpl.class);
+
@Autowired
private IRoomServiceDao roomServiceDaoImpl;
@@ -50,7 +55,6 @@
if (page != PageDto.DEFAULT_PAGE) {
roomDto.setPage((page - 1) * roomDto.getRow());
- roomDto.setRow(page * roomDto.getRow());
}
List<RoomDto> rooms = BeanConvertUtil.covertBeanList(roomServiceDaoImpl.getRoomInfoByCommunityId(BeanConvertUtil.beanCovertMap(roomDto)), RoomDto.class);
@@ -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;
@@ -157,7 +166,6 @@
if (page != PageDto.DEFAULT_PAGE) {
roomDto.setPage((page - 1) * roomDto.getRow());
- roomDto.setRow(page * roomDto.getRow());
}
List<RoomDto> rooms = BeanConvertUtil.covertBeanList(roomServiceDaoImpl.getRoomInfoWithOutSellByCommunityId(BeanConvertUtil.beanCovertMap(roomDto)), RoomDto.class);
@@ -177,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;
@@ -196,7 +209,6 @@
if (page != PageDto.DEFAULT_PAGE) {
roomDto.setPage((page - 1) * roomDto.getRow());
- roomDto.setRow(page * roomDto.getRow());
}
List<RoomDto> rooms = BeanConvertUtil.covertBeanList(roomServiceDaoImpl.getRoomInfoWithSellByCommunityId(BeanConvertUtil.beanCovertMap(roomDto)), RoomDto.class);
@@ -216,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;
@@ -230,6 +248,7 @@
if (rooms == null || rooms.size() == 0) {
return rooms;
}
+
String[] roomIds = getRoomIds(rooms);
Map attrParamInfo = new HashMap();
attrParamInfo.put("roomIds", roomIds);
@@ -241,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