定位房屋时加入小区楼编号定位

Api/src/main/java/com/java110/api/listener/room/QueryRoomsWithOutSellListener.java

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -57,6 +58,9 @@ public class QueryRoomsWithOutSellListener extends AbstractServiceApiDataFlowLis
         JSONObject reqJson = dataFlowContext.getReqJson();
         validateRoomData(reqJson);
 
+        //将小区楼ID刷入到 请求参数中
+        freshFloorIdToParam(reqJson);
+
         RoomDto roomDto = BeanConvertUtil.covertBean(reqJson, RoomDto.class);
 
         ApiRoomVo apiRoomVo = new ApiRoomVo();
@@ -74,6 +78,32 @@ public class QueryRoomsWithOutSellListener extends AbstractServiceApiDataFlowLis
         dataFlowContext.setResponseEntity(responseEntity);
     }
 
+    /**
+     * 将floorNum 转化为 floorId 刷入到入参对象中
+     *
+     * @param reqJson 入参对象
+     */
+    private void freshFloorIdToParam(JSONObject reqJson) {
+
+        FloorDto floorDto = BeanConvertUtil.covertBean(reqJson, FloorDto.class);
+        String floorId = "";
+        //检查 请求报文中是否有floorNum 小区楼编号，如果没有就随机选一个
+        try {
+            if (!reqJson.containsKey("floorNum") || StringUtils.isEmpty(reqJson.getString("floorNum"))) {
+
+                List<FloorDto> floorDtos = floorInnerServiceSMOImpl.queryFloors(floorDto);
+
+                if (floorDtos.size() == 0) {
+                    return;
+                }
+
+                floorId = floorDtos.get(0).getFloorId();
+            }
+        } finally {
+            reqJson.put("floorId", floorId);
+        }
+    }
+
     /**
      * 校验小区房屋查询入参信息
      *
@@ -81,7 +111,6 @@ public class QueryRoomsWithOutSellListener extends AbstractServiceApiDataFlowLis
      */
     private void validateRoomData(JSONObject reqJson) {
         Assert.jsonObjectHaveKey(reqJson, "communityId", "请求中未包含communityId信息");
-        Assert.jsonObjectHaveKey(reqJson, "floorId", "请求中未包含communityId信息");
         Assert.jsonObjectHaveKey(reqJson, "page", "请求报文中未包含page节点");
         Assert.jsonObjectHaveKey(reqJson, "row", "请求报文中未包含row节点");
 

WebService/src/main/java/com/java110/web/smo/impl/RoomServiceSMOImpl.java

@@ -185,7 +185,6 @@ public class RoomServiceSMOImpl extends BaseComponentSMO implements IRoomService
      */
     private void validateListRoom(IPageData pd) {
         Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "请求报文中未包含communityId节点");
-        Assert.jsonObjectHaveKey(pd.getReqData(), "floorId", "请求报文中未包含floorId节点");
         Assert.jsonObjectHaveKey(pd.getReqData(), "page", "请求报文中未包含page节点");
         Assert.jsonObjectHaveKey(pd.getReqData(), "row", "请求报文中未包含rows节点");
 

WebService/src/main/resources/components/search-room/searchRoom.html

@@ -13,12 +13,14 @@
                         <div class="ibox ">
                             <div class="row">
 
-                                <div class="col-sm-7 m-b-xs">
-
+                                <div class="col-sm-6 m-b-xs">
+                                    <div class="input-group">
+                                        <input placeholder="输入小区楼编号，必填" type="text" v-model="searchRoomInfo._currentFloorNum" class="form-control form-control-sm">
+                                    </div>
                                 </div>
-                                <div class="col-sm-5">
+                                <div class="col-sm-6">
                                     <div class="input-group">
-                                        <input placeholder="输入房屋名称" type="text" v-model="searchRoomInfo._currentRoomNum" class="form-control form-control-sm">
+                                        <input placeholder="输入房屋编号" type="text" v-model="searchRoomInfo._currentRoomNum" class="form-control form-control-sm">
                                         <span class="input-group-append">
                                                 <button type="button" class="btn btn-sm btn-primary" v-on:click="searchRooms()">查询</button>
                                             </span>

WebService/src/main/resources/components/search-room/searchRoom.js

@@ -8,6 +8,7 @@
             searchRoomInfo:{
                 rooms:[],
                 _currentRoomNum:'',
+                _currentFloorNum:'',
             }
         },
         _initMethod:function(){
@@ -23,12 +24,19 @@
         },
         methods:{
             _loadAllRoomInfo:function(_page,_row,_roomNum){
+
+                if(vc.component.searchRoomInfo._currentFloorNum == ''){
+                    vc.message("未填写小区楼编号");
+                    return ;
+                }
+
                 var param = {
                     params:{
                         page:_page,
                         row:_row,
                         communityId:vc.getCurrentCommunity().communityId,
-                        roomNum:_roomNum
+                        roomNum:_roomNum,
+                        floorNum:vc.component.searchRoomInfo._currentFloorNum
                     }
                 };
 

WebService/src/main/resources/components/sell-room-other/sellRoomOther.js

@@ -17,7 +17,7 @@
         _initEvent:function(){
             vc.on('sellRoomOther','listOwnerData',function(_owner){
                 //vc.component.ownerInfo = _owner;
-                vc.component.otherInfo.ownerId = ownerId;
+                vc.component.otherInfo.ownerId = _owner.ownerId;
             });
 
         },

WebService/src/main/resources/components/sell-room-select-room/sellRoomSelectRoom.js

@@ -21,15 +21,15 @@
 
         },
         _initEvent:function(){
-            vc.on('memberSelectOwner','chooseOwner',function(_owner){
-                vc.component.ownerInfo = _owner;
+            vc.on('memberSelectRoom','chooseRoom',function(_room){
+                vc.component.roomInfo = _room;
             });
 
         },
         methods:{
 
-            openSearchOwnerModel(){
-                vc.emit('searchOwner','openSearchOwnerModel',{});
+            openSearchRoomModel(){
+                vc.emit('searchRoom','openSearchRoomModel',{});
             }
         }
     });

java110-db/src/main/resources/mapper/floor/FloorServiceDaoImplMapper.xml

@@ -211,7 +211,9 @@ and t.b_id= #{bId}
             </if>
             AND f.`status_cd` = '0'
             AND cm.`status_cd` = '0'
-            LIMIT #{page}, #{row}
+            <if test="page != -1">
+                LIMIT #{page}, #{row}
+            </if>
     </select>