From d5c47715dcf791ad31786c38ce369486e75acb35 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期四, 16 九月 2021 10:28:00 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java | 157 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 147 insertions(+), 10 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 e422877..79c9aa7 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,6 +5,7 @@
import com.java110.api.properties.WechatAuthProperties;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.basePrivilege.BasePrivilegeDto;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.utils.cache.PrivilegeCache;
@@ -13,16 +14,12 @@
import com.java110.utils.constant.ServiceCodeConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.exception.SMOException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.StringUtil;
-import com.java110.utils.util.UrlParamToJsonUtil;
+import com.java110.utils.util.*;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
@@ -32,7 +29,7 @@
private static final Logger logger = LoggerFactory.getLogger(DefaultAbstractComponentSMO.class);
protected static final String DEFAULT_PAY_ADAPT = "wechatPayAdapt";// 榛樿寰俊閫氱敤鏀粯
-
+ private static final String URL_API = "";
@Autowired
private IGetCommunityStoreInfoSMO getCommunityStoreInfoSMOImpl;
@@ -83,13 +80,31 @@
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());
+ }
+ if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
+ headers.put(CommonConstant.HTTP_TRANSACTION_ID, GenerateCodeFactory.getUUID());
+ }
+ if (!headers.containsKey(CommonConstant.HTTP_REQ_TIME)) {
+ headers.put(CommonConstant.HTTP_REQ_TIME, DateUtil.getNowDefault());
+ }
+ if (!headers.containsKey(CommonConstant.HTTP_SIGN)) {
+ headers.put(CommonConstant.HTTP_SIGN, "");
+ }
+
if (url.indexOf("?") > -1) {
url = url.substring(0, url.indexOf("?"));
}
headers.put(CommonConstant.HTTP_SERVICE, url);
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.getHttpMethodStr(httpMethod));
- initUrlParam(JSONObject.parseObject(param), headers);
+ if (HttpMethod.GET == httpMethod) {
+ initUrlParam(JSONObject.parseObject(param), headers);
+ }
if (HttpMethod.GET == httpMethod) {
headers.put("REQUEST_URL", "http://127.0.0.1:8008/" + url + mapToUrlParam(JSONObject.parseObject(param)));
}
@@ -341,8 +356,6 @@
}
-
-
private JSONObject getCurrentCommunity(JSONArray communitys, String communityId) {
for (int communityIndex = 0; communityIndex < communitys.size(); communityIndex++) {
if (communityId.equals(communitys.getJSONObject(communityIndex).getString("communityId"))) {
@@ -412,4 +425,128 @@
return new ComponentValidateResult(storeId, storeTypeCd, "", pd.getUserId(), pd.getUserName());
}
+ /**
+ * 鏌ヨ
+ *
+ * @param pd 椤甸潰瀵硅薄
+ * @param param 浼犲叆瀵硅薄
+ * @param serviceCode 鏈嶅姟缂栫爜
+ * @param t 杩斿洖绫�
+ * @param <T>
+ * @return
+ */
+ protected <T> T getForApi(IPageData pd, T param, String serviceCode, Class<T> t) {
+
+ List<T> list = getForApis(pd, param, serviceCode, t);
+ if (list != null && list.size() > 0) {
+ return list.get(0);
+ }
+ return null;
+ }
+
+ /**
+ * 鏌ヨ
+ *
+ * @param pd 椤甸潰瀵硅薄
+ * @param param 浼犲叆瀵硅薄
+ * @param serviceCode 鏈嶅姟缂栫爜
+ * @param t 杩斿洖绫�
+ * @param <T>
+ * @return
+ */
+ protected <T> T postForApi(IPageData pd, T param, String serviceCode, Class<T> t) {
+ List<T> ts = postForApis(pd, param, serviceCode, t);
+
+ if (ts == null || ts.size() < 1) {
+ return null;
+ }
+
+ return ts.get(0);
+ }
+
+ /**
+ * 鏌ヨ
+ *
+ * @param pd 椤甸潰瀵硅薄
+ * @param param 浼犲叆瀵硅薄
+ * @param serviceCode 鏈嶅姟缂栫爜
+ * @param t 杩斿洖绫�
+ * @param <T>
+ * @return
+ */
+ protected <T> List<T> postForApis(IPageData pd, T param, String serviceCode, Class<T> t) {
+
+ String url = URL_API + serviceCode;
+
+
+ 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"));
+ }
+
+ Object bObj = resultVo.get("data");
+ JSONArray datas = null;
+ if (bObj instanceof JSONObject) {
+ datas = new JSONArray();
+ datas.add(bObj);
+ } else {
+ datas = (JSONArray) bObj;
+ }
+ String jsonStr = JSONObject.toJSONString(datas);
+
+ List<T> list = JSONObject.parseArray(jsonStr, t);
+ return list;
+ }
+
+ /**
+ * 鏌ヨ
+ *
+ * @param pd 椤甸潰瀵硅薄
+ * @param param 浼犲叆瀵硅薄
+ * @param serviceCode 鏈嶅姟缂栫爜
+ * @param t 杩斿洖绫�
+ * @param <T>
+ * @return
+ */
+ protected <T> List<T> getForApis(IPageData pd, T param, String serviceCode, Class<T> t) {
+
+ String url = URL_API + serviceCode;
+ if (param != null) {
+ url += mapToUrlParam(BeanConvertUtil.beanCovertMap(param));
+ }
+
+ ResponseEntity<String> responseEntity = callCenterService(restTemplate, pd, "", url, HttpMethod.GET);
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ throw new SMOException("璋冪敤" + serviceCode + "澶辫触锛�" + responseEntity.getBody());
+ }
+
+ JSONObject resultVo = JSONObject.parseObject(responseEntity.getBody());
+
+ if (!"0".equals(resultVo.getString("code"))) {
+ throw new SMOException(resultVo.getString("msg"));
+ }
+
+ Object bObj = resultVo.get("data");
+ JSONArray datas = null;
+ if (bObj instanceof JSONObject) {
+ datas = new JSONArray();
+ datas.add(bObj);
+ } else {
+ datas = (JSONArray) bObj;
+ }
+ String jsonStr = JSONObject.toJSONString(datas);
+
+ List<T> list = JSONObject.parseArray(jsonStr, t);
+ return list;
+ }
+
+
}
--
Gitblit v1.8.0