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/core/BaseComponentSMO.java |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/WebService/src/main/java/com/java110/web/core/BaseComponentSMO.java b/WebService/src/main/java/com/java110/web/core/BaseComponentSMO.java
index 0b6f4f9..49f622a 100644
--- a/WebService/src/main/java/com/java110/web/core/BaseComponentSMO.java
+++ b/WebService/src/main/java/com/java110/web/core/BaseComponentSMO.java
@@ -147,13 +147,21 @@
      *
      * @param pd
      * @param restTemplate
-     * @param privilegeCode
+     * @param privilegeCodes
      */
-    protected void checkUserHasPrivilege(IPageData pd, RestTemplate restTemplate, String privilegeCode) {
+    protected void checkUserHasPrivilege(IPageData pd, RestTemplate restTemplate, String ...privilegeCodes) {
         ResponseEntity<String> responseEntity = null;
-        responseEntity = this.callCenterService(restTemplate, pd, "", ServiceConstant.SERVICE_API_URL + "/api/check.user.hasPrivilege?userId=" + pd.getUserId() + "&pId=" + privilegeCode, HttpMethod.GET);
-        if (responseEntity.getStatusCode() != HttpStatus.OK) {
-            throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "鐢ㄦ埛娌℃湁鏉冮檺鎿嶄綔鏉冮檺" + privilegeCode);
+        for(String privilegeCode : privilegeCodes) {
+            responseEntity = this.callCenterService(restTemplate, pd, "", ServiceConstant.SERVICE_API_URL
+                    + "/api/check.user.hasPrivilege?userId=" + pd.getUserId() + "&pId=" + privilegeCode, HttpMethod.GET);
+            if (responseEntity.getStatusCode() == HttpStatus.OK) {
+                //throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "鐢ㄦ埛娌℃湁鏉冮檺鎿嶄綔鏉冮檺" + privilegeCodes);
+                break;
+            }
+        }
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK){
+            throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "鐢ㄦ埛娌℃湁鏉冮檺鎿嶄綔鏉冮檺" + privilegeCodes);
         }
     }
 
@@ -217,4 +225,18 @@
         }
         return new ComponentValidateResult(storeId, storeTypeCd, communityId, pd.getUserId());
     }
+
+    /**
+     * 鍒嗛〉淇℃伅鏍¢獙
+     * @param pd 椤甸潰鏁版嵁灏佽
+     */
+    protected void validatePageInfo(IPageData pd){
+
+        Assert.jsonObjectHaveKey(pd.getReqData(), "row", "璇锋眰鎶ユ枃涓湭鍖呭惈row鑺傜偣");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
+
+        JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+        Assert.isInteger(paramIn.getString("row"), "row蹇呴』涓烘暟瀛�");
+        Assert.isInteger(paramIn.getString("page"), "page蹇呴』涓烘暟瀛�");
+    }
 }

--
Gitblit v1.8.0