From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java | 427 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 398 insertions(+), 29 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java
index ac2d8a7..08b689c 100644
--- a/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java
@@ -1,11 +1,24 @@
package com.java110.community.smo.impl;
import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.FloorDto;
+import com.java110.dto.RoomDto;
+import com.java110.dto.UnitDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.entity.assetImport.ImportOwnerRoomDto;
-import com.java110.intf.community.IFloorInnerServiceSMO;
-import com.java110.intf.community.IImportOwnerRoomInnerServiceSMO;
+import com.java110.intf.community.*;
+import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
+import com.java110.po.floor.FloorPo;
+import com.java110.po.owner.OwnerPo;
+import com.java110.po.owner.OwnerRoomRelPo;
+import com.java110.po.room.RoomPo;
+import com.java110.po.unit.UnitPo;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -19,54 +32,410 @@
*/
@RestController
public class ImportOwnerRoomInnerServiceSMOImpl extends BaseServiceSMO implements IImportOwnerRoomInnerServiceSMO {
- private static Logger logger = LoggerFactory.getLogger(CommunityServiceSMOImpl.class);
+ private static Logger logger = LoggerFactory.getLogger(ImportOwnerRoomInnerServiceSMOImpl.class);
+
@Autowired
- private IFloorInnerServiceSMO floorInnerServiceSMOImpl;
+ private IFloorV1InnerServiceSMO floorV1InnerServiceSMOImpl;
@Autowired
+ private IUnitV1InnerServiceSMO unitV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
+
+ @Override
public int saveOwnerRooms(@RequestBody List<ImportOwnerRoomDto> importOwnerRoomDtos) {
+ int successCount = 0;
if (importOwnerRoomDtos == null || importOwnerRoomDtos.size() < 1) {
return 0;
}
+ List<ImportOwnerRoomDto> importOwnerRoomDtosed = new ArrayList<>();
// 1.0 鏌ョ湅 妤兼爧鏄惁瀛樺湪
-
- return 0;
- }
-
-
- private List<FloorDto> getFloorDto(List<ImportOwnerRoomDto> importOwnerRoomDtos) {
-
- List<FloorDto> floorDtos = new ArrayList<>();
- FloorDto tmpFloorDto = null;
for (ImportOwnerRoomDto importOwnerRoomDto : importOwnerRoomDtos) {
-
- if (hasInFloors(floorDtos, importOwnerRoomDto)) {
- continue;
- }
- tmpFloorDto = new FloorDto();
- tmpFloorDto.setFloorNum(importOwnerRoomDto.getFloorNum());
- tmpFloorDto.setCommunityId(importOwnerRoomDto.getCommunityId());
- floorDtos.add(tmpFloorDto);
+ successCount += doSaveOwnerRooms(importOwnerRoomDto, importOwnerRoomDtosed);
}
- return floorDtos;
+
+
+ return successCount;
}
/**
- * 鏄惁瀛樺湪 floorDtos 瀵硅薄涓�
- * @param floorDtos
+ * 瀵煎叆鏁版嵁
+ *
+ * @param importOwnerRoomDto
+ * @param importOwnerRoomDtosed
+ * @return
+ */
+ private int doSaveOwnerRooms(ImportOwnerRoomDto importOwnerRoomDto, List<ImportOwnerRoomDto> importOwnerRoomDtosed) {
+
+ //1.0 淇濆瓨妤兼爧淇℃伅
+ String floorId = doSaveFloor(importOwnerRoomDto);
+
+
+ //2.0 淇濆瓨鍗曞厓淇℃伅
+ String unitId = doSaveUnit(importOwnerRoomDto, floorId);
+
+ //3.0 淇濆瓨 鎴垮眿
+ String roomId = doSaveRoom(importOwnerRoomDto, unitId);
+
+ //娌℃湁涓氫富
+ if (StringUtil.isEmpty(importOwnerRoomDto.getOwnerName())) {
+ return 1;
+ }
+
+ //4.0 淇濆瓨涓氫富
+ if (OwnerDto.OWNER_TYPE_CD_OWNER.equals(importOwnerRoomDto.getOwnerTypeCd())) {
+ doSaveOwner(importOwnerRoomDto, roomId);
+ } else {
+ doSaveOwnerMember(importOwnerRoomDto, roomId);
+ }
+
+ return 1;
+
+ }
+
+ /**
+ * 淇濆瓨涓氫富鎴愬憳
+ *
+ * @param importOwnerRoomDto
+ * @param roomId
+ */
+ private void doSaveOwnerMember(ImportOwnerRoomDto importOwnerRoomDto, String roomId) {
+
+ // 鏌ヨ鎴垮眿鍜屼笟涓绘槸鍚︽湁鍏崇郴
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setCommunityId(importOwnerRoomDto.getCommunityId());
+ ownerRoomRelDto.setRoomId(roomId);
+ List<OwnerRoomRelDto> roomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+ if (roomRelDtos == null || roomRelDtos.size() < 1) {
+ throw new IllegalArgumentException(importOwnerRoomDto.getOwnerName() + "鎴愬憳鏈壘鍒板搴斾笟涓讳俊鎭�");
+ }
+
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setCommunityId(importOwnerRoomDto.getCommunityId());
+ ownerDto.setName(importOwnerRoomDto.getOwnerName());
+ ownerDto.setLink(importOwnerRoomDto.getTel());
+ ownerDto.setOwnerId(roomRelDtos.get(0).getOwnerId());
+ ownerDto.setOwnerTypeCd(importOwnerRoomDto.getOwnerTypeCd());
+ List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
+ OwnerPo ownerPo = null;
+
+ int flag = 0;
+ if (ownerDtos == null || ownerDtos.size() < 1) {
+ ownerPo = new OwnerPo();
+ ownerPo.setState(OwnerDto.STATE_FINISH);
+ ownerPo.setOwnerFlag(OwnerDto.OWNER_FLAG_TRUE);
+ ownerPo.setbId("-1");
+ ownerPo.setOwnerTypeCd(importOwnerRoomDto.getOwnerTypeCd());
+ ownerPo.setCommunityId(importOwnerRoomDto.getCommunityId());
+ ownerPo.setOwnerId(roomRelDtos.get(0).getOwnerId());
+ ownerPo.setName(importOwnerRoomDto.getOwnerName());
+ ownerPo.setIdCard(importOwnerRoomDto.getIdCard());
+ ownerPo.setAge(importOwnerRoomDto.getAge());
+ ownerPo.setSex(importOwnerRoomDto.getSex());
+ ownerPo.setLink(importOwnerRoomDto.getTel());
+ ownerPo.setMemberId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
+ ownerPo.setRemark("鎴夸骇瀵煎叆");
+ ownerPo.setUserId(importOwnerRoomDto.getUserId());
+ flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
+
+ if (flag < 1) {
+ throw new IllegalArgumentException("瀵煎叆涓氫富澶辫触");
+ }
+ } else {
+ ownerPo = new OwnerPo();
+ ownerPo.setState(OwnerDto.STATE_FINISH);
+ ownerPo.setOwnerFlag(OwnerDto.OWNER_FLAG_TRUE);
+ ownerPo.setbId("-1");
+ ownerPo.setOwnerTypeCd(importOwnerRoomDto.getOwnerTypeCd());
+ ownerPo.setCommunityId(importOwnerRoomDto.getCommunityId());
+ ownerPo.setOwnerId(ownerDtos.get(0).getOwnerId());
+ ownerPo.setName(importOwnerRoomDto.getOwnerName());
+ ownerPo.setIdCard(importOwnerRoomDto.getIdCard());
+ ownerPo.setAge(importOwnerRoomDto.getAge());
+ ownerPo.setSex(importOwnerRoomDto.getSex());
+ ownerPo.setLink(importOwnerRoomDto.getTel());
+ ownerPo.setMemberId(ownerDtos.get(0).getMemberId());
+ ownerPo.setRemark("鎴夸骇瀵煎叆");
+ ownerPo.setUserId(importOwnerRoomDto.getUserId());
+ flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
+ if (flag < 1) {
+ throw new IllegalArgumentException("瀵煎叆涓氫富澶辫触");
+ }
+ }
+ }
+
+ /**
+ * 淇濆瓨涓氫富
+ *
+ * @param importOwnerRoomDto
+ * @param roomId
+ */
+ private void doSaveOwner(ImportOwnerRoomDto importOwnerRoomDto, String roomId) {
+
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setCommunityId(importOwnerRoomDto.getCommunityId());
+ ownerDto.setName(importOwnerRoomDto.getOwnerName());
+ ownerDto.setLink(importOwnerRoomDto.getTel());
+ ownerDto.setOwnerTypeCd(importOwnerRoomDto.getOwnerTypeCd());
+ List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
+ OwnerPo ownerPo = null;
+ String ownerId = "";
+
+ int flag = 0;
+ if (ownerDtos == null || ownerDtos.size() < 1) {
+ ownerPo = new OwnerPo();
+ ownerPo.setState(OwnerDto.STATE_FINISH);
+ ownerPo.setOwnerFlag(OwnerDto.OWNER_FLAG_TRUE);
+ ownerPo.setbId("-1");
+ ownerPo.setOwnerTypeCd(importOwnerRoomDto.getOwnerTypeCd());
+ ownerPo.setCommunityId(importOwnerRoomDto.getCommunityId());
+ ownerPo.setOwnerId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
+ ownerPo.setName(importOwnerRoomDto.getOwnerName());
+ ownerPo.setIdCard(importOwnerRoomDto.getIdCard());
+ ownerPo.setAge(importOwnerRoomDto.getAge());
+ ownerPo.setSex(importOwnerRoomDto.getSex());
+ ownerPo.setLink(importOwnerRoomDto.getTel());
+ ownerPo.setMemberId(ownerPo.getOwnerId());
+ ownerPo.setRemark("鎴夸骇瀵煎叆");
+ ownerPo.setUserId(importOwnerRoomDto.getUserId());
+ flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
+ if (flag < 1) {
+ throw new IllegalArgumentException("瀵煎叆涓氫富澶辫触");
+ }
+
+ ownerId = ownerPo.getOwnerId();
+ } else {
+ ownerId = ownerDtos.get(0).getOwnerId();
+ ownerPo = new OwnerPo();
+ ownerPo.setState(OwnerDto.STATE_FINISH);
+ ownerPo.setOwnerFlag(OwnerDto.OWNER_FLAG_TRUE);
+ ownerPo.setbId("-1");
+ ownerPo.setOwnerTypeCd(importOwnerRoomDto.getOwnerTypeCd());
+ ownerPo.setCommunityId(importOwnerRoomDto.getCommunityId());
+ ownerPo.setOwnerId(ownerId);
+ ownerPo.setName(importOwnerRoomDto.getOwnerName());
+ ownerPo.setIdCard(importOwnerRoomDto.getIdCard());
+ ownerPo.setAge(importOwnerRoomDto.getAge());
+ ownerPo.setSex(importOwnerRoomDto.getSex());
+ ownerPo.setLink(importOwnerRoomDto.getTel());
+ ownerPo.setMemberId(ownerPo.getOwnerId());
+ ownerPo.setRemark("鎴夸骇瀵煎叆");
+ ownerPo.setUserId(importOwnerRoomDto.getUserId());
+ flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
+ if (flag < 1) {
+ throw new IllegalArgumentException("瀵煎叆涓氫富澶辫触");
+ }
+ }
+ // 鏌ヨ鎴垮眿鍜屼笟涓绘槸鍚︽湁鍏崇郴
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setCommunityId(importOwnerRoomDto.getCommunityId());
+ ownerRoomRelDto.setRoomId(roomId);
+ ownerRoomRelDto.setOwnerId(ownerId);
+ List<OwnerRoomRelDto> roomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+ if (roomRelDtos != null && roomRelDtos.size() > 0) {
+ return;
+ }
+
+ OwnerRoomRelPo ownerRoomRelPo = new OwnerRoomRelPo();
+ ownerRoomRelPo.setUserId(importOwnerRoomDto.getUserId());
+ ownerRoomRelPo.setbId("-1");
+ ownerRoomRelPo.setRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
+ ownerRoomRelPo.setState(importOwnerRoomDto.getRoomState());
+ ownerRoomRelPo.setRoomId(roomId);
+ ownerRoomRelPo.setOwnerId(ownerId);
+ ownerRoomRelPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
+ ownerRoomRelPo.setEndTime(DateUtil.LAST_TIME);
+
+ flag = ownerRoomRelV1InnerServiceSMOImpl.saveOwnerRoomRel(ownerRoomRelPo);
+ if (flag < 1) {
+ throw new IllegalArgumentException("瀵煎叆涓氫富鎴垮眿鍏崇郴澶辫触");
+ }
+ }
+
+ private String doSaveRoom(ImportOwnerRoomDto importOwnerRoomDto, String unitId) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setCommunityId(importOwnerRoomDto.getCommunityId());
+ roomDto.setRoomNum(importOwnerRoomDto.getRoomNum());
+ roomDto.setUnitId(unitId);
+ List<RoomDto> roomDtos = roomV1InnerServiceSMOImpl.queryRooms(roomDto);
+ RoomPo roomPo = null;
+ String roomId = "";
+
+ int flag = 0;
+ if (roomDtos == null || roomDtos.size() < 1) {
+ roomPo = new RoomPo();
+ //roomPo.setState(StringUtil.isEmpty(importOwnerRoomDto.getOwnerName()) ? RoomDto.STATE_FREE : RoomDto.STATE_SELL);
+ roomPo.setState(importOwnerRoomDto.getRoomState());
+ roomPo.setRoomId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
+ roomPo.setApartment(importOwnerRoomDto.getSection());
+ roomPo.setSection("1");
+ roomPo.setCommunityId(importOwnerRoomDto.getCommunityId());
+ roomPo.setBuiltUpArea(importOwnerRoomDto.getBuiltUpArea());
+ roomPo.setFeeCoefficient("1.00");
+ roomPo.setLayer(importOwnerRoomDto.getLayer());
+ roomPo.setRoomArea(importOwnerRoomDto.getRoomArea());
+ roomPo.setRoomNum(importOwnerRoomDto.getRoomNum());
+ roomPo.setRoomRent(importOwnerRoomDto.getRoomRent());
+ roomPo.setRoomSubType(importOwnerRoomDto.getRoomSubType());
+ roomPo.setRoomType("0".equals(importOwnerRoomDto.getUnitNum()) ? RoomDto.ROOM_TYPE_SHOPS : RoomDto.ROOM_TYPE_ROOM);
+ roomPo.setUnitId(unitId);
+ roomPo.setRemark("鎴夸骇瀵煎叆");
+ roomPo.setUserId(importOwnerRoomDto.getUserId());
+ flag = roomV1InnerServiceSMOImpl.saveRoom(roomPo);
+
+ if (flag < 1) {
+ throw new IllegalArgumentException("瀵煎叆鎴垮眿澶辫触");
+ }
+
+ roomId = roomPo.getRoomId();
+ } else {
+ roomId = roomDtos.get(0).getRoomId();
+ if (OwnerDto.OWNER_TYPE_CD_OWNER.equals(importOwnerRoomDto.getOwnerTypeCd()) || StringUtil.isEmpty(importOwnerRoomDto.getOwnerName())) {
+ roomPo = new RoomPo();
+ roomPo.setState(importOwnerRoomDto.getRoomState());
+ roomPo.setRoomId(roomId);
+ roomPo.setApartment(importOwnerRoomDto.getSection());
+ roomPo.setSection("1");
+ roomPo.setCommunityId(importOwnerRoomDto.getCommunityId());
+ roomPo.setBuiltUpArea(importOwnerRoomDto.getBuiltUpArea());
+ roomPo.setFeeCoefficient("1.00");
+ roomPo.setLayer(importOwnerRoomDto.getLayer());
+ roomPo.setRoomArea(importOwnerRoomDto.getRoomArea());
+ roomPo.setRoomNum(importOwnerRoomDto.getRoomNum());
+ roomPo.setRoomRent(importOwnerRoomDto.getRoomRent());
+ roomPo.setRoomSubType(importOwnerRoomDto.getRoomSubType());
+ roomPo.setRoomType("0".equals(importOwnerRoomDto.getUnitNum()) ? RoomDto.ROOM_TYPE_SHOPS : RoomDto.ROOM_TYPE_ROOM);
+ roomPo.setUnitId(unitId);
+ roomPo.setRemark("鎴夸骇瀵煎叆");
+ roomPo.setUserId(importOwnerRoomDto.getUserId());
+ flag = roomV1InnerServiceSMOImpl.updateRoom(roomPo);
+ if (flag < 1) {
+ throw new IllegalArgumentException("瀵煎叆鎴垮眿澶辫触");
+ }
+ }
+ }
+ return roomId;
+
+ }
+
+ /**
+ * 淇濆瓨鍗曞厓淇℃伅
+ *
+ * @param importOwnerRoomDto
+ * @param floorId
+ * @return
+ */
+ private String doSaveUnit(ImportOwnerRoomDto importOwnerRoomDto, String floorId) {
+
+ UnitDto unitDto = new UnitDto();
+ unitDto.setCommunityId(importOwnerRoomDto.getCommunityId());
+ unitDto.setUnitNum(importOwnerRoomDto.getUnitNum());
+ unitDto.setFloorId(floorId);
+ List<UnitDto> unitDtos = unitV1InnerServiceSMOImpl.queryUnits(unitDto);
+ UnitPo unitPo = null;
+ String unitId = "";
+
+ int flag = 0;
+ if (unitDtos == null || unitDtos.size() < 1) {
+ unitPo = new UnitPo();
+ unitPo.setFloorId(floorId);
+ unitPo.setLayerCount(importOwnerRoomDto.getLayerCount());
+ unitPo.setLift(importOwnerRoomDto.getLift());
+ unitPo.setUnitId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_unitId));
+ unitPo.setUnitArea("1");
+ unitPo.setUnitNum(importOwnerRoomDto.getUnitNum());
+ unitPo.setRemark("鎴夸骇瀵煎叆");
+ unitPo.setUserId(importOwnerRoomDto.getUserId());
+ flag = unitV1InnerServiceSMOImpl.saveUnit(unitPo);
+
+ if (flag < 1) {
+ throw new IllegalArgumentException("瀵煎叆鍗曞厓澶辫触");
+ }
+
+ unitId = unitPo.getUnitId();
+ } else {
+ unitId = unitDtos.get(0).getUnitId();
+ if (OwnerDto.OWNER_TYPE_CD_OWNER.equals(importOwnerRoomDto.getOwnerTypeCd()) || StringUtil.isEmpty(importOwnerRoomDto.getOwnerName())) {
+ unitPo = new UnitPo();
+ unitPo.setFloorId(floorId);
+ unitPo.setLayerCount(importOwnerRoomDto.getLayerCount());
+ unitPo.setLift(importOwnerRoomDto.getLift());
+ unitPo.setUnitId(unitId);
+ unitPo.setUnitArea("1");
+ unitPo.setUnitNum(importOwnerRoomDto.getUnitNum());
+ unitPo.setRemark("鎴夸骇瀵煎叆");
+ unitPo.setUserId(importOwnerRoomDto.getUserId());
+ flag = unitV1InnerServiceSMOImpl.updateUnit(unitPo);
+ if (flag < 1) {
+ throw new IllegalArgumentException("瀵煎叆鍗曞厓澶辫触");
+ }
+ }
+ }
+ return unitId;
+ }
+
+ /**
+ * 淇濆瓨妤兼爧淇℃伅
+ *
* @param importOwnerRoomDto
* @return
*/
- private boolean hasInFloors(List<FloorDto> floorDtos, ImportOwnerRoomDto importOwnerRoomDto) {
- for (FloorDto floorDto : floorDtos) {
- if (importOwnerRoomDto.getFloorNum().equals(floorDto.getFloorNum())) {
- return true;
+ private String doSaveFloor(ImportOwnerRoomDto importOwnerRoomDto) {
+ FloorDto floorDto = new FloorDto();
+ floorDto.setCommunityId(importOwnerRoomDto.getCommunityId());
+ floorDto.setFloorNum(importOwnerRoomDto.getFloorNum());
+ List<FloorDto> floorDtos = floorV1InnerServiceSMOImpl.queryFloors(floorDto);
+ FloorPo floorPo = null;
+ String floorId = "";
+
+ int flag = 0;
+ if (floorDtos == null || floorDtos.size() < 1) {
+ floorPo = new FloorPo();
+ floorPo.setbId("-1");
+ floorPo.setCommunityId(importOwnerRoomDto.getCommunityId());
+ floorPo.setFloorArea("1");
+ floorPo.setFloorId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_floorId));
+ floorPo.setFloorNum(importOwnerRoomDto.getFloorNum());
+ floorPo.setName(importOwnerRoomDto.getFloorNum()+"鏍�");
+ floorPo.setRemark("鎴夸骇瀵煎叆");
+ floorPo.setUserId(importOwnerRoomDto.getUserId());
+ flag = floorV1InnerServiceSMOImpl.saveFloor(floorPo);
+
+ if (flag < 1) {
+ throw new IllegalArgumentException("瀵煎叆妤兼爧澶辫触");
+ }
+
+ floorId = floorPo.getFloorId();
+ } else {
+ floorId = floorDtos.get(0).getFloorId();
+ if (OwnerDto.OWNER_TYPE_CD_OWNER.equals(importOwnerRoomDto.getOwnerTypeCd()) || StringUtil.isEmpty(importOwnerRoomDto.getOwnerName())) {
+ floorPo = new FloorPo();
+ //floorPo.setbId("-1");
+ floorPo.setCommunityId(importOwnerRoomDto.getCommunityId());
+ //floorPo.setFloorArea("1");
+ floorPo.setFloorId(floorId);
+ floorPo.setFloorNum(importOwnerRoomDto.getFloorNum());
+ floorPo.setName(importOwnerRoomDto.getFloorNum()+"鏍�");
+ floorPo.setRemark("鎴夸骇瀵煎叆");
+ floorPo.setUserId(importOwnerRoomDto.getUserId());
+ flag = floorV1InnerServiceSMOImpl.updateFloor(floorPo);
+ if (flag < 1) {
+ throw new IllegalArgumentException("瀵煎叆妤兼爧澶辫触");
+ }
}
}
- return false;
+ return floorId;
}
+
}
--
Gitblit v1.8.0