From eeecad9e33c74100b1714f10f7ab2eb149ef1490 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 17 三月 2022 18:55:10 +0800
Subject: [PATCH] 加入二维码巡检功能

---
 service-api/src/main/java/com/java110/api/smo/impl/PrivilegeServiceSMOImpl.java |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/smo/impl/PrivilegeServiceSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/impl/PrivilegeServiceSMOImpl.java
index 1d9d710..05953ae 100644
--- a/service-api/src/main/java/com/java110/api/smo/impl/PrivilegeServiceSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/impl/PrivilegeServiceSMOImpl.java
@@ -3,11 +3,9 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.smo.DefaultAbstractComponentSMO;
-import com.java110.core.component.BaseComponentSMO;
 import com.java110.core.context.IPageData;
-import com.java110.core.smo.IGetCommunityStoreInfoSMO;
+import com.java110.api.smo.IGetCommunityStoreInfoSMO;
 import com.java110.api.smo.IPrivilegeServiceSMO;
-import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +50,7 @@
 
 
         ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, "",
-                ServiceConstant.SERVICE_API_URL + "/api/query.store.privilegeGroup?storeId=" + storeId + "&storeTypeCd=" + storeTypeCd, HttpMethod.GET);
+                "query.store.privilegeGroup?storeId=" + storeId + "&storeTypeCd=" + storeTypeCd, HttpMethod.GET);
         if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
             return privilegeGroup;
         }
@@ -81,7 +79,7 @@
         String name = privilegeInfoObj.getString("name");
 
         ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, "",
-                ServiceConstant.SERVICE_API_URL + "/api/query.privilege.byPgId?pgId=" + pgId + "&name=" + name, HttpMethod.GET);
+                "query.privilege.byPgId?pgId=" + pgId + "&name=" + name, HttpMethod.GET);
         if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
             return privilegeGroup;
         }
@@ -128,7 +126,7 @@
         privilegeInfoObj.put("storeTypeCd", storeTypeCd);
 
         ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
-                ServiceConstant.SERVICE_API_URL + "/api/save.privilegeGroup.info", HttpMethod.POST);
+                "save.privilegeGroup.info", HttpMethod.POST);
         return privilegeGroup;
     }
 
@@ -165,7 +163,7 @@
         privilegeInfoObj.put("storeTypeCd", storeTypeCd);
 
         ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
-                ServiceConstant.SERVICE_API_URL + "/api/edit.privilegeGroup.info", HttpMethod.POST);
+                "edit.privilegeGroup.info", HttpMethod.POST);
         return privilegeGroup;
     }
 
@@ -197,7 +195,7 @@
         privilegeInfoObj.put("storeTypeCd", storeTypeCd);
 
         ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
-                ServiceConstant.SERVICE_API_URL + "/api/delete.privilegeGroup.info", HttpMethod.POST);
+                "delete.privilegeGroup.info", HttpMethod.POST);
         return privilegeGroup;
     }
 
@@ -221,9 +219,10 @@
         String storeTypeCd = storeInfoObj.getString("storeTypeCd");
         String pgId = privilegeInfoObj.getString("pgId");
         String pName = privilegeInfoObj.getString("pName");
+        String communityId = privilegeInfoObj.getString("communityId");
 
         ResponseEntity<String> privileges = super.callCenterService(restTemplate, pd, "",
-                ServiceConstant.SERVICE_API_URL + "/api/query.privilegeGroup.noAddPrivilege?storeId=" + storeId + "&storeTypeCd=" + storeTypeCd + "&pgId=" + pgId + "&pName=" + pName, HttpMethod.GET);
+                "query.privilegeGroup.noAddPrivilege?storeId=" + storeId + "&storeTypeCd=" + storeTypeCd + "&pgId=" + pgId + "&pName=" + pName+"&communityId="+communityId, HttpMethod.GET);
 
         if (privileges.getStatusCode() != HttpStatus.OK) {
             return privileges;
@@ -283,7 +282,7 @@
         privilegeInfoObj.put("storeId", storeId);
 
         ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
-                ServiceConstant.SERVICE_API_URL + "/api/add.privilege.PrivilegeGroup", HttpMethod.POST);
+                "add.privilege.PrivilegeGroup", HttpMethod.POST);
         return privilegeGroup;
     }
 
@@ -314,7 +313,7 @@
         privilegeInfoObj.put("storeId", storeId);
 
         ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
-                ServiceConstant.SERVICE_API_URL + "/api/delete.privilege.PrivilegeGroup", HttpMethod.POST);
+                "delete.privilege.PrivilegeGroup", HttpMethod.POST);
         return privilegeGroup;
     }
 
@@ -345,7 +344,7 @@
         privilegeInfoObj.put("storeId", storeId);
 
         ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, "",
-                ServiceConstant.SERVICE_API_URL + "/api/query.user.privilege?userId=" + privilegeInfoObj.getString("staffId") + "&domain=" + storeInfoObj.getString("storeTypeCd"), HttpMethod.GET);
+                "query.user.privilege?userId=" + privilegeInfoObj.getString("staffId") + "&domain=" + storeInfoObj.getString("storeTypeCd"), HttpMethod.GET);
 
 //        ResultVo resultVo = getCommunityStoreInfoSMOImpl.getUserPrivileges(pd, privilegeInfoObj.getString("staffId"), storeInfoObj.getString("storeTypeCd"), restTemplate);
 //        ResponseEntity<String> privilegeGroup = new ResponseEntity<>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);

--
Gitblit v1.8.0