开发完成运营房屋查询

wuxw

2025-02-28 c1413aeb9fe5d736af38e25285ac8d88074a89bf

 service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java

@@ -19,10 +19,7 @@
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.exception.SMOException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.utils.util.*;
import com.java110.vo.api.ApiRoomDataVo;
import com.java110.vo.api.ApiRoomVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -114,7 +111,7 @@
        //校验小区楼ID和小区是否有对应关系
        int total = floorInnerServiceSMOImpl.queryFloorsCount(BeanConvertUtil.covertBean(reqJson, FloorDto.class));

        if (total < 1) {
        if (!StringUtil.isEmpty(reqJson.getString("floorId")) && total < 1) {
            throw new IllegalArgumentException("传入小区楼ID不是该小区的楼");
        }
    }
@@ -123,13 +120,11 @@
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
        RoomDto roomDto = BeanConvertUtil.covertBean(reqJson, RoomDto.class);


        //todo 员工数据权限
        String staffId = cmdDataFlowContext.getReqHeaders().get("user-id");
        DataPrivilegeStaffDto dataPrivilegeStaffDto = new DataPrivilegeStaffDto();
        dataPrivilegeStaffDto.setStaffId(staffId);
        String[] unitIds = dataPrivilegeUnitV1InnerServiceSMOImpl.queryDataPrivilegeUnitsByStaff(dataPrivilegeStaffDto);


        //todo 计算房屋ID和单元ID
        computeRoomIdAndUnitId(reqJson, unitIds, roomDto);
@@ -139,6 +134,12 @@

        //todo 商铺 两个短线方式处理 add by wuxw
        computeRoomShopFloorUnitRoomNum(reqJson, roomDto);

        //todo 处理状态
        String roomState = reqJson.getString("roomState");
        if(!StringUtil.isEmpty(roomState)){
            roomDto.setStates(roomState.split(","));
        }

        ApiRoomVo apiRoomVo = new ApiRoomVo();

@@ -255,7 +256,7 @@
        floorDto.setFloorNum(reqJson.getString("floorNum"));
        floorDto.setCommunityId(reqJson.getString("communityId"));
        List<FloorDto> floorDtos = floorInnerServiceSMOImpl.queryFloors(floorDto);
        if (floorDtos == null || floorDtos.isEmpty()) {
        if (ListUtil.isNull(floorDtos)) {
            return;
        }