From 2633f776bb8fdb0b1efe3a56293b6a1bb04616a7 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 28 四月 2019 10:48:14 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
WebService/src/main/java/com/java110/web/smo/impl/FloorServiceSMOImpl.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 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 7ce014e..03a2478 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
@@ -2,10 +2,10 @@
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.core.context.IPageData;
import com.java110.web.core.BaseComponentSMO;
import com.java110.web.smo.IFloorServiceSMO;
@@ -27,7 +27,9 @@
@Service("floorServiceSMOImpl")
public class FloorServiceSMOImpl extends BaseComponentSMO implements IFloorServiceSMO {
- private static Logger logger = LoggerFactory.getLogger(FloorServiceSMOImpl.class);
+ private static Logger logger = LoggerFactory.getLogger(FloorServiceSMOImpl.class);
+
+ private static final int MAX_ROW = 50;
@Autowired
private RestTemplate restTemplate;
@@ -62,10 +64,11 @@
String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
//鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
- super.checkStoreEnterCommunity(pd,storeId,storeTypeCd,communityId,restTemplate);
+ super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/floor.queryFloors?row=" + rows + "&page=" + page + "&communityId=" + communityId , HttpMethod.GET);
+ ServiceConstant.SERVICE_API_URL + "/api/floor.queryFloors?row=" + rows + "&page=" + page + "&communityId=" + communityId,
+ HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
@@ -83,7 +86,7 @@
validateSaveFloor(pd);
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
- String communityId = paramIn.getString("paramIn");
+ String communityId = paramIn.getString("communityId");
ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
@@ -94,22 +97,25 @@
String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
//鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
- super.checkStoreEnterCommunity(pd,storeId,storeTypeCd,communityId,restTemplate);
+ super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
+ paramIn.put("userId", pd.getUserId());
+ responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
+ ServiceConstant.SERVICE_API_URL + "/api/floor.saveFloor",
+ HttpMethod.POST);
-
-
- return null;
+ return responseEntity;
}
/**
* 鏍￠獙淇濆瓨灏忓尯妤� 淇℃伅
- * @param pd
+ *
+ * @param pd 椤甸潰鏁版嵁灏佽
*/
- private void validateSaveFloor(IPageData pd){
- Assert.jsonObjectHaveKey(pd.getReqData(),"communityId","鏈寘鍚皬鍖篒D");
- Assert.jsonObjectHaveKey(pd.getReqData(),"name","鏈寘鍚皬鍖哄悕绉�");
- Assert.jsonObjectHaveKey(pd.getReqData(),"floorNum","鏈寘鍚皬鍖虹紪鐮�");
- Assert.jsonObjectHaveKey(pd.getReqData(),"remark","鏈寘鍚皬鍖哄娉�");
+ private void validateSaveFloor(IPageData pd) {
+ Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "鏈寘鍚皬鍖篒D");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "name", "鏈寘鍚皬鍖哄悕绉�");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "floorNum", "鏈寘鍚皬鍖虹紪鐮�");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "remark", "鏈寘鍚皬鍖哄娉�");
}
/**
@@ -124,13 +130,12 @@
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
Assert.isInteger(paramIn.getString("page"), "page涓嶆槸鏁板瓧");
Assert.isInteger(paramIn.getString("rows"), "rows涓嶆槸鏁板瓧");
- Assert.hasLength(paramIn.getString("communityId"),"灏忓尯ID涓嶈兘涓虹┖");
+ Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
int rows = Integer.parseInt(paramIn.getString("rows"));
-
- if (rows > 50) {
- throw new SMOException(1999, "rows 鏁伴噺涓嶈兘澶т簬50");
+ if (rows > MAX_ROW) {
+ throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "rows 鏁伴噺涓嶈兘澶т簬50");
}
}
--
Gitblit v1.8.0