From 9e29441646434d9f54a2c3e855a724633885d8a4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 13 八月 2019 19:43:49 +0800
Subject: [PATCH] 缓存开发测试完成
---
WebService/src/main/java/com/java110/web/smo/impl/FloorServiceSMOImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 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 f81d53a..9edd935 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
@@ -6,7 +6,9 @@
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.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
import com.java110.web.core.BaseComponentSMO;
import com.java110.web.smo.IFloorServiceSMO;
import org.slf4j.Logger;
@@ -29,10 +31,30 @@
private static Logger logger = LoggerFactory.getLogger(FloorServiceSMOImpl.class);
- private static final int MAX_ROW = 50;
+
@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;
+ }
/**
* 鏌ヨ灏忓尯妤�
@@ -42,10 +64,12 @@
*/
@Override
public ResponseEntity<String> listFloor(IPageData pd) {
-
- validateListFloor(pd);
-
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ if(paramIn.containsKey("row")){
+ paramIn.put("rows",paramIn.getString("row"));
+ }
+ validateListFloor(pd,paramIn);
+
int page = Integer.parseInt(paramIn.getString("page"));
int rows = Integer.parseInt(paramIn.getString("rows"));
String communityId = paramIn.getString("communityId");
@@ -68,10 +92,15 @@
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;
+ }
responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/floor.queryFloors?row=" + rows + "&page=" + page + "&communityId="
- + communityId + "&floorNum=" + floorNum,
+ apiUrl,
HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -217,11 +246,11 @@
*
* @param pd 椤甸潰灏佽瀵硅薄
*/
- private void validateListFloor(IPageData pd) {
- Assert.jsonObjectHaveKey(pd.getReqData(), "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
- Assert.jsonObjectHaveKey(pd.getReqData(), "rows", "璇锋眰鎶ユ枃涓湭鍖呭惈rows鑺傜偣");
- Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
- JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ private void validateListFloor(IPageData pd, JSONObject paramIn) {
+ Assert.jsonObjectHaveKey(paramIn, "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
+ Assert.jsonObjectHaveKey(paramIn, "rows", "璇锋眰鎶ユ枃涓湭鍖呭惈rows鑺傜偣");
+ Assert.jsonObjectHaveKey(paramIn, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
+ //JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
Assert.isInteger(paramIn.getString("page"), "page涓嶆槸鏁板瓧");
Assert.isInteger(paramIn.getString("rows"), "rows涓嶆槸鏁板瓧");
Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
--
Gitblit v1.8.0