From e23023b93f34286f5a807b0b85e9a0619a297ed7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 23:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java | 68 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 20 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
index 22f6f11..835edd3 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
@@ -4,6 +4,7 @@
import com.java110.api.smo.assetImport.IImportOwnerRoomSMO;
import com.java110.core.context.IPageData;
import com.java110.core.log.LoggerFactory;
+import com.java110.dto.RoomDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.entity.assetImport.ImportOwnerRoomDto;
import com.java110.entity.component.ComponentValidateResult;
@@ -72,6 +73,14 @@
return false;
}
+ private boolean hasRoomSpecialCharacters(String str) {
+ if ( str.contains("#") || str.contains("?") || str.contains("&")) {
+ return true;
+ }
+
+ return false;
+ }
+
/**
* 鏁版嵁鏍煎紡鏍￠獙
*
@@ -90,13 +99,13 @@
if (hasSpecialCharacters(importOwnerRoomDto.getUnitNum())) {
throw new IllegalArgumentException((roomIndex + 1) + "琛屽崟鍏冧腑鍖呭惈鐗规畩绗﹀彿 - # 锛� & 璇峰垹闄わ紒");
}
- if (hasSpecialCharacters(importOwnerRoomDto.getRoomNum())) {
- throw new IllegalArgumentException((roomIndex + 1) + "琛屽崟鍏冧腑鍖呭惈鐗规畩绗﹀彿 - # 锛� & 璇峰垹闄わ紒");
+ if (hasRoomSpecialCharacters(importOwnerRoomDto.getRoomNum())) {
+ throw new IllegalArgumentException((roomIndex + 1) + "琛屾埧灞嬩腑鍖呭惈鐗规畩绗﹀彿 # 锛� & 璇峰垹闄わ紒");
}
- if (!StringUtil.isNumber(importOwnerRoomDto.getLayer())) {
- throw new IllegalArgumentException((roomIndex + 1) + "琛屾ゼ灞備笉鏄湁鏁堟暟瀛�");
- }
+// if (!StringUtil.isNumber(importOwnerRoomDto.getLayer())) {
+// throw new IllegalArgumentException((roomIndex + 1) + "琛屾ゼ灞備笉鏄湁鏁堟暟瀛�");
+// }
if (!StringUtil.isNumber(importOwnerRoomDto.getLayerCount())) {
throw new IllegalArgumentException((roomIndex + 1) + "琛屾�绘ゼ灞備笉鏄湁鏁堟暟瀛�");
@@ -137,6 +146,10 @@
throw new IllegalArgumentException((roomIndex + 1) + "琛屾墜鏈哄彿涓嶈兘涓虹┖");
}
+ if (importOwnerRoomDto.getTel().length() > 11) {
+ throw new IllegalArgumentException((roomIndex + 1) + "琛屾墜鏈哄彿瓒呰繃11浣�,璇锋牳瀹�");
+ }
+
if (StringUtil.isEmpty(importOwnerRoomDto.getIdCard())) {
throw new IllegalArgumentException((roomIndex + 1) + "琛岃韩浠借瘉鍙蜂笉鑳戒负绌�");
}
@@ -147,6 +160,15 @@
if (!StringUtil.isNumber(importOwnerRoomDto.getOwnerTypeCd())) {
throw new IllegalArgumentException((roomIndex + 1) + "琛屼笟涓荤被鍨嬩笉鑳戒负绌�");
}
+
+ if(RoomDto.STATE_FREE.equals(importOwnerRoomDto.getRoomState()) && !StringUtil.isEmpty(importOwnerRoomDto.getOwnerName())){
+ throw new IllegalArgumentException((roomIndex + 1) + "琛屾埧灞嬬姸鎬佷负鏈攢鍞姸鎬侊紝涓嶈兘鍖呭惈涓氫富淇℃伅");
+ }
+
+ if(!RoomDto.STATE_FREE.equals(importOwnerRoomDto.getRoomState()) && StringUtil.isEmpty(importOwnerRoomDto.getOwnerName())){
+ throw new IllegalArgumentException((roomIndex + 1) + "琛屾埧灞嬬姸鎬佷笉鏄湭閿�鍞姸鎬侊紝蹇呴』鍖呭惈涓氫富淇℃伅");
+ }
+
// 濡傛灉鏄笟涓� 璺宠繃
if (OwnerDto.OWNER_TYPE_CD_OWNER.equals(importOwnerRoomDto.getOwnerTypeCd())) {
continue;
@@ -154,13 +176,14 @@
// 鏍￠獙鎴愬憳涔嬪墠鏄惁瀛樺湪 涓氫富瑙掕壊
hasOwnerType = false;
for (int preRoomIndex = 0; preRoomIndex < roomIndex; preRoomIndex++) {
- tmpImportOwnerRoomDto = ownerRooms.get(roomIndex);
+ tmpImportOwnerRoomDto = ownerRooms.get(preRoomIndex);
if (tmpImportOwnerRoomDto.getFloorNum().equals(importOwnerRoomDto.getFloorNum())
&& tmpImportOwnerRoomDto.getUnitNum().equals(importOwnerRoomDto.getUnitNum())
&& tmpImportOwnerRoomDto.getRoomNum().equals(importOwnerRoomDto.getRoomNum())
&& OwnerDto.OWNER_TYPE_CD_OWNER.equals(tmpImportOwnerRoomDto.getOwnerTypeCd())) {
hasOwnerType = true;
+ break;
}
}
@@ -202,17 +225,19 @@
Assert.hasValue(os[8], (osIndex + 1) + "琛屽缓绛戦潰绉笉鑳戒负绌�");
Assert.hasValue(os[9], (osIndex + 1) + "琛屽鍐呴潰绉笉鑳戒负绌�");
Assert.hasValue(os[10], (osIndex + 1) + "琛岀閲戜笉鑳戒负绌�");
- if (os.length > 11) {
- Assert.hasValue(os[11], (osIndex + 1) + "琛屼笟涓诲悕绉颁笉鑳戒负绌�");
- Assert.hasValue(os[12], (osIndex + 1) + "琛屾�у埆涓嶈兘涓虹┖");
- Assert.hasValue(os[13], (osIndex + 1) + "琛屽勾榫勪笉鑳戒负绌�");
- Assert.hasValue(os[14], (osIndex + 1) + "琛屾墜鏈哄彿涓嶈兘涓虹┖");
- Assert.hasValue(os[15], (osIndex + 1) + "琛岃韩浠借瘉涓嶈兘涓虹┖");
- Assert.hasValue(os[16], (osIndex + 1) + "琛屼笟涓荤被鍨嬩笉鑳戒负绌�");
+ Assert.hasValue(os[11], (osIndex + 1) + "琛屾埧灞嬬姸鎬佷笉鑳戒负绌�");
+ if (os.length > 12 && !StringUtil.isNullOrNone(os[12])) {
+ Assert.hasValue(os[12], (osIndex + 1) + "琛屼笟涓诲悕绉颁笉鑳戒负绌�");
+ Assert.hasValue(os[13], (osIndex + 1) + "琛屾�у埆涓嶈兘涓虹┖");
+ Assert.hasValue(os[14], (osIndex + 1) + "琛屽勾榫勪笉鑳戒负绌�");
+ Assert.hasValue(os[15], (osIndex + 1) + "琛屾墜鏈哄彿涓嶈兘涓虹┖");
+ Assert.hasValue(os[16], (osIndex + 1) + "琛岃韩浠借瘉涓嶈兘涓虹┖");
+ Assert.hasValue(os[17], (osIndex + 1) + "琛屼笟涓荤被鍨嬩笉鑳戒负绌�");
}
importOwnerRoomDto = new ImportOwnerRoomDto();
importOwnerRoomDto.setCommunityId(result.getCommunityId());
+ importOwnerRoomDto.setUserId(result.getUserId());
importOwnerRoomDto.setFloorNum(os[0].toString().trim());
importOwnerRoomDto.setUnitNum(os[1].toString().trim());
importOwnerRoomDto.setRoomNum(os[2].toString().trim());
@@ -225,16 +250,19 @@
importOwnerRoomDto.setBuiltUpArea(os[8].toString().trim());
importOwnerRoomDto.setRoomArea(os[9].toString().trim());
importOwnerRoomDto.setRoomRent(os[10].toString().trim());
- if (os.length > 11) {
- importOwnerRoomDto.setOwnerName(os[11].toString().trim());
- importOwnerRoomDto.setSex("鐢�".equals(os[12].toString().trim()) ? "0" : "1");
- String age = StringUtil.isNullOrNone(os[13]) ? CommonUtil.getAgeByCertId(os[15].toString().trim()) : os[13].toString().trim();
+ importOwnerRoomDto.setRoomState(os[11].toString().trim());
+ if (os.length > 12 && !StringUtil.isNullOrNone(os[12])) {
+ importOwnerRoomDto.setOwnerName(os[12].toString().trim());
+ importOwnerRoomDto.setSex("鐢�".equals(os[13].toString().trim()) ? "0" : "1");
+ String age = StringUtil.isNullOrNone(os[14]) ? CommonUtil.getAgeByCertId(os[16].toString().trim()) : os[14].toString().trim();
importOwnerRoomDto.setAge(age);
- importOwnerRoomDto.setTel(os[14].toString().trim());
- importOwnerRoomDto.setIdCard(os[15].toString().trim());
- importOwnerRoomDto.setOwnerTypeCd(os[16].toString().trim());
+ importOwnerRoomDto.setTel(os[15].toString().trim());
+ importOwnerRoomDto.setIdCard(os[16].toString().trim());
+ importOwnerRoomDto.setOwnerTypeCd(os[17].toString().trim());
}
+
+
ownerRoomDtos.add(importOwnerRoomDto);
}
--
Gitblit v1.8.0