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 | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 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 cd029cd..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,22 +1,23 @@
package com.java110.community.smo.impl;
-
import com.java110.community.dao.IRoomAttrServiceDao;
import com.java110.community.dao.IRoomServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
+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;
@@ -81,13 +82,19 @@
for (RoomDto room : rooms) {
try {
- room.setApartmentName(MappingCache.getValue(room.getApartment().substring(0, 2).toString()) + MappingCache.getValue(room.getApartment().substring(2, 4).toString()));
+ 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;
+ }
+
+ @Override
+ public int updateRooms(@RequestBody RoomPo roomPo) {
+ roomServiceDaoImpl.updateRoomInfoInstance(BeanConvertUtil.beanCovertMap(roomPo));
+ return 1;
}
/**
@@ -285,12 +292,12 @@
public List<ImportRoomFee> freshRoomIds(@RequestBody List<ImportRoomFee> importRoomFees) {
for (ImportRoomFee importRoomFee : importRoomFees) {
List<Map> infos = null;
- if(!StringUtil.isEmpty(importRoomFee.getRoomId()) && !importRoomFee.getRoomId().startsWith("-")){
+ if (!StringUtil.isEmpty(importRoomFee.getRoomId()) && !importRoomFee.getRoomId().startsWith("-")) {
Map paramIn = new HashMap();
- paramIn.put("communityId",importRoomFee.getCommunityId());
- paramIn.put("roomId",importRoomFee.getRoomId());
+ paramIn.put("communityId", importRoomFee.getCommunityId());
+ paramIn.put("roomId", importRoomFee.getRoomId());
infos = roomServiceDaoImpl.getRoomInfos(BeanConvertUtil.beanCovertMap(importRoomFee));
- }else{
+ } else {
infos = roomServiceDaoImpl.getRoomInfos(BeanConvertUtil.beanCovertMap(importRoomFee));
}
@@ -306,6 +313,21 @@
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