From 4367e8ad1c9208c7c0c4cbad97874a0524a0481b Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 11 八月 2022 16:58:23 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 c81d7ed..95a1657 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
@@ -73,6 +73,14 @@
return false;
}
+ private boolean hasRoomSpecialCharacters(String str) {
+ if ( str.contains("#") || str.contains("?") || str.contains("&")) {
+ return true;
+ }
+
+ return false;
+ }
+
/**
* 鏁版嵁鏍煎紡鏍￠獙
*
@@ -91,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) + "琛屾�绘ゼ灞備笉鏄湁鏁堟暟瀛�");
@@ -138,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) + "琛岃韩浠借瘉鍙蜂笉鑳戒负绌�");
}
--
Gitblit v1.8.0