From 2a2bc2abf283784151fe1c15047ff65d41ce5583 Mon Sep 17 00:00:00 2001
From: 吴学文 <wuxuewen@wuxuewendeMacBook-Pro.local>
Date: 星期四, 25 四月 2019 23:52:07 +0800
Subject: [PATCH] 增加小区楼信息开发中
---
WebService/src/main/java/com/java110/web/smo/impl/FloorServiceSMOImpl.java | 63 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 9 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 cdd7164..7ce014e 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,6 +1,7 @@
package com.java110.web.smo.impl;
import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.PrivilegeCodeConstant;
import com.java110.common.constant.ServiceConstant;
import com.java110.common.exception.SMOException;
import com.java110.common.util.Assert;
@@ -45,22 +46,27 @@
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
int page = Integer.parseInt(paramIn.getString("page"));
int rows = Integer.parseInt(paramIn.getString("rows"));
- String floorName = paramIn.getString("floorName");
- page = (page - 1) * rows;
+ String communityId = paramIn.getString("communityId");
+
+
+ //鏍￠獙鐢ㄦ埛鏄惁鏈夋潈闄�
+ super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);
+
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");
- if (StringUtil.isEmpty(floorName)) {
- responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/query.staff.infos?rows=" + rows + "&page=" + page + "&storeId=" + storeId, HttpMethod.GET);
- } else {
- responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/query.staff.byName?rows=" + rows + "&page=" + page + "&storeId=" + storeId + "&name=" + floorName, HttpMethod.GET);
- }
+ String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
+ //鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
+ 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);
+
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
}
@@ -71,6 +77,41 @@
return responseEntity;
}
+ @Override
+ public ResponseEntity<String> saveFloor(IPageData pd) {
+
+ validateSaveFloor(pd);
+
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ String communityId = paramIn.getString("paramIn");
+ 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);
+
+
+
+ return null;
+ }
+
+ /**
+ * 鏍￠獙淇濆瓨灏忓尯妤� 淇℃伅
+ * @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","鏈寘鍚皬鍖哄娉�");
+ }
+
/**
* 鏍￠獙鏌ヨ灏忓尯妤间俊鎭�
*
@@ -79,11 +120,15 @@
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());
Assert.isInteger(paramIn.getString("page"), "page涓嶆槸鏁板瓧");
Assert.isInteger(paramIn.getString("rows"), "rows涓嶆槸鏁板瓧");
+ Assert.hasLength(paramIn.getString("communityId"),"灏忓尯ID涓嶈兘涓虹┖");
int rows = Integer.parseInt(paramIn.getString("rows"));
+
+
if (rows > 50) {
throw new SMOException(1999, "rows 鏁伴噺涓嶈兘澶т簬50");
}
--
Gitblit v1.8.0