From 032eddac4b4627f855905e8e846b0388483e3979 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 11 九月 2019 11:58:50 +0800
Subject: [PATCH] 客户端参数/系统参数增加版本区分

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
index ca49c77..2ebf625 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
@@ -2,7 +2,9 @@
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
@@ -52,7 +54,22 @@
 				pageIndex = 1;
 			}
 
+			List<AppVersionInfo> versionList = appVersionService.getAppVersionInfoListByPlatform("android");
+			Map<Integer, String> androidMapName = new HashMap<>();
+			for (AppVersionInfo version : versionList)
+				androidMapName.put(version.getVersionCode(), version.getVersion());
+
+			versionList = appVersionService.getAppVersionInfoListByPlatform("ios");
+			Map<Integer, String> iosMapName = new HashMap<>();
+			for (AppVersionInfo version : versionList)
+				iosMapName.put(version.getVersionCode(), version.getVersion());
+
 			List<Config> list = configService.listObjects(key, pageIndex);
+
+			for (Config config : list) {
+				config.setMinAndroidVersion(androidMapName.get(config.getMinAndroidVersionCode()));
+				config.setMinIosVersion(iosMapName.get(config.getMinIosVersionCode()));
+			}
 
 			if (list == null || list.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏇村鏁版嵁"));
@@ -121,10 +138,9 @@
 		}
 	}
 
-	
-	
 	/**
 	 * 鐗堟湰鍙蜂俊鎭�
+	 * 
 	 * @param callback
 	 * @param out
 	 */

--
Gitblit v1.8.0