From 1c60d870adc0b39bdcc04bb747dfce53d837a443 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 08 一月 2024 16:25:00 +0800
Subject: [PATCH] 优化代码
---
springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java | 68 +++++++++++++++-------------------
1 files changed, 30 insertions(+), 38 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java b/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
index 7fa11a6..bf279ef 100644
--- a/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
+++ b/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
@@ -5,12 +5,15 @@
import com.java110.boot.properties.WechatAuthProperties;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.core.factory.AuthenticationFactory;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.log.LoggerFactory;
-import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.app.AppDto;
+import com.java110.dto.privilege.BasePrivilegeDto;
import com.java110.dto.store.StoreDto;
import com.java110.dto.user.UserDto;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.system.ComponentValidateResult;
+import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.cache.PrivilegeCache;
import com.java110.utils.constant.CommonConstant;
@@ -37,7 +40,6 @@
private static final String URL_API = "";
-
@Autowired
private WechatAuthProperties wechatAuthProperties;
@@ -50,6 +52,9 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+ @Autowired
+ private IGetCommunityStoreInfoSMO getCommunityStoreInfoSMOImpl;
+
//寰俊鏀粯
public static final String DOMAIN_WECHAT_PAY = "WECHAT_PAY";
// 寰俊鏈嶅姟鍟嗘敮浠樺紑鍏�
@@ -60,6 +65,10 @@
private static final String WECHAT_SERVICE_APP_ID = "SERVICE_APP_ID";
private static final String WECHAT_SERVICE_MCH_ID = "SERVICE_MCH_ID";
+
+
+ @Autowired
+ private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
/**
@@ -87,12 +96,10 @@
headers.put(CommonConstant.USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
- if (!headers.containsKey(CommonConstant.HTTP_USER_ID)) {
- headers.put(CommonConstant.HTTP_USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
- }
- if (!headers.containsKey(CommonConstant.HTTP_APP_ID)) {
- headers.put(CommonConstant.HTTP_APP_ID, pd.getAppId());
- }
+
+ headers.put(CommonConstant.HTTP_APP_ID, AppDto.WEB_APP_ID);
+ headers.put(CommonConstant.APP_ID, AppDto.WEB_APP_ID);
+
if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
headers.put(CommonConstant.HTTP_TRANSACTION_ID, GenerateCodeFactory.getUUID());
}
@@ -143,10 +150,8 @@
headers.put(CommonConstant.HTTP_USER_ID, "-1");
}
- headers.put(CommonConstant.USER_ID, "-1");
-
- if (!headers.containsKey(CommonConstant.HTTP_USER_ID)) {
- headers.put(CommonConstant.HTTP_USER_ID, "-1");
+ if (!headers.containsKey(CommonConstant.USER_ID)) {
+ headers.put(CommonConstant.USER_ID, headers.get(CommonConstant.HTTP_USER_ID));
}
if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
headers.put(CommonConstant.HTTP_TRANSACTION_ID, GenerateCodeFactory.getUUID());
@@ -334,7 +339,6 @@
if (basePrivilegeDtos == null || basePrivilegeDtos.size() < 1) {
return;
}
- String tmpResource = null;
boolean hasPrivilege = false;
for (BasePrivilegeDto privilegeDto : basePrivilegeDtos) {
if (resource.equals(privilegeDto.getResource())) {
@@ -345,20 +349,18 @@
return;
}
- ResultVo resultVo = null;
- if (resultVo == null ||
- resultVo.getCode() != ResultVo.CODE_OK) {
- throw new UnsupportedOperationException("鐢ㄦ埛娌℃湁鏉冮檺鎿嶄綔");
- }
- JSONArray privileges = JSONArray.parseArray(resultVo.getMsg());
+ BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
+ basePrivilegeDto.setResource(resource);
+ basePrivilegeDto.setUserId(pd.getUserId());
+ List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
- hasPrivilege = false;
if (privileges == null || privileges.size() < 1) {
throw new UnsupportedOperationException("鐢ㄦ埛娌℃湁鏉冮檺鎿嶄綔");
}
+
+ hasPrivilege = false;
for (int privilegeIndex = 0; privilegeIndex < privileges.size(); privilegeIndex++) {
- tmpResource = privileges.getJSONObject(privilegeIndex).getString("resource");
- if (resource.equals(tmpResource)) {
+ if (resource.equals(privileges.get(privilegeIndex).get("resource"))) {
hasPrivilege = true;
break;
}
@@ -377,15 +379,11 @@
protected ResponseEntity<String> getStoreInfo(IPageData pd, RestTemplate restTemplate) {
Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
- ResultVo resultVo = null;
-
+ ResultVo resultVo = getCommunityStoreInfoSMOImpl.getStoreInfo(pd, restTemplate, pd.getUserId());
+ logger.debug("鏌ヨ鍟嗘埛淇℃伅 getStoreInfo 锛歿}", resultVo.toString());
return new ResponseEntity<String>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
}
- private ResponseEntity<String> getStoreEnterCommunitys(IPageData pd, String storeId, String storeTypeCd, RestTemplate restTemplate) {
- ResultVo resultVo = null;
- return new ResponseEntity<String>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
- }
/**
* 鏌ヨ鍟嗘埛淇℃伅
@@ -394,17 +392,12 @@
*/
protected void checkStoreEnterCommunity(IPageData pd, String storeId, String storeTypeCd, String communityId, RestTemplate restTemplate) {
Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
- ResponseEntity<String> responseEntity = null;
- responseEntity = getStoreEnterCommunitys(pd, storeId, storeTypeCd, restTemplate);
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ ResultVo resultVo = getCommunityStoreInfoSMOImpl.getStoreEnterCommunitys(pd, storeId, storeTypeCd, restTemplate);
+ if (resultVo.getCode() != ResultVo.CODE_OK) {
throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "杩樻湭鍏ラ┗灏忓尯锛岃鍏堝叆椹诲皬鍖�");
}
- Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "data", "杩樻湭鍏ラ┗灏忓尯锛岃鍏堝叆椹诲皬鍖�");
-
- JSONObject community = JSONObject.parseObject(responseEntity.getBody().toString());
-
- JSONArray communitys = community.getJSONArray("data");
+ JSONArray communitys = JSONArray.parseArray(resultVo.getData().toString());
if (communitys == null || communitys.size() == 0) {
throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "杩樻湭鍏ラ┗灏忓尯锛岃鍏堝叆椹诲皬鍖�");
@@ -417,7 +410,6 @@
}
}
-
private JSONObject getCurrentCommunity(JSONArray communitys, String communityId) {
for (int communityIndex = 0; communityIndex < communitys.size(); communityIndex++) {
--
Gitblit v1.8.0