From d516e38fd44e186f393bbb05c4e7ca34b323b609 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 16 五月 2023 18:50:52 +0800
Subject: [PATCH] optimize report
---
java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java | 101 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 77 insertions(+), 24 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java b/java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java
index ed3daf6..9808e05 100755
--- a/java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java
@@ -2,11 +2,12 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.context.Environment;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
+import com.java110.core.log.LoggerFactory;
import com.java110.dto.app.AppDto;
import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.exception.SMOException;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.BeanConvertUtil;
@@ -14,13 +15,8 @@
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.HttpEntity;
-import org.springframework.http.HttpHeaders;
-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;
@@ -29,12 +25,14 @@
public class CallApiServiceFactory {
- private static final String URL_API = "";
+ private static final String URL_API = "http://api-service/api/";
+ private static final String URL_BOOT_API = "http://127.0.0.1:8008/api/";
//鏃ュ織
private static Logger logger = LoggerFactory.getLogger(CallApiServiceFactory.class);
@Autowired
private RestTemplate restTemplate;
+
/**
* 鏌ヨ
@@ -65,9 +63,29 @@
* @param <T>
* @return
*/
- public static <T> T postForApi(String appId, T param, String serviceCode, Class<T> t) {
+ public static <T> T getForApi(String appId, T param, String serviceCode, Class<T> t,String userId) {
- IPageData pd = PageData.newInstance().builder("-1", "鏈煡", "", "", "", "", "", "", appId);
+ IPageData pd = PageData.newInstance().builder(userId, "鏈煡", "", "", "", "", "", "", appId);
+
+ List<T> list = getForApis(pd, param, serviceCode, t);
+ if (list != null && list.size() > 0) {
+ return list.get(0);
+ }
+ return null;
+ }
+
+ /**
+ * 鏌ヨ
+ *
+ * @param param 浼犲叆瀵硅薄
+ * @param serviceCode 鏈嶅姟缂栫爜
+ * @param t 杩斿洖绫�
+ * @param <T>
+ * @return
+ */
+ public static <T> T postForApi(String appId, T param, String serviceCode, Class<T> t, String userId) {
+
+ IPageData pd = PageData.newInstance().builder(userId, "鏈煡", "", "", "", "", "", "", appId);
List<T> ts = postForApis(pd, param, serviceCode, t);
@@ -76,6 +94,21 @@
}
return ts.get(0);
+ }
+
+
+ /**
+ * 鏌ヨ
+ *
+ * @param param 浼犲叆瀵硅薄
+ * @param serviceCode 鏈嶅姟缂栫爜
+ * @param t 杩斿洖绫�
+ * @param <T>
+ * @return
+ */
+ public static <T> T postForApi(String appId, T param, String serviceCode, Class<T> t) {
+
+ return postForApi(appId, param, serviceCode, t, "-1");
}
@@ -132,6 +165,10 @@
String url = URL_API + serviceCode;
RestTemplate restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
+ if (Environment.isStartBootWay()) {
+ url = URL_BOOT_API + serviceCode;
+ restTemplate = ApplicationContextFactory.getBean("outRestTemplate", RestTemplate.class);
+ }
ResponseEntity<String> responseEntity = callCenterService(restTemplate, pd, JSONObject.toJSONString(param), url, HttpMethod.POST);
@@ -141,12 +178,17 @@
}
JSONObject resultVo = JSONObject.parseObject(responseEntity.getBody());
-
- if (ResultVo.CODE_MACHINE_OK != resultVo.getInteger("code")) {
- throw new SMOException(resultVo.getString("msg"));
+ Object bObj = null;
+ if(resultVo.containsKey("code")){
+ if (ResultVo.CODE_MACHINE_OK != resultVo.getInteger("code")) {
+ throw new SMOException(resultVo.getString("msg"));
+ }
+ bObj = resultVo.get("data");
+ }else{
+ bObj = resultVo;
}
- Object bObj = resultVo.get("data");
+
JSONArray datas = null;
if (bObj instanceof JSONObject) {
datas = new JSONArray();
@@ -173,10 +215,16 @@
public static <T> List<T> getForApis(IPageData pd, T param, String serviceCode, Class<T> t) {
String url = URL_API + serviceCode;
+ RestTemplate restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
+
+ if (Environment.isStartBootWay()) {
+ url = URL_BOOT_API + serviceCode;
+ restTemplate = ApplicationContextFactory.getBean("outRestTemplate", RestTemplate.class);
+ }
+
if (param != null) {
url += mapToUrlParam(BeanConvertUtil.beanCovertMap(param));
}
- RestTemplate restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
ResponseEntity<String> responseEntity = callCenterService(restTemplate, pd, "", url, HttpMethod.GET);
@@ -186,11 +234,15 @@
JSONObject resultVo = JSONObject.parseObject(responseEntity.getBody());
- if (!"0".equals(resultVo.getString("code"))) {
- throw new SMOException(resultVo.getString("msg"));
+ Object bObj = null;
+ if(resultVo.containsKey("code")){
+ if (ResultVo.CODE_MACHINE_OK != resultVo.getInteger("code")) {
+ throw new SMOException(resultVo.getString("msg"));
+ }
+ bObj = resultVo.get("data");
+ }else{
+ bObj = resultVo;
}
-
- Object bObj = resultVo.get("data");
JSONArray datas = null;
if (bObj instanceof JSONObject) {
datas = new JSONArray();
@@ -213,7 +265,7 @@
if (pd.getHeaders() != null) {
for (String key : pd.getHeaders().keySet()
) {
- if(CommonConstant.USER_ID.equals(key.toLowerCase())){
+ if (CommonConstant.USER_ID.equals(key.toLowerCase())) {
continue;
}
header.add(key, pd.getHeaders().get(key).toString());
@@ -223,19 +275,20 @@
header.add(CommonConstant.HTTP_USER_ID.toLowerCase(), StringUtil.isEmpty(pd.getUserId()) ? CommonConstant.ORDER_DEFAULT_USER_ID : pd.getUserId());
header.add(CommonConstant.USER_ID.toLowerCase(), StringUtil.isEmpty(pd.getUserId()) ? CommonConstant.ORDER_DEFAULT_USER_ID : pd.getUserId());
- header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), StringUtil.isEmpty(pd.getTransactionId())?GenerateCodeFactory.getUUID():pd.getTransactionId());
- header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), StringUtil.isEmpty(pd.getRequestTime())?DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT):pd.getRequestTime());
+ header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), StringUtil.isEmpty(pd.getTransactionId()) ? GenerateCodeFactory.getUUID() : pd.getTransactionId());
+ header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), StringUtil.isEmpty(pd.getRequestTime()) ? DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT) : 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 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
- logger.error("璋冪敤涓績鏈嶅姟澶辫触",e);
+ logger.error("璋冪敤涓績鏈嶅姟澶辫触", e);
responseEntity = new ResponseEntity<String>(e.getResponseBodyAsString(), e.getStatusCode());
} catch (Exception e) {
- logger.error("璋冪敤涓績鏈嶅姟澶辫触",e);
+ logger.error("璋冪敤涓績鏈嶅姟澶辫触", e);
responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
logger.debug("璇锋眰鍦板潃涓�,{} 璇锋眰涓績鏈嶅姟淇℃伅锛寋},涓績鏈嶅姟杩斿洖淇℃伅锛寋}", url, httpEntity, responseEntity);
--
Gitblit v1.8.0