From 6b291f18e944053ebb1dcd51495839b7b32b668d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 16 二月 2020 19:19:53 +0800
Subject: [PATCH] 优化权限组修改功能
---
WebService/src/main/java/com/java110/web/smo/impl/PrivilegeServiceSMOImpl.java | 250 +++++++++++++++++++++++++++++--------------------
1 files changed, 147 insertions(+), 103 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/PrivilegeServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/PrivilegeServiceSMOImpl.java
index 21229ea..8e611e7 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/PrivilegeServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/PrivilegeServiceSMOImpl.java
@@ -2,10 +2,10 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.util.Assert;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.Assert;
import com.java110.core.context.IPageData;
-import com.java110.web.core.BaseComponentSMO;
+import com.java110.core.component.BaseComponentSMO;
import com.java110.web.smo.IPrivilegeServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
@@ -22,253 +22,297 @@
/**
* 鏌ヨ 鏉冮檺缁�
+ *
* @param pd
* @return
*/
@Override
public ResponseEntity<String> listPrivilegeGroup(IPageData pd) {
- Assert.hasLength(pd.getUserId(),"鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
+ Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
- ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
+ ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
- if(storeInfo.getStatusCode() != HttpStatus.OK){
+ if (storeInfo.getStatusCode() != HttpStatus.OK) {
return storeInfo;
}
// 鍟嗘埛杩斿洖淇℃伅
JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
- String storeId = storeInfoObj.getString("storeId");
- String storeTypeCd = storeInfoObj.getString("storeTypeCd");
+ String storeId = storeInfoObj.getString("storeId");
+ String storeTypeCd = storeInfoObj.getString("storeTypeCd");
//鏍规嵁鍟嗘埛ID鏌ヨ 鏉冮檺缁勪俊鎭�
- ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate,pd,"",
- ServiceConstant.SERVICE_API_URL+"/api/query.store.privilegeGroup?storeId="+storeId +"&storeTypeCd="+storeTypeCd, HttpMethod.GET);
- if(privilegeGroup.getStatusCode() != HttpStatus.OK){
+ ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, "",
+ ServiceConstant.SERVICE_API_URL + "/api/query.store.privilegeGroup?storeId=" + storeId + "&storeTypeCd=" + storeTypeCd, HttpMethod.GET);
+ if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
return privilegeGroup;
}
JSONObject privilegeGroupObj = JSONObject.parseObject(privilegeGroup.getBody().toString());
- Assert.jsonObjectHaveKey(privilegeGroupObj,"privilegeGroups","鏌ヨ鑿滃崟鏈繑鍥瀙rivilegeGroups鑺傜偣");
+ Assert.jsonObjectHaveKey(privilegeGroupObj, "privilegeGroups", "鏌ヨ鑿滃崟鏈繑鍥瀙rivilegeGroups鑺傜偣");
JSONArray privilegeGroups = privilegeGroupObj.getJSONArray("privilegeGroups");
- return new ResponseEntity<String>(privilegeGroups.toJSONString(),HttpStatus.OK);
+ return new ResponseEntity<String>(privilegeGroups.toJSONString(), HttpStatus.OK);
}
/**
* 鏌ヨ鏉冮檺
+ *
* @param pd
* @return
*/
@Override
public ResponseEntity<String> loadListPrivilege(IPageData pd) {
JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
- Assert.jsonObjectHaveKey(privilegeInfoObj,"pgId","璇锋眰鎶ユ枃涓湭鍖呭惈pgId 鑺傜偣");
+ Assert.jsonObjectHaveKey(privilegeInfoObj, "pgId", "璇锋眰鎶ユ枃涓湭鍖呭惈pgId 鑺傜偣");
String pgId = privilegeInfoObj.getString("pgId");
+ String name = privilegeInfoObj.getString("name");
- ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate,pd,"",
- ServiceConstant.SERVICE_API_URL+"/api/query.privilege.byPgId?pgId="+pgId , HttpMethod.GET);
- if(privilegeGroup.getStatusCode() != HttpStatus.OK){
+ ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, "",
+ ServiceConstant.SERVICE_API_URL + "/api/query.privilege.byPgId?pgId=" + pgId + "&name=" + name, HttpMethod.GET);
+ if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
return privilegeGroup;
}
JSONObject privilegeObj = JSONObject.parseObject(privilegeGroup.getBody().toString());
- Assert.jsonObjectHaveKey(privilegeObj,"privileges","鏌ヨ鑿滃崟鏈繑鍥瀙rivileges鑺傜偣");
+ Assert.jsonObjectHaveKey(privilegeObj, "privileges", "鏌ヨ鑿滃崟鏈繑鍥瀙rivileges鑺傜偣");
JSONArray privileges = privilegeObj.getJSONArray("privileges");
- return new ResponseEntity<String>(privileges.toJSONString(),HttpStatus.OK);
+ return new ResponseEntity<String>(privileges.toJSONString(), HttpStatus.OK);
}
/**
* 淇濆瓨鏉冮檺缁�
+ *
* @param pd
* @return
*/
@Override
public ResponseEntity<String> savePrivilegeGroup(IPageData pd) {
- Assert.hasLength(pd.getUserId(),"鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
+ Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
- Assert.jsonObjectHaveKey(privilegeInfoObj,"name","璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁勫悕绉� 鑺傜偣");
- Assert.jsonObjectHaveKey(privilegeInfoObj,"description","璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁勬弿杩� 鑺傜偣");
+ Assert.jsonObjectHaveKey(privilegeInfoObj, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁勫悕绉� 鑺傜偣");
+ Assert.jsonObjectHaveKey(privilegeInfoObj, "description", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁勬弿杩� 鑺傜偣");
- Assert.hasLength(privilegeInfoObj.getString("name"),"璇锋眰鎶ユ枃涓潈闄愮粍鍚嶇О涓嶈兘涓虹┖");
+ Assert.hasLength(privilegeInfoObj.getString("name"), "璇锋眰鎶ユ枃涓潈闄愮粍鍚嶇О涓嶈兘涓虹┖");
+ ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
- ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
-
- if(storeInfo.getStatusCode() != HttpStatus.OK){
+ if (storeInfo.getStatusCode() != HttpStatus.OK) {
return storeInfo;
}
// 鍟嗘埛杩斿洖淇℃伅
JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
- String storeId = storeInfoObj.getString("storeId");
- String storeTypeCd = storeInfoObj.getString("storeTypeCd");
- privilegeInfoObj.put("storeId",storeId);
- privilegeInfoObj.put("storeTypeCd",storeTypeCd);
+ String storeId = storeInfoObj.getString("storeId");
+ String storeTypeCd = storeInfoObj.getString("storeTypeCd");
+ privilegeInfoObj.put("storeId", storeId);
+ privilegeInfoObj.put("storeTypeCd", storeTypeCd);
- ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate,pd,privilegeInfoObj.toJSONString(),
- ServiceConstant.SERVICE_API_URL+"/api/save.privilegeGroup.info" , HttpMethod.POST);
+ ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
+ ServiceConstant.SERVICE_API_URL + "/api/save.privilegeGroup.info", HttpMethod.POST);
+ return privilegeGroup;
+ }
+
+ /**
+ * 淇濆瓨鏉冮檺缁�
+ *
+ * @param pd
+ * @return
+ */
+ @Override
+ public ResponseEntity<String> editPrivilegeGroup(IPageData pd) {
+ Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
+
+ JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
+
+ Assert.jsonObjectHaveKey(privilegeInfoObj, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁勫悕绉� 鑺傜偣");
+ Assert.hasKeyAndValue(privilegeInfoObj, "pgId", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁処D 鑺傜偣");
+ Assert.jsonObjectHaveKey(privilegeInfoObj, "description", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁勬弿杩� 鑺傜偣");
+
+ Assert.hasLength(privilegeInfoObj.getString("name"), "璇锋眰鎶ユ枃涓潈闄愮粍鍚嶇О涓嶈兘涓虹┖");
+
+
+ ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
+
+ if (storeInfo.getStatusCode() != HttpStatus.OK) {
+ return storeInfo;
+ }
+ // 鍟嗘埛杩斿洖淇℃伅
+ JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
+
+ String storeId = storeInfoObj.getString("storeId");
+ String storeTypeCd = storeInfoObj.getString("storeTypeCd");
+ privilegeInfoObj.put("storeId", storeId);
+ privilegeInfoObj.put("storeTypeCd", storeTypeCd);
+
+ ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
+ ServiceConstant.SERVICE_API_URL + "/api/edit.privilegeGroup.info", HttpMethod.POST);
return privilegeGroup;
}
/**
* 鍒犻櫎鏉冮檺缁�
+ *
* @param pd
* @return
*/
@Override
public ResponseEntity<String> deletePrivilegeGroup(IPageData pd) {
- Assert.hasLength(pd.getUserId(),"鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
+ Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
- Assert.jsonObjectHaveKey(privilegeInfoObj,"pgId","璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁処D 鑺傜偣");
+ Assert.jsonObjectHaveKey(privilegeInfoObj, "pgId", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁処D 鑺傜偣");
- ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
+ ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
- if(storeInfo.getStatusCode() != HttpStatus.OK){
+ if (storeInfo.getStatusCode() != HttpStatus.OK) {
return storeInfo;
}
// 鍟嗘埛杩斿洖淇℃伅
JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
- String storeId = storeInfoObj.getString("storeId");
- String storeTypeCd = storeInfoObj.getString("storeTypeCd");
- privilegeInfoObj.put("storeId",storeId);
- privilegeInfoObj.put("storeTypeCd",storeTypeCd);
+ String storeId = storeInfoObj.getString("storeId");
+ String storeTypeCd = storeInfoObj.getString("storeTypeCd");
+ privilegeInfoObj.put("storeId", storeId);
+ privilegeInfoObj.put("storeTypeCd", storeTypeCd);
- ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate,pd,privilegeInfoObj.toJSONString(),
- ServiceConstant.SERVICE_API_URL+"/api/delete.privilegeGroup.info" , HttpMethod.POST);
+ ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
+ ServiceConstant.SERVICE_API_URL + "/api/delete.privilegeGroup.info", HttpMethod.POST);
return privilegeGroup;
}
@Override
public ResponseEntity<String> listNoAddPrivilege(IPageData pd) {
- Assert.hasLength(pd.getUserId(),"鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
+ Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
- Assert.jsonObjectHaveKey(privilegeInfoObj,"pgId","璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁処D 鑺傜偣");
+ Assert.jsonObjectHaveKey(privilegeInfoObj, "pgId", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁処D 鑺傜偣");
- ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
+ ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
- if(storeInfo.getStatusCode() != HttpStatus.OK){
+ if (storeInfo.getStatusCode() != HttpStatus.OK) {
return storeInfo;
}
// 鍟嗘埛杩斿洖淇℃伅
JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
- String storeId = storeInfoObj.getString("storeId");
- String storeTypeCd = storeInfoObj.getString("storeTypeCd");
+ String storeId = storeInfoObj.getString("storeId");
+ String storeTypeCd = storeInfoObj.getString("storeTypeCd");
String pgId = privilegeInfoObj.getString("pgId");
+ String pName = privilegeInfoObj.getString("pName");
- ResponseEntity<String> privileges = super.callCenterService(restTemplate,pd,"",
- ServiceConstant.SERVICE_API_URL+"/api/query.privilegeGroup.noAddPrivilege?storeId="+storeId+"&storeTypeCd="+storeTypeCd+"&pgId="+pgId , HttpMethod.GET);
+ 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);
- if(privileges.getStatusCode() != HttpStatus.OK){
+ if (privileges.getStatusCode() != HttpStatus.OK) {
return privileges;
}
JSONObject resultObj = JSONObject.parseObject(privileges.getBody().toString());
-
- return new ResponseEntity<String>(resultObj.getJSONArray("privileges").toJSONString(),HttpStatus.OK);
+ return new ResponseEntity<String>(resultObj.getJSONArray("privileges").toJSONString(), HttpStatus.OK);
}
@Override
public ResponseEntity<String> addPrivilegeToPrivilegeGroup(IPageData pd) {
- Assert.hasLength(pd.getUserId(),"鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
+ Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
- Assert.jsonObjectHaveKey(privilegeInfoObj,"pgId","璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁処D 鑺傜偣");
- Assert.jsonObjectHaveKey(privilegeInfoObj,"pId","璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺ID 鑺傜偣");
+ Assert.jsonObjectHaveKey(privilegeInfoObj, "pgId", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁処D 鑺傜偣");
+ //Assert.jsonObjectHaveKey(privilegeInfoObj,"pId","璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺ID 鑺傜偣");
+ if (!privilegeInfoObj.containsKey("pIds") || privilegeInfoObj.getJSONArray("pIds").size() < 1) {
+ throw new IllegalArgumentException("璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺");
+ }
- ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
+ ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
- if(storeInfo.getStatusCode() != HttpStatus.OK){
+ if (storeInfo.getStatusCode() != HttpStatus.OK) {
return storeInfo;
}
// 鍟嗘埛杩斿洖淇℃伅
JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
- String storeId = storeInfoObj.getString("storeId");
- privilegeInfoObj.put("storeId",storeId);
+ String storeId = storeInfoObj.getString("storeId");
+ privilegeInfoObj.put("storeId", storeId);
- ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate,pd,privilegeInfoObj.toJSONString(),
- ServiceConstant.SERVICE_API_URL+"/api/add.privilege.PrivilegeGroup" , HttpMethod.POST);
+ ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
+ ServiceConstant.SERVICE_API_URL + "/api/add.privilege.PrivilegeGroup", HttpMethod.POST);
return privilegeGroup;
}
/**
* 鍒犻櫎鏉冮檺
- * @param pd
- * @return
- */
- @Override
- public ResponseEntity<String> deletePrivilegeFromPrivilegeGroup(IPageData pd) {
- Assert.hasLength(pd.getUserId(),"鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
-
- JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
-
- Assert.jsonObjectHaveKey(privilegeInfoObj,"pgId","璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁処D 鑺傜偣");
- Assert.jsonObjectHaveKey(privilegeInfoObj,"pId","璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺ID 鑺傜偣");
-
- ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
-
- if(storeInfo.getStatusCode() != HttpStatus.OK){
- return storeInfo;
- }
- // 鍟嗘埛杩斿洖淇℃伅
- JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
-
- String storeId = storeInfoObj.getString("storeId");
- privilegeInfoObj.put("storeId",storeId);
-
- ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate,pd,privilegeInfoObj.toJSONString(),
- ServiceConstant.SERVICE_API_URL+"/api/delete.privilege.PrivilegeGroup" , HttpMethod.POST);
- return privilegeGroup;
- }
-
- /**
*
* @param pd
* @return
*/
@Override
- public ResponseEntity<String> listStaffPrivileges(IPageData pd) {
- Assert.hasLength(pd.getUserId(),"鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
+ public ResponseEntity<String> deletePrivilegeFromPrivilegeGroup(IPageData pd) {
+ Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
- Assert.jsonObjectHaveKey(privilegeInfoObj,"staffId","璇锋眰鎶ユ枃涓湭鍖呭惈鍛樺伐ID 鑺傜偣");
- ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
+ Assert.jsonObjectHaveKey(privilegeInfoObj, "pgId", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁処D 鑺傜偣");
+ Assert.jsonObjectHaveKey(privilegeInfoObj, "pId", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺ID 鑺傜偣");
- if(storeInfo.getStatusCode() != HttpStatus.OK){
+ ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
+
+ if (storeInfo.getStatusCode() != HttpStatus.OK) {
return storeInfo;
}
// 鍟嗘埛杩斿洖淇℃伅
JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
- String storeId = storeInfoObj.getString("storeId");
- privilegeInfoObj.put("storeId",storeId);
+ String storeId = storeInfoObj.getString("storeId");
+ 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);
- if(privilegeGroup.getStatusCode() != HttpStatus.OK){
+ ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
+ ServiceConstant.SERVICE_API_URL + "/api/delete.privilege.PrivilegeGroup", HttpMethod.POST);
+ return privilegeGroup;
+ }
+
+ /**
+ * @param pd
+ * @return
+ */
+ @Override
+ public ResponseEntity<String> listStaffPrivileges(IPageData pd) {
+ Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
+
+ JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
+ Assert.jsonObjectHaveKey(privilegeInfoObj, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈鍛樺伐ID 鑺傜偣");
+
+ ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
+
+ if (storeInfo.getStatusCode() != HttpStatus.OK) {
+ return storeInfo;
+ }
+ // 鍟嗘埛杩斿洖淇℃伅
+ JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
+
+ String storeId = storeInfoObj.getString("storeId");
+ 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);
+ if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
return privilegeGroup;
}
JSONObject resultObj = JSONObject.parseObject(privilegeGroup.getBody().toString());
@@ -276,9 +320,9 @@
JSONArray privileges = resultObj.getJSONArray("privileges");
JSONObject resObj = new JSONObject();
- resObj.put("datas",privileges);
+ resObj.put("datas", privileges);
- return new ResponseEntity<String>(resObj.toJSONString(),HttpStatus.OK);
+ return new ResponseEntity<String>(resObj.toJSONString(), HttpStatus.OK);
}
public RestTemplate getRestTemplate() {
--
Gitblit v1.8.0