From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java | 67 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 16 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 48dc39e..cd029cd 100644
--- 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,18 +1,20 @@
package com.java110.community.smo.impl;
-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;
-import com.java110.core.smo.room.IRoomInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.RoomAttrDto;
import com.java110.dto.RoomDto;
import com.java110.dto.user.UserDto;
+import com.java110.entity.assetImport.ImportRoomFee;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.StatusConstant;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,14 +70,18 @@
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);
+ List<UserDto> users = null;
+ if (rooms.size() < 2) {
+ String[] userIds = getUserIds(rooms);
+ //鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
+ users = userInnerServiceSMOImpl.getUserInfo(userIds);
+ } else {
+ users = new ArrayList<>();
+ }
for (RoomDto room : rooms) {
try {
- room.setApartmentName(MappingCache.getValue(room.getApartment().substring(0, 2).toString()) + MappingCache.getValue(room.getApartment().substring(2, 5).toString()));
+ room.setApartmentName(MappingCache.getValue(room.getApartment().substring(0, 2).toString()) + MappingCache.getValue(room.getApartment().substring(2, 4).toString()));
} catch (Exception e) {
logger.error("璁剧疆鎴垮眿鎴峰瀷澶辫触", e);
}
@@ -102,19 +108,17 @@
return;
}
+ List<RoomAttrDto> tmpRoomAttrDtos = new ArrayList<>();
for (RoomAttrDto roomAttrDto : roomAttrDtos) {
if (!roomAttrDto.getRoomId().equals(room.getRoomId())) {
continue;
}
-
- List<RoomAttrDto> tmpRoomAttrDtos = room.getRoomAttrDto();
-
- if (tmpRoomAttrDtos == null) {
- tmpRoomAttrDtos = new ArrayList<>();
+ if (StringUtil.isEmpty(roomAttrDto.getValueName())) {
+ roomAttrDto.setValueName(roomAttrDto.getValue());
}
-
tmpRoomAttrDtos.add(roomAttrDto);
}
+ room.setRoomAttrDto(tmpRoomAttrDtos);
}
/**
@@ -271,6 +275,37 @@
return rooms;
}
+ /**
+ * 鍒锋柊roomId
+ *
+ * @param importRoomFees 鏁版嵁瀵硅薄鍒嗕韩
+ * @return
+ */
+ @Override
+ public List<ImportRoomFee> freshRoomIds(@RequestBody List<ImportRoomFee> importRoomFees) {
+ for (ImportRoomFee importRoomFee : importRoomFees) {
+ List<Map> infos = null;
+ if(!StringUtil.isEmpty(importRoomFee.getRoomId()) && !importRoomFee.getRoomId().startsWith("-")){
+ Map paramIn = new HashMap();
+ paramIn.put("communityId",importRoomFee.getCommunityId());
+ paramIn.put("roomId",importRoomFee.getRoomId());
+ infos = roomServiceDaoImpl.getRoomInfos(BeanConvertUtil.beanCovertMap(importRoomFee));
+ }else{
+ infos = roomServiceDaoImpl.getRoomInfos(BeanConvertUtil.beanCovertMap(importRoomFee));
+ }
+
+ if (infos == null || infos.size() < 1) {
+ continue;
+ }
+ importRoomFee.setRoomId(infos.get(0).get("roomId").toString());
+ importRoomFee.setFloorNum(infos.get(0).get("floorNum").toString());
+ importRoomFee.setUnitNum(infos.get(0).get("unitNum").toString());
+ importRoomFee.setRoomNum(infos.get(0).get("roomNum").toString());
+
+ }
+ return importRoomFees;
+ }
+
public IRoomServiceDao getRoomServiceDaoImpl() {
return roomServiceDaoImpl;
}
--
Gitblit v1.8.0