From d18cb9f2d48f889e1a944c46dde2886fdf93f9dd Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 08 一月 2024 16:11:31 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java | 53 ++++++++++++++++++++++++-----------------------------
1 files changed, 24 insertions(+), 29 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java b/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java
index 739afe5..132c4a9 100644
--- a/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java
+++ b/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java
@@ -5,11 +5,12 @@
import com.java110.api.properties.WechatAuthProperties;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
-import com.java110.core.context.SecureInvocation;
import com.java110.core.factory.GenerateCodeFactory;
-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.user.IUserInnerServiceSMO;
import com.java110.utils.cache.PrivilegeCache;
import com.java110.utils.constant.CommonConstant;
@@ -20,7 +21,7 @@
import com.java110.utils.util.*;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -88,11 +89,11 @@
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);
+ }
+ if (!headers.containsKey(CommonConstant.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());
@@ -144,10 +145,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());
@@ -383,10 +382,6 @@
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);
- }
/**
* 鏌ヨ鍟嗘埛淇℃伅
@@ -395,17 +390,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, "杩樻湭鍏ラ┗灏忓尯锛岃鍏堝叆椹诲皬鍖�");
@@ -467,7 +457,12 @@
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
String communityId = "";
- if (paramIn.containsKey("communityId") && !StringUtil.isEmpty(paramIn.getString("communityId"))) {
+ if (paramIn.containsKey("communityId")
+ && !StringUtil.isEmpty(paramIn.getString("communityId"))
+ && !"-1".equals(paramIn.getString("communityId"))
+ && !StoreDto.STORE_TYPE_ADMIN.equals(storeTypeCd)
+ && !StoreDto.STORE_TYPE_DEV.equals(storeTypeCd)
+ ) {
communityId = paramIn.getString("communityId");
checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
}
@@ -565,16 +560,16 @@
ResponseEntity<String> responseEntity = callCenterService(restTemplate, pd, JSONObject.toJSONString(param), url, HttpMethod.POST);
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
- throw new SMOException("璋冪敤" + serviceCode + "澶辫触锛�" + responseEntity.getBody());
- }
-
JSONObject resultVo = JSONObject.parseObject(responseEntity.getBody());
if (ResultVo.CODE_MACHINE_OK != resultVo.getInteger("code")) {
throw new SMOException(resultVo.getString("msg"));
}
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ throw new SMOException(resultVo.getString("msg"));
+ }
+
Object bObj = resultVo.get("data");
JSONArray datas = null;
if (bObj instanceof JSONObject) {
--
Gitblit v1.8.0