From b784175e978b0fcfca8ca8bed7953ae4eacf49e8 Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期一, 02 九月 2019 20:18:58 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
WebService/src/main/java/com/java110/web/smo/impl/DemoServiceSMOImpl.java | 71 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/DemoServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/DemoServiceSMOImpl.java
index 61e21d4..bfdc028 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/DemoServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/DemoServiceSMOImpl.java
@@ -74,6 +74,26 @@
}
@Override
+ public ResponseEntity<String> listDemoStudy(IPageData pd) {
+
+ validateListDemoStudy(pd);
+
+ super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_DEMO);
+
+ super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+
+ String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/demo.queryDemoConfig" + mapToUrlParam(paramIn);
+
+
+ ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",
+ apiUrl,
+ HttpMethod.GET);
+
+ return responseEntity;
+ }
+
+ @Override
public ResponseEntity<String> saveDemo(IPageData pd) {
validateSaveCar(pd);
@@ -98,7 +118,7 @@
paramIn.put("userId", pd.getUserId());
paramIn.put("storeId", storeId);
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
- ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.sellParkingSpace",
+ ServiceConstant.SERVICE_API_URL + "/api/demo.saveDemoConfig",
HttpMethod.POST);
return responseEntity;
@@ -213,31 +233,9 @@
*/
private void validateSaveCar(IPageData pd) {
- Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "鏈寘鍚皬鍖篒D");
- Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerId");
- Assert.jsonObjectHaveKey(pd.getReqData(), "carNum", "璇锋眰鎶ユ枃涓湭鍖呭惈carNum");
- Assert.jsonObjectHaveKey(pd.getReqData(), "carBrand", "璇锋眰鎶ユ枃涓湭鍖呭惈carBrand");
- Assert.jsonObjectHaveKey(pd.getReqData(), "carType", "璇锋眰鎶ユ枃涓湭鍖呭惈carType");
- Assert.jsonObjectHaveKey(pd.getReqData(), "carColor", "鏈寘鍚玞arColor");
- Assert.jsonObjectHaveKey(pd.getReqData(), "psId", "鏈寘鍚玴sId");
- Assert.jsonObjectHaveKey(pd.getReqData(), "receivedAmount", "鏈寘鍚玶eceivedAmount");
- Assert.jsonObjectHaveKey(pd.getReqData(), "sellOrHire", "鏈寘鍚玸ellOrHire");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "demoName", "鏈寘鍚玠emoName");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "demoValue", "鏈寘鍚玠emoValue");
- JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
- Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
- Assert.hasLength(paramIn.getString("ownerId"), "ownerId涓嶈兘涓虹┖");
- Assert.hasLength(paramIn.getString("psId"), "psId涓嶈兘涓虹┖");
- Assert.hasLength(paramIn.getString("receivedAmount"), "receivedAmount涓嶈兘涓虹┖");
-
- if(!"H".equals(paramIn.getString("sellOrHire"))
- && !"S".equals(paramIn.getString("sellOrHire"))){
- throw new IllegalArgumentException("鍏ュ弬閿欒锛屾棤娉曡瘑鍒鎿嶄綔");
- }
-
- if("H".equals(paramIn.getString("sellOrHire"))){
- Assert.jsonObjectHaveKey(pd.getReqData(), "cycles", "鏈寘鍚玞ycles");
- Assert.hasLength(paramIn.getString("cycles"), "cycles涓嶈兘涓虹┖");
- }
}
/**
@@ -248,8 +246,6 @@
private void validateListDemo(IPageData pd) {
Assert.jsonObjectHaveKey(pd.getReqData(), "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "row", "璇锋眰鎶ユ枃涓湭鍖呭惈row鑺傜偣");
- Assert.jsonObjectHaveKey(pd.getReqData(), "demoName", "璇锋眰涓湭鍖呭惈demoName淇℃伅");
- Assert.jsonObjectHaveKey(pd.getReqData(), "demoValue", "璇锋眰涓湭鍖呭惈demoValue淇℃伅");
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
Assert.isInteger(paramIn.getString("page"), "page涓嶆槸鏁板瓧");
Assert.isInteger(paramIn.getString("row"), "rows涓嶆槸鏁板瓧");
@@ -263,6 +259,27 @@
}
+
+ /**
+ * 鏍￠獙鏌ヨ灏忓尯妤间俊鎭�
+ *
+ * @param pd 椤甸潰灏佽瀵硅薄
+ */
+ private void validateListDemoStudy(IPageData pd) {
+ Assert.jsonObjectHaveKey(pd.getReqData(), "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "row", "璇锋眰鎶ユ枃涓湭鍖呭惈row鑺傜偣");
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ Assert.isInteger(paramIn.getString("page"), "page涓嶆槸鏁板瓧");
+ Assert.isInteger(paramIn.getString("row"), "rows涓嶆槸鏁板瓧");
+ int row = Integer.parseInt(paramIn.getString("row"));
+
+
+ if (row > MAX_ROW) {
+ throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "row 鏁伴噺涓嶈兘澶т簬50");
+ }
+
+ }
+
public RestTemplate getRestTemplate() {
return restTemplate;
}
--
Gitblit v1.8.0