From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/config/AppVersionServiceImpl.java |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 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 c08f75d..d75e93f 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
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.service.impl.config;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -63,4 +64,39 @@
 		return null;
 	}
 
+	@Override
+	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);
+			if (appVersion != null && appVersion.getVersionCode() != null) {
+				listVersionCode.add(appVersion.getVersionCode());
+			}
+		}
+		
+		return listVersionCode;
+	}
+	
+	@Override
+	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);
+			if (appVersion != null) {
+				listVersionCode.add(appVersion);
+			}
+		}
+		
+		return listVersionCode;
+	}
 }

--
Gitblit v1.8.0