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 | 37 ++++++++++++-------------------------
1 files changed, 12 insertions(+), 25 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 6048c45..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,8 +5,10 @@
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.app.AppDto;
import com.java110.dto.privilege.BasePrivilegeDto;
import com.java110.dto.store.StoreDto;
import com.java110.dto.user.UserDto;
@@ -36,7 +38,6 @@
private static final Logger logger = LoggerFactory.getLogger(DefaultAbstractComponentSMO.class);
protected static final String DEFAULT_PAY_ADAPT = "wechatPayAdapt";// 榛樿寰俊閫氱敤鏀粯
private static final String URL_API = "";
-
@Autowired
@@ -93,16 +94,12 @@
headers.put(CommonConstant.HTTP_USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
}
- if (!headers.containsKey(CommonConstant.USER_ID)) {
- headers.put(CommonConstant.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.USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
- }
- if (!headers.containsKey(CommonConstant.APP_ID)) {
- headers.put(CommonConstant.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());
}
@@ -154,7 +151,7 @@
}
if (!headers.containsKey(CommonConstant.USER_ID)) {
- headers.put(CommonConstant.USER_ID, "-1");
+ 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());
@@ -383,14 +380,10 @@
Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
ResultVo resultVo = getCommunityStoreInfoSMOImpl.getStoreInfo(pd, restTemplate, pd.getUserId());
- logger.debug("鏌ヨ鍟嗘埛淇℃伅 getStoreInfo 锛歿}",resultVo.toString());
+ 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 = getCommunityStoreInfoSMOImpl.getStoreEnterCommunitys(pd, storeId, storeTypeCd, restTemplate);
- return new ResponseEntity<String>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
- }
/**
* 鏌ヨ鍟嗘埛淇℃伅
@@ -399,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, "杩樻湭鍏ラ┗灏忓尯锛岃鍏堝叆椹诲皬鍖�");
@@ -422,7 +410,6 @@
}
}
-
private JSONObject getCurrentCommunity(JSONArray communitys, String communityId) {
for (int communityIndex = 0; communityIndex < communitys.size(); communityIndex++) {
--
Gitblit v1.8.0