From 7015c4088027862d0e17e1d6c3913280f3bec132 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 13 八月 2022 14:13:45 +0800
Subject: [PATCH] 优化 房屋短线 最多 三个问题

---
 service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java b/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java
index 26e6c09..339310c 100644
--- a/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java
@@ -25,7 +25,6 @@
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.api.ApiRoomDataVo;
 import com.java110.vo.api.ApiRoomVo;
-import org.apache.kafka.common.protocol.types.Field;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -97,7 +96,7 @@
 //        }
         String roomId = "";
         String unitId = "";
-        if (reqJson.containsKey("flag") && !StringUtil.isEmpty(reqJson.getString("flag")) && reqJson.getString("flag").equals("0")
+        if (reqJson.containsKey("flag") && "0".equals(reqJson.getString("flag"))
                 && reqJson.containsKey("floorNum") && !StringUtil.isEmpty(reqJson.getString("floorNum"))
                 && reqJson.containsKey("unitNum") && !StringUtil.isEmpty(reqJson.getString("unitNum"))
                 && reqJson.containsKey("roomNum") && !StringUtil.isEmpty(reqJson.getString("roomNum"))) {
@@ -131,15 +130,15 @@
             roomDto.setRoomId(roomId);
             roomDto.setUnitId(unitId);
         }
-        if (reqJson.containsKey("flag") && !StringUtil.isEmpty(reqJson.getString("flag")) && reqJson.getString("flag").equals("1")) {
+        if (reqJson.containsKey("flag") && "1".equals(reqJson.getString("flag"))) {
             if (reqJson.containsKey("roomNum") && !StringUtil.isEmpty(reqJson.getString("roomNum"))) {
-                String[] roomNums = reqJson.getString("roomNum").split("-");
+                String[] roomNums = reqJson.getString("roomNum").split("-", 3);
                 if (roomNums != null && roomNums.length == 3) {
                     roomDto.setFloorNum(roomNums[0]);
                     roomDto.setUnitNum(roomNums[1]);
                     roomDto.setRoomNum(roomNums[2]);
                 } else {
-                    throw new IllegalArgumentException("鎴垮眿缂栧彿閿欒锛�");
+                    roomDto.setRoomNum(reqJson.getString("roomNum"));
                 }
             } else {
                 roomDto.setUnitNum("");

--
Gitblit v1.8.0