From 4e7907983a99e695f2acba4dec8bd73b7dbe6b2b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 14:41:33 +0800
Subject: [PATCH] optimize
---
java110-core/src/main/java/com/java110/core/component/BaseComponentSMO.java | 152 +-------------------------------------------------
1 files changed, 3 insertions(+), 149 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/component/BaseComponentSMO.java b/java110-core/src/main/java/com/java110/core/component/BaseComponentSMO.java
index c2f4bda..36451c2 100755
--- a/java110-core/src/main/java/com/java110/core/component/BaseComponentSMO.java
+++ b/java110-core/src/main/java/com/java110/core/component/BaseComponentSMO.java
@@ -1,29 +1,17 @@
package com.java110.core.component;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.context.IPageData;
-import com.java110.core.smo.IGetCommunityStoreInfoSMO;
-import com.java110.entity.component.ComponentValidateResult;
-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.factory.ApplicationContextFactory;
import com.java110.utils.util.Assert;
-import com.java110.utils.util.StringUtil;
-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 com.java110.core.log.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestTemplate;
import java.lang.reflect.Method;
-import java.util.Map;
/**
* Created by wuxw on 2019/3/22.
@@ -32,10 +20,7 @@
private static Logger logger = LoggerFactory.getLogger(BaseComponentSMO.class);
- protected static final int MAX_ROW = 50;
-
- @Autowired(required = false)
- private IGetCommunityStoreInfoSMO getCommunityStoreInfoSMOImpl;
+ protected static final int MAX_ROW = 200;
/**
* 璋冪敤缁勪欢
@@ -72,71 +57,6 @@
return responseEntity;
}
-
-
-
-
- /**
- * 鏌ヨ鍟嗘埛淇℃伅
- *
- * @return
- */
- protected ResponseEntity<String> getStoreInfo(IPageData pd, RestTemplate restTemplate) {
- Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
-
- ResultVo resultVo = getCommunityStoreInfoSMOImpl.getStoreInfo(pd, restTemplate, pd.getUserId());
-
- 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);
- }
-
- /**
- * 鏌ヨ鍟嗘埛淇℃伅
- *
- * @return
- */
- 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) {
- 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");
-
- if (communitys == null || communitys.size() == 0) {
- throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "杩樻湭鍏ラ┗灏忓尯锛岃鍏堝叆椹诲皬鍖�");
- }
-
- JSONObject currentCommunity = getCurrentCommunity(communitys, communityId);
-
- if (currentCommunity == null) {
- throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "浼犲叆灏忓尯ID闈炴硶锛岃姝ｅ父鎿嶄綔");
- }
-
- }
-
- private JSONObject getCurrentCommunity(JSONArray communitys, String communityId) {
- for (int communityIndex = 0; communityIndex < communitys.size(); communityIndex++) {
- if (communityId.equals(communitys.getJSONObject(communityIndex).getString("communityId"))) {
- return communitys.getJSONObject(communityIndex);
- }
- }
-
- return null;
- }
-
-
-
/**
* 鏍规嵁 璇锋眰璺緞 鍒ゆ柇鐢ㄦ埛鏄惁鏈夋潈闄愭搷浣�
*
@@ -144,9 +64,7 @@
* @param restTemplate
*/
protected void checkUserHasPrivilege(IPageData pd, RestTemplate restTemplate) {
-
//pd.get
-
}
/**
@@ -155,70 +73,8 @@
* @param pd
* @param restTemplate
*/
- protected void checkUserHasPrivilege(IPageData pd, RestTemplate restTemplate,String privilege) {
-
+ protected void checkUserHasPrivilege(IPageData pd, RestTemplate restTemplate, String privilege) {
//pd.get
-
- }
-
-
- /**
- * 鏍￠獙 鍛樺伐 鍟嗘埛 灏忓尯 鍏崇郴
- * <p>
- * 鍒ゆ柇鍛樺伐鍜屽晢鎴锋槸鍚︽湁鍏崇郴锛� 鍟嗘埛鍜� 灏忓尯鏄惁鏈夊叧绯�
- *
- * @param pd 椤甸潰鏁版嵁灏佽
- * @param restTemplate http璋冪敤宸ュ叿
- * @return ComponentValidateResult 鏍￠獙瀵硅薄
- */
- 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() + "");
- }
-
- 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");
-
- 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);
- }
- return new ComponentValidateResult(storeId, storeTypeCd, communityId, pd.getUserId(), pd.getUserName());
- }
-
- /**
- * 鏍￠獙 鍛樺伐 鍟嗘埛 鍏崇郴
- * <p>
- * 鍒ゆ柇鍛樺伐鍜屽晢鎴锋槸鍚︽湁鍏崇郴锛� 鍟嗘埛鍜� 鏄惁鏈夊叧绯�
- *
- * @param pd 椤甸潰鏁版嵁灏佽
- * @param restTemplate http璋冪敤宸ュ叿
- * @return ComponentValidateResult 鏍￠獙瀵硅薄
- */
- protected ComponentValidateResult validateStoreStaffRelationship(IPageData pd, RestTemplate restTemplate) {
-
- // 鏍￠獙 鍛樺伐鍜屽晢鎴锋槸鍚︽湁鍏崇郴
- 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鑺傜偣");
-
- String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
- String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
-
- return new ComponentValidateResult(storeId, storeTypeCd, "", pd.getUserId(), pd.getUserName());
}
/**
@@ -227,10 +83,8 @@
* @param pd 椤甸潰鏁版嵁灏佽
*/
protected void validatePageInfo(IPageData pd) {
-
Assert.jsonObjectHaveKey(pd.getReqData(), "row", "璇锋眰鎶ユ枃涓湭鍖呭惈row鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
-
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
Assert.isInteger(paramIn.getString("row"), "row蹇呴』涓烘暟瀛�");
Assert.isInteger(paramIn.getString("page"), "page蹇呴』涓烘暟瀛�");
--
Gitblit v1.8.0