From 4e134e61ede1f8574189af45c810ca365c7c7f9a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 五月 2022 18:33:14 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/impl/PrivilegeServiceSMOImpl.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 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..017b80c 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,12 @@
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.core.language.Language;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +53,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 +82,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 +129,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 +166,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 +198,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 +222,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;
@@ -240,6 +242,16 @@
for (int privilegeIndex = 0; privilegeIndex < privilegeArrays.size(); privilegeIndex++) {
privilegeObj = privilegeArrays.getJSONObject(privilegeIndex);
hasSameData(privilegeObj, tmpPrivilegeArrays);
+ }
+
+
+ Object lang = pd.getHeaders().get(CommonConstant.JAVA110_LANG);
+ if (!StringUtil.isNullOrNone(lang) && !CommonConstant.LANG_ZH_CN.equals(lang)) {
+ Language language = ApplicationContextFactory.getBean(lang.toString(), Language.class);
+ if (language != null) {
+ tmpPrivilegeArrays = language.getPrivilegeMenuDto(tmpPrivilegeArrays);
+ }
+
}
return new ResponseEntity<String>(tmpPrivilegeArrays.toJSONString(), HttpStatus.OK);
}
@@ -283,7 +295,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 +326,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 +357,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