From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-core/src/main/java/com/java110/core/base/smo/front/BaseFrontServiceSMO.java | 147 ------------------------------------------------
1 files changed, 2 insertions(+), 145 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/base/smo/front/BaseFrontServiceSMO.java b/java110-core/src/main/java/com/java110/core/base/smo/front/BaseFrontServiceSMO.java
old mode 100644
new mode 100755
index 6e0286b..b18d9e1
--- a/java110-core/src/main/java/com/java110/core/base/smo/front/BaseFrontServiceSMO.java
+++ b/java110-core/src/main/java/com/java110/core/base/smo/front/BaseFrontServiceSMO.java
@@ -11,7 +11,7 @@
import com.java110.utils.util.StringUtil;
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.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -33,7 +33,7 @@
**/
public class BaseFrontServiceSMO extends BaseServiceSMO {
- private static final String URL_API = ServiceConstant.SERVICE_API_URL + "/api/";
+ private static final String URL_API = "";
//鏃ュ織
private static Logger logger = LoggerFactory.getLogger(BaseFrontServiceSMO.class);
@@ -41,150 +41,7 @@
private RestTemplate restTemplate;
- /**
- * 鏌ヨ
- *
- * @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;
- }
-
- protected ResponseEntity<String> callCenterService(RestTemplate restTemplate, IPageData pd, String param, String url, HttpMethod httpMethod) {
- ResponseEntity<String> responseEntity = null;
- HttpHeaders header = new HttpHeaders();
- header.add(CommonConstant.HTTP_APP_ID.toLowerCase(), pd.getAppId());
- header.add(CommonConstant.HTTP_USER_ID.toLowerCase(), StringUtil.isEmpty(pd.getUserId()) ? CommonConstant.ORDER_DEFAULT_USER_ID : pd.getUserId());
- header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), pd.getTransactionId());
- header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), pd.getRequestTime());
- header.add(CommonConstant.HTTP_SIGN.toLowerCase(), "");
- HttpEntity<String> httpEntity = new HttpEntity<String>(param, header);
- //logger.debug("璇锋眰涓績鏈嶅姟淇℃伅锛寋}", httpEntity);
- try {
- responseEntity = restTemplate.exchange(url, httpMethod, httpEntity, String.class);
- } 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, httpEntity, responseEntity);
- }
- return responseEntity;
- }
}
--
Gitblit v1.8.0