From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/config/AppVersionServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/AppVersionServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/AppVersionServiceImpl.java
index d75e93f..4fe1945 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/AppVersionServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/AppVersionServiceImpl.java
@@ -65,38 +65,66 @@
}
@Override
- public List<Integer> listVersionCodeByVersions(String platform, List<String> listVersion){
+ public List<Integer> listVersionCodeByVersions(String platform, List<String> listVersion) {
List<Integer> listVersionCode = null;
if (listVersion == null || listVersion.size() == 0) {
return listVersionCode;
}
-
+
listVersionCode = new ArrayList<Integer>();
- for (String version: listVersion) {
- AppVersionInfo appVersion= getByPlatformAndVersion(platform, version);
+ for (String version : listVersion) {
+ AppVersionInfo appVersion = getByPlatformAndVersion(platform, version);
if (appVersion != null && appVersion.getVersionCode() != null) {
listVersionCode.add(appVersion.getVersionCode());
}
}
-
+
return listVersionCode;
}
-
+
@Override
- public List<AppVersionInfo> listByVersions(String platform, List<String> listVersion){
+ public List<AppVersionInfo> listByVersions(String platform, List<String> listVersion) {
List<AppVersionInfo> listVersionCode = null;
if (listVersion == null || listVersion.size() == 0) {
return listVersionCode;
}
-
+
listVersionCode = new ArrayList<AppVersionInfo>();
- for (String version: listVersion) {
- AppVersionInfo appVersion= getByPlatformAndVersion(platform, version);
+ for (String version : listVersion) {
+ AppVersionInfo appVersion = getByPlatformAndVersion(platform, version);
if (appVersion != null) {
listVersionCode.add(appVersion);
}
}
-
+
return listVersionCode;
}
+
+ @Override
+ public List<AppVersionInfo> listByPlatformAndMinVersionCode(String platform, int versionCode) {
+ return appVersionInfoMapper.listByPlatformAndMinVersionCode(platform, versionCode);
+ }
+
+ @Override
+ public AppVersionInfo selectByPrimaryKey(Long id) {
+ return appVersionInfoMapper.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public List<AppVersionInfo> listByVersion(String version) {
+
+ return null;
+ }
+
+ @Override
+ public AppVersionInfo getClientVersion(String platform, int versionCode) {
+ AppVersionInfo appInfo = getAppVersionInfoListByPlatformAndVersion(platform, versionCode);
+ if (appInfo != null)
+ return appInfo;
+ // 濡傛灉涓嶅瓨鍦ㄥ氨闄嶄綆鐗堟湰鍙锋煡璇�
+ if (versionCode > 0)
+ return getClientVersion(platform, versionCode - 1);
+
+ return null;
+ }
}
--
Gitblit v1.8.0