From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/config/AppVersionServiceImpl.java |   69 ++++++++++++++++++++++++----------
 1 files changed, 49 insertions(+), 20 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..e1f9661 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
@@ -6,6 +6,7 @@
 
 import javax.annotation.Resource;
 
+import com.yeshi.fanli.entity.SystemEnum;
 import org.springframework.stereotype.Service;
 
 import com.yeshi.fanli.dao.mybatis.AppVersionInfoMapper;
@@ -39,64 +40,92 @@
 	}
 
 	@Override
-	public List<AppVersionInfo> getAppVersionInfoListByPlatform(String platform) {
-		return appVersionInfoMapper.selectByPlatform(platform);
+	public List<AppVersionInfo> getAppVersionInfoListByPlatform(String platform, SystemEnum system) {
+		return appVersionInfoMapper.selectByPlatform(platform,system);
 	}
 
 	@Override
-	public AppVersionInfo getAppVersionInfoListByPlatformAndVersion(String platform, int versionCode) {
-		return appVersionInfoMapper.selectByPlatformAndVersionCode(platform, versionCode);
+	public AppVersionInfo getAppVersionInfoListByPlatformAndVersion(String platform, int versionCode, SystemEnum system) {
+		return appVersionInfoMapper.selectByPlatformAndVersionCode(platform, versionCode,system);
 	}
 
 	@Override
-	public AppVersionInfo getByPlatformAndVersion(String platform, String version) {
-		return appVersionInfoMapper.selectByPlatformAndVersion(platform, version);
+	public AppVersionInfo getByPlatformAndVersion(String platform, String version, SystemEnum system) {
+		return appVersionInfoMapper.selectByPlatformAndVersion(platform, version,system);
 	}
 
 	@Override
-	public List<AppVersionInfo> listByPlatformAndMinVersion(String platform, String version) {
-		AppVersionInfo appInfo = getByPlatformAndVersion(platform, version);
+	public List<AppVersionInfo> listByPlatformAndMinVersion(String platform, String version, SystemEnum system) {
+		AppVersionInfo appInfo = getByPlatformAndVersion(platform, version,system);
 		if (appInfo != null) {
 			List<AppVersionInfo> list = appVersionInfoMapper.listByPlatformAndMinVersionCode(platform,
-					appInfo.getVersionCode());
+					appInfo.getVersionCode(),system);
 			return list;
 		}
 		return null;
 	}
 
 	@Override
-	public List<Integer> listVersionCodeByVersions(String platform, List<String> listVersion){
+	public List<Integer> listVersionCodeByVersions(String platform, List<String> listVersion, SystemEnum system) {
 		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,system);
 			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, SystemEnum system) {
 		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,system);
 			if (appVersion != null) {
 				listVersionCode.add(appVersion);
 			}
 		}
-		
+
 		return listVersionCode;
 	}
+
+	@Override
+	public List<AppVersionInfo> listByPlatformAndMinVersionCode(String platform, int versionCode, SystemEnum system) {
+		return appVersionInfoMapper.listByPlatformAndMinVersionCode(platform, versionCode,system);
+	}
+
+	@Override
+	public AppVersionInfo selectByPrimaryKey(Long id) {
+		return appVersionInfoMapper.selectByPrimaryKey(id);
+	}
+
+	@Override
+	public List<AppVersionInfo> listByVersion(String version, SystemEnum system) {
+
+		return null;
+	}
+
+	@Override
+	public AppVersionInfo getClientVersion(String platform, int versionCode, SystemEnum system) {
+		AppVersionInfo appInfo = getAppVersionInfoListByPlatformAndVersion(platform, versionCode,system);
+		if (appInfo != null)
+			return appInfo;
+		// 濡傛灉涓嶅瓨鍦ㄥ氨闄嶄綆鐗堟湰鍙锋煡璇�
+		if (versionCode > 0)
+			return getClientVersion(platform, versionCode - 1,system);
+
+		return null;
+	}
 }

--
Gitblit v1.8.0