From 3d571a3e5ef8e6cc76214b79ea386455afb1bd9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 27 十二月 2024 11:02:05 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java
index ef7a61d..b4b61f3 100644
--- a/service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java
@@ -5,12 +5,14 @@
import com.java110.api.smo.IApiServiceSMO;
import com.java110.api.smo.api.IApiSMO;
import com.java110.core.context.IPageData;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.store.StoreDto;
+import com.java110.dto.system.ComponentValidateResult;
+import com.java110.intf.store.IStoreV1InnerServiceSMO;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -19,7 +21,6 @@
import javax.servlet.http.HttpServletRequest;
import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.util.Map;
@Service("apiSMOImpl")
@@ -27,6 +28,9 @@
@Autowired
private IApiServiceSMO apiServiceSMOImpl;
+
+ @Autowired
+ private IStoreV1InnerServiceSMO storeV1InnerServiceSMOImpl;
private final static Logger logger = LoggerFactory.getLogger(ApiSMOImpl.class);
@@ -51,6 +55,7 @@
}
JSONObject storeInfo = JSONObject.parseObject(responseEntity.getBody().toString());
+ //todo 璇存槑鏄笟涓荤洿鎺ヨ繑鍥�
if (!storeInfo.containsKey("storeId")) {
return new ComponentValidateResult("", "", "", pd.getUserId(), pd.getUserName());
}
@@ -63,8 +68,15 @@
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ //寮�鍙戣�呭拰杩愯惀涓嶆牎楠屽皬鍖�
+ if (StoreDto.STORE_TYPE_ADMIN.equals(storeTypeCd) || StoreDto.STORE_TYPE_DEV.equals(storeTypeCd)) {
+ return new ComponentValidateResult(storeId, storeTypeCd, "", pd.getUserId(), pd.getUserName());
+ }
+
String communityId = "";
- if (paramIn != null && paramIn.containsKey("communityId") && !StringUtil.isEmpty(paramIn.getString("communityId"))) {
+ if (paramIn != null && paramIn.containsKey("communityId")
+ && !StringUtil.isEmpty(paramIn.getString("communityId"))
+ && !"-1".equals(paramIn.getString("communityId"))) {
communityId = paramIn.getString("communityId");
checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
}
@@ -77,15 +89,24 @@
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
+ //todo 鏍￠獙鍛樺伐鏃� 鏄惁鏈夎闂皬鍖虹殑鏉冮檺
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
- if (!StringUtil.isEmpty(result.getUserId())) {
+ //todo 濡傛灉 鐧诲綍鐢ㄦ埛涓嶄负绌� 鍒欏皢 鍓嶆浼犻�掔殑user-id 閲嶅啓
+ if (!StringUtil.isEmpty(result.getLoginUserId())) {
headers.remove("user-id");
headers.remove("user_id");
headers.put("user-id", result.getUserId());
headers.put("user_id", result.getUserId());
- if (!StringUtil.isEmpty(result.getUserName())) {
- headers.put("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
- }
+ headers.put("login-user-id", result.getLoginUserId());
+ }
+ // todo 濡傛灉 鍟嗘埛涓嶄负绌哄垯 鍟嗘埛ID鍐欏叆鍙ご淇℃伅涓� 杩欓噷鐨勫晢鎴稩D 鍙互鏄墿涓欼D 鎴栬�呭晢瀹禝D
+ if (!StringUtil.isEmpty(result.getStoreId())) {
+ headers.remove("store-id");
+ headers.put("store-id", result.getStoreId());
+ }
+ if (!StringUtil.isEmpty(result.getStoreTypeCd())) {
+ headers.remove(CommonConstant.STORE_TYPE_CD);
+ headers.put(CommonConstant.STORE_TYPE_CD, result.getStoreTypeCd());
}
if (!headers.containsKey("user_id")) {
@@ -95,6 +116,7 @@
headers.put("user-id", "-1");
}
headers.put("store-id", result.getStoreId());
+ // todo 搴旂敤鏄惁鏈夋帴鍙ｆ潈闄愭牎楠�
ResponseEntity<String> responseEntity = apiServiceSMOImpl.service(body, headers);
return responseEntity;
}
--
Gitblit v1.8.0