优化设备未包含小区ID查询bug

wuxw

2019-11-21 620d850d08121f3ca8a2e3e921e94eeff4d85595

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

@@ -1,14 +1,14 @@
package com.java110.web.smo.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.common.constant.PrivilegeCodeConstant;
import com.java110.common.constant.ResponseConstant;
import com.java110.common.constant.ServiceConstant;
import com.java110.common.exception.SMOException;
import com.java110.common.util.Assert;
import com.java110.common.util.StringUtil;
import com.java110.utils.constant.PrivilegeCodeConstant;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.exception.SMOException;
import com.java110.utils.util.Assert;
import com.java110.core.context.IPageData;
import com.java110.web.core.BaseComponentSMO;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.core.component.BaseComponentSMO;
import com.java110.web.smo.IFloorServiceSMO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,6 +34,26 @@

    @Autowired
    private RestTemplate restTemplate;

    /**
     * 查询 楼栋
     * @param pd 页面数据封装对象
     * @return 返回 ResponseEntity对象包含 http状态 信息 body信息
     */
    public ResponseEntity<String> getFloor(IPageData pd){
        JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
        paramIn.put("page",1);
        paramIn.put("row",1);
        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);

        ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);

        ResponseEntity responseEntity = this.callCenterService(restTemplate, pd, "",
                ServiceConstant.SERVICE_API_URL + "/api/floor.queryFloors" +  mapToUrlParam(paramIn),
                HttpMethod.GET);

        return responseEntity;
    }

    /**
     * 查询小区楼
@@ -71,12 +91,7 @@
        String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
        //数据校验是否 商户是否入驻该小区
        super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/floor.queryFloors?row=" + rows + "&page=" + page + "&communityId="
                + communityId;

        if (!StringUtil.isEmpty(floorNum)) {
            apiUrl += "&floorNum=" + floorNum;
        }
        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/floor.queryFloors" + mapToUrlParam(paramIn);

        responseEntity = this.callCenterService(restTemplate, pd, "",
                apiUrl,