From 87bbd103ea381623f98edb327d8e4d22691016ec Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期二, 15 十月 2019 16:30:06 +0800
Subject: [PATCH] 处理户型转义问题
---
CommunityService/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 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 f79b0bb..250dc78 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;
@@ -50,7 +51,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);
@@ -157,7 +157,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);
@@ -183,10 +182,56 @@
}
@Override
+ public int queryRoomsWithSellCount(@RequestBody RoomDto roomDto) {
+ return roomServiceDaoImpl.queryRoomsWithSellByCommunityIdCount(BeanConvertUtil.beanCovertMap(roomDto));
+ }
+
+ @Override
+ public List<RoomDto> queryRoomsWithSell(@RequestBody RoomDto roomDto) {
+
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+ int page = roomDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ roomDto.setPage((page - 1) * roomDto.getRow());
+ }
+
+ List<RoomDto> rooms = BeanConvertUtil.covertBeanList(roomServiceDaoImpl.getRoomInfoWithSellByCommunityId(BeanConvertUtil.beanCovertMap(roomDto)), RoomDto.class);
+
+ if (rooms == null || rooms.size() == 0) {
+ return rooms;
+ }
+
+ 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) {
+ refreshRoom(room, users, roomAttrDtos);
+ }
+ return rooms;
+ }
+
+ @Override
public List<RoomDto> queryRoomsByOwner(@RequestBody RoomDto roomDto) {
- List<RoomDto> rooms = BeanConvertUtil.covertBeanList(roomServiceDaoImpl.getRoomInfoByCommunityId(BeanConvertUtil.beanCovertMap(roomDto)),
+ List<RoomDto> rooms = BeanConvertUtil.covertBeanList(roomServiceDaoImpl.getRoomInfoByOwner(BeanConvertUtil.beanCovertMap(roomDto)),
RoomDto.class);
+
+ 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);
--
Gitblit v1.8.0