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/OwnerServiceSMOImpl.java | 103 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 88 insertions(+), 15 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/OwnerServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/OwnerServiceSMOImpl.java
index bd6e8fe..633b6ce 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/OwnerServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/OwnerServiceSMOImpl.java
@@ -30,7 +30,6 @@
private static Logger logger = LoggerFactory.getLogger(OwnerServiceSMOImpl.class);
-
@Autowired
private RestTemplate restTemplate;
@@ -47,7 +46,7 @@
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
int page = Integer.parseInt(paramIn.getString("page"));
- int rows = Integer.parseInt(paramIn.getString("rows"));
+ int row = Integer.parseInt(paramIn.getString("row"));
String communityId = paramIn.getString("communityId");
@@ -77,8 +76,46 @@
}
JSONObject resultObjs = JSONObject.parseObject(responseEntity.getBody().toString());
- resultObjs.put("row", rows);
+ resultObjs.put("row", row);
resultObjs.put("page", page);
+ return responseEntity;
+ }
+
+ /**
+ * 鏌ヨ灏忓尯妤�
+ *
+ * @param pd 椤甸潰鏁版嵁灏佽瀵硅薄
+ * @return 杩斿洖 ResponseEntity瀵硅薄鍖呭惈 http鐘舵�� 淇℃伅 body淇℃伅
+ */
+ @Override
+ public ResponseEntity<String> listOwnerMember(IPageData pd) {
+
+ validateListOwnerMember(pd);
+
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ 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");
+ String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
+ //鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
+ super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
+ String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/owner.queryOwnerMembers" + mapToUrlParam(paramIn);
+
+
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ apiUrl,
+ HttpMethod.GET);
return responseEntity;
}
@@ -91,6 +128,11 @@
super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ if (paramIn.containsKey("ownerId") && !paramIn.getString("ownerId").startsWith("-")) {
+ paramIn.put("ownerTypeCd", "1002");
+ } else {
+ paramIn.put("ownerTypeCd", "1001");
+ }
String communityId = paramIn.getString("communityId");
ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -126,6 +168,11 @@
super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ if (paramIn.getString("ownerId").equals(paramIn.getString("memberId"))) {
+ paramIn.put("ownerTypeCd", "1001");
+ } else {
+ paramIn.put("ownerTypeCd", "1002");
+ }
String communityId = paramIn.getString("communityId");
ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -139,7 +186,6 @@
//鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
paramIn.put("userId", pd.getUserId());
- paramIn.put("name", paramIn.getString("ownerName"));
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
ServiceConstant.SERVICE_API_URL + "/api/owner.editOwner",
HttpMethod.POST);
@@ -153,6 +199,11 @@
//鏍￠獙鍛樺伐鏄惁鏈夋潈闄愭搷浣�
super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ if (paramIn.getString("ownerId").equals(paramIn.getString("memberId"))) {
+ paramIn.put("ownerTypeCd", "1001");
+ } else {
+ paramIn.put("ownerTypeCd", "1002");
+ }
String communityId = paramIn.getString("communityId");
ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -181,7 +232,9 @@
private void validateDeleteOwner(IPageData pd) {
Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "鏈寘鍚皬鍖篒D");
- Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "鏈寘鍚皬鍖烘ゼID");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "memberId", "鏈寘鍚笟涓籌D");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "鏈寘鍚笟涓籌D");
+ //Assert.jsonObjectHaveKey(pd.getReqData(), "ownerTypeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerTypeCd鑺傜偣");
}
@@ -192,9 +245,13 @@
*/
private void validateEditOwner(IPageData pd) {
Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "鏈寘鍚皬鍖篒D");
- Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "鏈寘鍚皬鍖烘ゼID");
- Assert.jsonObjectHaveKey(pd.getReqData(), "ownerName", "鏈寘鍚皬鍖烘ゼ鍚嶇О");
- Assert.jsonObjectHaveKey(pd.getReqData(), "ownerNum", "鏈寘鍚皬鍖烘ゼ缂栫爜");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "memberId", "鏈寘鍚玬emberId");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "鏈寘鍚玱wnerId");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "age", "璇锋眰鎶ユ枃涓湭鍖呭惈age");
+ //Assert.jsonObjectHaveKey(pd.getReqData(), "ownerTypeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerTypeCd鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "link", "璇锋眰鎶ユ枃涓湭鍖呭惈link");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "sex", "璇锋眰鎶ユ枃涓湭鍖呭惈sex");
Assert.jsonObjectHaveKey(pd.getReqData(), "remark", "鏈寘鍚皬鍖烘ゼ澶囨敞");
}
@@ -205,8 +262,10 @@
*/
private void validateSaveOwner(IPageData pd) {
Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "鏈寘鍚皬鍖篒D");
- Assert.jsonObjectHaveKey(pd.getReqData(), "name", "鏈寘鍚皬鍖烘ゼ鍚嶇О");
- Assert.jsonObjectHaveKey(pd.getReqData(), "ownerNum", "鏈寘鍚皬鍖烘ゼ缂栫爜");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "age", "璇锋眰鎶ユ枃涓湭鍖呭惈age");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "link", "璇锋眰鎶ユ枃涓湭鍖呭惈link");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "sex", "璇锋眰鎶ユ枃涓湭鍖呭惈sex");
Assert.jsonObjectHaveKey(pd.getReqData(), "remark", "鏈寘鍚皬鍖烘ゼ澶囨敞");
}
@@ -217,20 +276,34 @@
*/
private void validateListOwner(IPageData pd) {
Assert.jsonObjectHaveKey(pd.getReqData(), "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
- Assert.jsonObjectHaveKey(pd.getReqData(), "rows", "璇锋眰鎶ユ枃涓湭鍖呭惈rows鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "row", "璇锋眰鎶ユ枃涓湭鍖呭惈row鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "ownerTypeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerTypeCd鑺傜偣");
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.isInteger(paramIn.getString("row"), "rows涓嶆槸鏁板瓧");
Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
- int rows = Integer.parseInt(paramIn.getString("rows"));
+ int row = Integer.parseInt(paramIn.getString("row"));
- if (rows > MAX_ROW) {
- throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "rows 鏁伴噺涓嶈兘澶т簬50");
+ if (row > MAX_ROW) {
+ throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "row 鏁伴噺涓嶈兘澶т簬50");
}
}
+ /**
+ * 鏍￠獙鏌ヨ灏忓尯妤间俊鎭�
+ *
+ * @param pd 椤甸潰灏佽瀵硅薄
+ */
+ private void validateListOwnerMember(IPageData pd) {
+ Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerId鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
+
+ }
+
public RestTemplate getRestTemplate() {
return restTemplate;
--
Gitblit v1.8.0