From 80e39e3a40283521fc732c930aa51d9bece7c146 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 03 六月 2020 15:15:49 +0800
Subject: [PATCH] 云发单 后台管理
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
index f2a3b1f..475ed80 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -52,6 +52,7 @@
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
import com.yeshi.fanli.vo.user.UserDialogBtnVO;
import com.yeshi.fanli.vo.user.UserDialogVO;
import com.yeshi.fanli.vo.user.VIPUpgradedNotifyVO;
@@ -334,10 +335,10 @@
data.put("banner", new JSONArray());
} else {
// 鎴戠殑鐣岄潰banner
- List<SwiperPicture> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner",
+ List<BannerVO> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner",
acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
if (banner == null)
- banner = new ArrayList<SwiperPicture>();
+ banner = new ArrayList<BannerVO>();
data.put("banner", JsonUtil.getApiCommonGson().toJson(banner));
}
}
@@ -433,6 +434,12 @@
}
}
}
+
+ // 浜戝彂鍗曢摼鎺�
+ if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ data.put("cloudLink", configService.get(ConfigKeyEnum.robotCloudLink.getKey()));
+ }
+
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
--
Gitblit v1.8.0