From 8bc698dd14f30e40c8c83d42b9b08c38051e0cd0 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 01 二月 2024 18:16:21 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java | 291 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 254 insertions(+), 37 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..4d0533a 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,20 +5,24 @@
import com.java110.api.properties.WechatAuthProperties;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
-import com.java110.dto.basePrivilege.BasePrivilegeDto;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.core.factory.AuthenticationFactory;
+import com.java110.core.factory.GenerateCodeFactory;
+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.dto.system.ComponentValidateResult;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.cache.PrivilegeCache;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ResponseConstant;
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 com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -32,10 +36,10 @@
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;
-
@Autowired
private WechatAuthProperties wechatAuthProperties;
@@ -45,6 +49,9 @@
@Autowired
private RestTemplate restTemplate;
+
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
//寰俊鏀粯
public static final String DOMAIN_WECHAT_PAY = "WECHAT_PAY";
@@ -83,16 +90,87 @@
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());
+ }
+ if (!headers.containsKey(CommonConstant.APP_ID)) {
+ headers.put(CommonConstant.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 (url.indexOf("?") > -1) {
+ url = url.substring(0, url.indexOf("?"));
+ }
+ headers.put(CommonConstant.HTTP_SERVICE, url);
+ headers.put(CommonConstant.HTTP_METHOD, CommonConstant.getHttpMethodStr(httpMethod));
+ if (HttpMethod.GET == httpMethod) {
+ initUrlParam(JSONObject.parseObject(param), headers);
+ headers.put("REQUEST_URL", "http://127.0.0.1:8008/" + url + mapToUrlParam(JSONObject.parseObject(param)));
+ } else {
+ headers.put("REQUEST_URL", "http://127.0.0.1:8008/" + url);
+ }
+ AuthenticationFactory.createSign(headers, httpMethod, headers.get("REQUEST_URL"), param);
+
+ try {
+ responseEntity = apiServiceSMOImpl.service(param, headers);
+ } catch (HttpStatusCodeException e) { //杩欓噷spring 妗嗘灦 鍦�4XX 鎴� 5XX 鏃舵姏鍑� HttpServerErrorException 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
+ responseEntity = new ResponseEntity<String>(e.getResponseBodyAsString(), e.getStatusCode());
+ } catch (Exception e) {
+ responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ } finally {
+ logger.debug("璇锋眰鍦板潃涓�,{} 璇锋眰涓績鏈嶅姟淇℃伅锛寋},涓績鏈嶅姟杩斿洖淇℃伅锛寋}", url, param, responseEntity);
+ }
+ return responseEntity;
+ }
+
+ /**
+ * 璋冪敤涓績鏈嶅姟
+ *
+ * @return
+ */
+ protected ResponseEntity<String> callCenterService(Map<String, String> headers, String param, String url, HttpMethod httpMethod) {
+
+ ResponseEntity<String> responseEntity = null;
+ if (StringUtil.isEmpty(param)) {
+ param = UrlParamToJsonUtil.getJson(url).toJSONString();
+ }
+
+ 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());
+ }
+ if (!headers.containsKey(CommonConstant.HTTP_REQ_TIME)) {
+ headers.put(CommonConstant.HTTP_REQ_TIME, DateUtil.getNowDefault());
+ }
+
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)));
+ }else {
+ headers.put("REQUEST_URL", "http://127.0.0.1:8008/" + url);
}
+ AuthenticationFactory.createSign(headers, httpMethod, headers.get("REQUEST_URL"), param);
+
try {
responseEntity = apiServiceSMOImpl.service(param, headers);
} catch (HttpStatusCodeException e) { //杩欓噷spring 妗嗘灦 鍦�4XX 鎴� 5XX 鏃舵姏鍑� HttpServerErrorException 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
@@ -269,7 +347,8 @@
}
ResultVo resultVo = getCommunityStoreInfoSMOImpl.checkUserHasResourceListener(restTemplate, pd, paramIn, pd.getUserId());
- if (resultVo == null || resultVo.getCode() != ResultVo.CODE_OK) {
+ if (resultVo == null ||
+ resultVo.getCode() != ResultVo.CODE_OK) {
throw new UnsupportedOperationException("鐢ㄦ埛娌℃湁鏉冮檺鎿嶄綔");
}
JSONArray privileges = JSONArray.parseArray(resultVo.getMsg());
@@ -304,10 +383,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);
- }
/**
* 鏌ヨ鍟嗘埛淇℃伅
@@ -316,17 +391,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, "杩樻湭鍏ラ┗灏忓尯锛岃鍏堝叆椹诲皬鍖�");
@@ -339,8 +409,6 @@
}
}
-
-
private JSONObject getCurrentCommunity(JSONArray communitys, String communityId) {
@@ -364,26 +432,51 @@
*/
protected ComponentValidateResult validateStoreStaffCommunityRelationship(IPageData pd, RestTemplate restTemplate) {
- // 鏍￠獙 鍛樺伐鍜屽晢鎴锋槸鍚︽湁鍏崇郴
- ResponseEntity responseEntity = getStoreInfo(pd, restTemplate);
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
- throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, responseEntity.getBody() + "");
+ //鑾峰彇鐢ㄦ埛id
+ String userId = pd.getUserId();
+ if (StringUtil.isEmpty(userId)) {
+ return new ComponentValidateResult(null, null, null, null, null);
}
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ //鏌ヨ褰撳墠鐢ㄦ埛淇℃伅
+ List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
+ Assert.listOnlyOne(users, "鏌ヨ鐢ㄦ埛淇℃伅閿欒锛�");
+ if (!StringUtil.isEmpty(users.get(0).getLevelCd()) && !users.get(0).getLevelCd().equals("02")) { //02琛ㄧず鏅�氱敤鎴�
+ // 鏍￠獙 鍛樺伐鍜屽晢鎴锋槸鍚︽湁鍏崇郴
+ ResponseEntity responseEntity = getStoreInfo(pd, restTemplate);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, responseEntity.getBody() + "");
+ }
- Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeId", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛ID澶辫触锛屾湭鍖呭惈storeId鑺傜偣");
- Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeTypeCd", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛绫诲瀷澶辫触锛屾湭鍖呭惈storeTypeCd鑺傜偣");
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeId", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛ID澶辫触锛屾湭鍖呭惈storeId鑺傜偣");
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeTypeCd", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛绫诲瀷澶辫触锛屾湭鍖呭惈storeTypeCd鑺傜偣");
- String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
- String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
+ String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
+ String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
- JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
- String communityId = "";
- if (paramIn.containsKey("communityId") && !StringUtil.isEmpty(paramIn.getString("communityId"))) {
- communityId = paramIn.getString("communityId");
- checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
+ String 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);
+ }
+ return new ComponentValidateResult(storeId, storeTypeCd, communityId, pd.getUserId(), pd.getUserName());
+ } else {
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+
+ String communityId = "";
+ if (paramIn.containsKey("communityId") && !StringUtil.isEmpty(paramIn.getString("communityId"))) {
+ communityId = paramIn.getString("communityId");
+ }
+ return new ComponentValidateResult(null, null, communityId, pd.getUserId(), pd.getUserName());
}
- return new ComponentValidateResult(storeId, storeTypeCd, communityId, pd.getUserId(), pd.getUserName());
}
/**
@@ -412,4 +505,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);
+
+ 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) {
+ 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