From b3f85b60ba9e39572e686009d36b5e5d7e81e910 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 11 七月 2019 20:30:10 +0800
Subject: [PATCH] 合并远程信息
---
WebService/src/main/java/com/java110/web/smo/impl/FloorServiceSMOImpl.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 106 insertions(+), 6 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 22e8448..55f97b0 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,6 +6,7 @@
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;
@@ -29,7 +30,7 @@
private static Logger logger = LoggerFactory.getLogger(FloorServiceSMOImpl.class);
- private static final int MAX_ROW = 50;
+
@Autowired
private RestTemplate restTemplate;
@@ -50,6 +51,9 @@
int rows = Integer.parseInt(paramIn.getString("rows"));
String communityId = paramIn.getString("communityId");
+ //灏忓尯妤肩紪鍙�
+ String floorNum = paramIn.getString("floorNum");
+
//鏍￠獙鐢ㄦ埛鏄惁鏈夋潈闄�
super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);
@@ -65,9 +69,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,
+ apiUrl,
HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -85,8 +95,11 @@
validateSaveFloor(pd);
+ //鏍￠獙鍛樺伐鏄惁鏈夋潈闄愭搷浣�
+ super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);
+
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;
@@ -107,15 +120,102 @@
}
/**
+ * 缂栬緫灏忓尯妤间俊鎭�
+ *
+ * @param pd 椤甸潰鏁版嵁灏佽瀵硅薄
+ * @return
+ */
+ @Override
+ public ResponseEntity<String> editFloor(IPageData pd) {
+
+ validateEditFloor(pd);
+
+ //鏍￠獙鍛樺伐鏄惁鏈夋潈闄愭搷浣�
+ super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);
+
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ String communityId = paramIn.getString("communityId");
+ ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ return responseEntity;
+ }
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeId", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛ID澶辫触锛屾湭鍖呭惈storeId鑺傜偣");
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeTypeCd", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛绫诲瀷澶辫触锛屾湭鍖呭惈storeTypeCd鑺傜偣");
+
+ 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);
+ paramIn.put("userId", pd.getUserId());
+ paramIn.put("name", paramIn.getString("floorName"));
+ responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
+ ServiceConstant.SERVICE_API_URL + "/api/floor.editFloor",
+ HttpMethod.POST);
+
+ return responseEntity;
+ }
+
+ @Override
+ public ResponseEntity<String> deleteFloor(IPageData pd) {
+ validateDeleteFloor(pd);
+ //鏍￠獙鍛樺伐鏄惁鏈夋潈闄愭搷浣�
+ super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ String communityId = paramIn.getString("communityId");
+ ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ return responseEntity;
+ }
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeId", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛ID澶辫触锛屾湭鍖呭惈storeId鑺傜偣");
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeTypeCd", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛绫诲瀷澶辫触锛屾湭鍖呭惈storeTypeCd鑺傜偣");
+
+ 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);
+
+ responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
+ ServiceConstant.SERVICE_API_URL + "/api/floor.deleteFloor",
+ HttpMethod.POST);
+
+ return responseEntity;
+ }
+
+ /**
+ * 鍒犻櫎灏忓尯妤� 鏍￠獙
+ *
+ * @param pd 椤甸潰鏁版嵁灏佽
+ */
+ private void validateDeleteFloor(IPageData pd) {
+
+ Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "鏈寘鍚皬鍖篒D");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "floorId", "鏈寘鍚皬鍖烘ゼID");
+
+ }
+
+ /**
+ * 鏍￠獙淇濆瓨灏忓尯妤� 淇℃伅
+ *
+ * @param pd 椤甸潰鏁版嵁灏佽
+ */
+ private void validateEditFloor(IPageData pd) {
+ Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "鏈寘鍚皬鍖篒D");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "floorId", "鏈寘鍚皬鍖烘ゼID");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "floorName", "鏈寘鍚皬鍖烘ゼ鍚嶇О");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "floorNum", "鏈寘鍚皬鍖烘ゼ缂栫爜");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "remark", "鏈寘鍚皬鍖烘ゼ澶囨敞");
+ }
+
+ /**
* 鏍￠獙淇濆瓨灏忓尯妤� 淇℃伅
*
* @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", "鏈寘鍚皬鍖哄娉�");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "name", "鏈寘鍚皬鍖烘ゼ鍚嶇О");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "floorNum", "鏈寘鍚皬鍖烘ゼ缂栫爜");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "remark", "鏈寘鍚皬鍖烘ゼ澶囨敞");
}
/**
--
Gitblit v1.8.0