From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 17 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
old mode 100644
new mode 100755
index 48dc39e..567b6eb
--- 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,20 +1,23 @@
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.core.log.LoggerFactory;
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.ImportCustomCreateFeeDto;
+import com.java110.entity.assetImport.ImportRoomFee;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.po.room.RoomPo;
+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;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -68,10 +71,14 @@
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 {
@@ -82,6 +89,12 @@
refreshRoom(room, users, roomAttrDtos);
}
return rooms;
+ }
+
+ @Override
+ public int updateRooms(@RequestBody RoomPo roomPo) {
+ roomServiceDaoImpl.updateRoomInfoInstance(BeanConvertUtil.beanCovertMap(roomPo));
+ return 1;
}
/**
@@ -102,19 +115,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 +282,52 @@
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 List<ImportCustomCreateFeeDto> freshRoomIdsByImportCustomCreateFee(@RequestBody List<ImportCustomCreateFeeDto> importCustomCreateFeeDtos) {
+ for (ImportCustomCreateFeeDto importRoomFee : importCustomCreateFeeDtos) {
+ List<Map> infos = null;
+ infos = roomServiceDaoImpl.getRoomInfos(BeanConvertUtil.beanCovertMap(importRoomFee));
+ if (infos == null || infos.size() < 1) {
+ continue;
+ }
+ importRoomFee.setPayObjId(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 importCustomCreateFeeDtos;
+ }
+
public IRoomServiceDao getRoomServiceDaoImpl() {
return roomServiceDaoImpl;
}
--
Gitblit v1.8.0