From e143a763c75da7cc020bf19259256c8155b5da96 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 24 Jan 2024 17:05:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java
index 94eda58..31f8fab 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java
@@ -585,32 +585,32 @@
@Override
- public List<TotalInfo> getTotalInfo() {
- JSONObject ztData = this.getZtData(null, RIBAO_SHEET1_TOTAL_URL);
+ public List<TotalInfo> getTotalInfo(String isShow) {
+ JSONObject ztData = this.getZtData("&is_show="+isShow, RIBAO_SHEET1_TOTAL_URL);
JSONArray data = ztData.getJSONArray("data");
List<TotalInfo> list = data.toJavaList(TotalInfo.class);
return list;
}
@Override
- public List<DzkInfo> getDzkInfo() {
- JSONObject ztData = this.getZtData(null, RIBAO_SHEET2_ZDX_URL);
+ public List<DzkInfo> getDzkInfo(String isShow) {
+ JSONObject ztData = this.getZtData("&is_show="+isShow, RIBAO_SHEET2_ZDX_URL);
JSONArray data = ztData.getJSONArray("data");
List<DzkInfo> list = data.toJavaList(DzkInfo.class);
return list;
}
@Override
- public List<OverDetail> getOverDetailInfo() {
- JSONObject ztData = this.getZtData(null, RIBAO_SHEET3_OVER_STAG_LIST_URL);
+ public List<OverDetail> getOverDetailInfo(String isShow) {
+ JSONObject ztData = this.getZtData("&is_show="+isShow, RIBAO_SHEET3_OVER_STAG_LIST_URL);
JSONArray data = ztData.getJSONArray("data");
List<OverDetail> list = data.toJavaList(OverDetail.class);
return list;
}
@Override
- public List<SzInfo> getSzInfo() {
- JSONObject ztData = this.getZtData(null, SZ_INFO);
+ public List<SzInfo> getSzInfo(String isShow) {
+ JSONObject ztData = this.getZtData("?is_show="+isShow, SZ_INFO);
JSONArray data = ztData.getJSONArray("data");
List<SzInfo> list = data.toJavaList(SzInfo.class);
return list;
@@ -1119,13 +1119,13 @@
// 获取环境
String activeProfile = SpringContextUtil.getActiveProfile();
if (activeProfile.equals("dev")) {
- url = ZtApiUrlConstant.url_prefix_dev + url;
+ url = ZtApiUrlConstant.url_prefix_dev + url + params;
}
if (activeProfile.equals("prod")) {
- url = ZtApiUrlConstant.url_prefix_prod + url;
+ url = ZtApiUrlConstant.url_prefix_prod + url + params;
}
if (activeProfile.equals("test")) {
- url = ZtApiUrlConstant.url_prefix_test + url;
+ url = ZtApiUrlConstant.url_prefix_test + url + params;
}
//设置请求头
HttpHeaders headers = new HttpHeaders();
--
Gitblit v1.9.3