From d5aef2e06c79541ed003af44e621df7c57fcf2e7 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 29 Jan 2024 16:02:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java
index 31a155d..4b43aa8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java
@@ -1,5 +1,6 @@
package cn.gistack.nky.service.impl;
+import cn.gistack.common.utils.SpringContextUtil;
import cn.gistack.nky.entity.AlarmGet;
import cn.gistack.nky.entity.ArimaPredict;
import cn.gistack.nky.entity.HstPredict;
@@ -9,6 +10,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.http.*;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
@@ -24,25 +26,26 @@
*/
@Service
@AllArgsConstructor
+@Slf4j
public class NkyServiceImpl implements INkyService {
private static final String API_PREFIX = "http://10.42.7.146:9503/";
private static final String LOCAL_API_PREFIX = "https://sk.hubeishuiyi.cn/warnIp/";
// ARIMA预测接口URL
- private static final String ARIMA_PREDICT = API_PREFIX + "predict/arimaPredict";
+ private static final String ARIMA_PREDICT = "predict/arimaPredict";
// ARIMA预测结果接口
- private static final String ARIMA_QUERY = API_PREFIX+"predict/arimaQuery";
+ private static final String ARIMA_QUERY = "predict/arimaQuery";
// HST预测接口URL
- private static final String HST_PREDICT =API_PREFIX+ "predict/hstPredict";
+ private static final String HST_PREDICT = "predict/hstPredict";
// HST预测结果接口
- private static final String HST_QUERY =API_PREFIX+ "predict/hstQuery";
+ private static final String HST_QUERY = "predict/hstQuery";
//按库传输数据接口
- private static final String ORIGIN_BATCHDATA = API_PREFIX + "origin/batchData";
+ private static final String ORIGIN_BATCHDATA = "origin/batchData";
//判定异常
- private static final String ALARM_GET = API_PREFIX+"alarm/get";
+ private static final String ALARM_GET = "alarm/get";
@Override
public Boolean arimaPredict(ArimaPredictReqPo po) {
@@ -106,6 +109,19 @@
* @return
*/
private JSONObject requestNkyApi(String url, String jsonparams) {
+
+ // 获取环境
+ String activeProfile = SpringContextUtil.getActiveProfile();
+ if (activeProfile.equals("dev")) {
+ url = LOCAL_API_PREFIX+ url ;
+ }
+ if (activeProfile.equals("prod")) {
+ url = API_PREFIX+ url ;
+ }
+ if (activeProfile.equals("test")) {
+ url = API_PREFIX + url;
+ }
+
// 声明一个header变量
HttpHeaders headers = new HttpHeaders();
// 设置为json格式
@@ -114,10 +130,11 @@
headers.add("Accept", MediaType.APPLICATION_JSON.toString());
HttpEntity<String> httpEntity = new HttpEntity(jsonparams, headers);
- System.out.println("请求参数："+ jsonparams);
+ log.info("请求地址："+ url);
+ log.info("请求参数："+ jsonparams);
RestTemplate template = new RestTemplate();
String resultStr = template.postForObject(url, httpEntity, String.class);
- System.out.println(resultStr);
+ log.info("请求结果："+ resultStr);
JSONObject jsonObject = JSONObject.parseObject(resultStr);
return jsonObject;
}
--
Gitblit v1.9.3