From 620d850d08121f3ca8a2e3e921e94eeff4d85595 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 21 十一月 2019 16:35:32 +0800
Subject: [PATCH] 优化设备未包含小区ID查询bug
---
WebService/src/main/java/com/java110/web/smo/impl/FloorServiceSMOImpl.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/FloorServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/FloorServiceSMOImpl.java
index 79cabe7..f765ad2 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/FloorServiceSMOImpl.java
+++ b/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,
--
Gitblit v1.8.0