From cdef8eba7ca9bd05d68a08bbe2d81ffc87830a59 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 30 Jan 2024 09:32:23 +0800
Subject: [PATCH] 预测水位请求地址修改
---
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/ZtApiServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/ZtApiServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/ZtApiServiceImpl.java
index da8da10..7973e15 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/ZtApiServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/ZtApiServiceImpl.java
@@ -1,11 +1,13 @@
package cn.gistack.nky.service.impl;
+import cn.gistack.common.utils.SpringContextUtil;
import cn.gistack.nky.resultpojo.DataBigResultPojo;
import cn.gistack.nky.resultpojo.DataResChildrenPo;
import cn.gistack.nky.resultpojo.DataResPo;
import cn.gistack.nky.resultpojo.ZtResultPo;
import cn.gistack.nky.service.IZtApiService;
import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -26,19 +28,32 @@
* @DATE: 2023/7/28 17:16
*/
@Service
+@Slf4j
public class ZtApiServiceImpl implements IZtApiService {
+
+ //本地测试
+ private static final String LOCAL = "https://sk.hubeishuiyi.cn";
+ //线上
+ private static final String ONLINE = "http://10.42.6.192";
+
private static final String API_KEY = "F1DBECD719108635189480CF60E6553ADB3109616426BD537F25A430DFC613B491A025C4A51E77FD08C6E5B7CBE05917A461286E7B6D69F1AB1B14F946149D2065B0C675F8FEDF4B9B05C1496881BC5A";
/**
* 实时渗压监测
*/
- private static final String LASTEST_OSMOTIC_PRESSURE = "https://sk.hubeishuiyi.cn/services/1234567890ABCDEFGHIJKLMN/monitor/lastest_osmotic_pressure/api?res_nm=&cd=&city_cd=&county_cd=&pageNo=1&pageSize=9999";
+ private static final String LASTEST_OSMOTIC_PRESSURE = "/services/1234567890ABCDEFGHIJKLMN/monitor/lastest_osmotic_pressure/api?res_nm=&cd=&city_cd=&county_cd=&pageNo=1&pageSize=9999";
/**
* 位移监测
*/
- private static final String WY_API = "https://sk.hubeishuiyi.cn/services/1234567890ABCDEFGHIJKLMN/monitor/wy/api?res_nm=&cd=&city_cd=&county_cd=&pageNo=1&pageSize=9999";
+ private static final String WY_API ="/services/1234567890ABCDEFGHIJKLMN/monitor/wy/api?res_nm=&cd=&city_cd=&county_cd=&pageNo=1&pageSize=9999";
+
+ /**
+ * 渗流监测
+ */
+ private static final String SL_API ="/services/1234567890ABCDEFGHIJKLMN/monitor/sl/api?res_nm=&cd=&city_cd=&county_cd=&pageNo=1&pageSize=9999";
+
@Override
public List<DataResChildrenPo> getSy() {
@@ -64,7 +79,25 @@
return getResData(WY_API, "get", params);
}
+ @Override
+ public List<DataResChildrenPo> getSl() {
+ Map<String, Object> params = new LinkedHashMap<>();
+ return getData(SL_API, "get", params);
+ }
+
private List<DataResChildrenPo> getData(String url, String type, Map<String, Object> params) {
+ // 获取环境
+ String activeProfile = SpringContextUtil.getActiveProfile();
+ if (activeProfile.equals("dev")) {
+ url = LOCAL+ url ;
+ }
+ if (activeProfile.equals("prod")) {
+ url = ONLINE+ url ;
+ }
+ if (activeProfile.equals("test")) {
+ url = ONLINE + url;
+ }
+
HttpMethod method;
if (type.toLowerCase().equals("get".toLowerCase())) {
method = HttpMethod.GET;
@@ -79,6 +112,7 @@
HttpEntity<String> httpEntity = new HttpEntity(null, headers);
RestTemplate template = new RestTemplate();
+ log.info("中台请求地址：{}", url);
ResponseEntity<ZtResultPo> ztResultPojoResponseEntity = template.exchange(url, method,httpEntity, ZtResultPo.class,params);
if (ztResultPojoResponseEntity.getStatusCodeValue() == 200) {
List<DataResChildrenPo> children = new ArrayList<>();
@@ -97,6 +131,20 @@
}
private List<DataResPo> getResData(String url, String type, Map<String, Object> params){
+
+ // 获取环境
+ String activeProfile = SpringContextUtil.getActiveProfile();
+ if (activeProfile.equals("dev")) {
+ url = LOCAL+ url ;
+ }
+ if (activeProfile.equals("prod")) {
+ url = ONLINE+ url ;
+ }
+ if (activeProfile.equals("test")) {
+ url = ONLINE + url;
+ }
+
+
HttpMethod method;
if (type.toLowerCase().equals("get".toLowerCase())) {
method = HttpMethod.GET;
--
Gitblit v1.9.3