From c3a5e164cbabbfc5f66e1356cb0de657ce3f58b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 三月 2020 13:56:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java | 69 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 17 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 c204090..5e153dd 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,10 +2,13 @@
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
+import org.springframework.cache.ehcache.EhCacheCacheManager;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -26,10 +29,13 @@
@Resource
private ConfigService configService;
-
+
@Resource
- private AppVersionService appVersionService;
-
+ private AppVersionService appVersionService;
+
+ @Resource
+ private EhCacheCacheManager ehCacheCacheManager;
+
/**
* 鏌ヨ鍒楄〃 - 鏂板悗鍙�
*
@@ -48,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("鏆傛棤鏇村鏁版嵁"));
@@ -116,22 +137,20 @@
e.printStackTrace();
}
}
-
+
/**
- * 鏌ヨ鍒楄〃 - 鏂板悗鍙�
+ * 鐗堟湰鍙蜂俊鎭�
+ *
* @param callback
- * @param key 鏌ヨ璇� 鍚嶇О
- * @param pageIndex
* @param out
*/
@RequestMapping(value = "getVersionList")
- public void getVersionList(String callback, String key, Integer pageIndex, PrintWriter out){
-
+ public void getVersionList(String callback, PrintWriter out) {
+
try {
AppVersionInfo appVersionInfo = new AppVersionInfo();
appVersionInfo.setVersion("鍏ㄦ帹");
-
-
+
// IOS鐗堟湰
List<AppVersionInfo> list1 = appVersionService.getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_IOS);
if (list1 == null) {
@@ -140,27 +159,43 @@
List<AppVersionInfo> listIOS = new ArrayList<AppVersionInfo>();
listIOS.add(appVersionInfo);
listIOS.addAll(list1);
-
-
+
// 瀹夊崜鐗堟湰
- List<AppVersionInfo> list2 = appVersionService.getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_ANDROID);
+ List<AppVersionInfo> list2 = appVersionService
+ .getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_ANDROID);
if (list2 == null) {
list2 = new ArrayList<AppVersionInfo>();
}
List<AppVersionInfo> listAndroid = new ArrayList<AppVersionInfo>();
listAndroid.add(appVersionInfo);
listAndroid.addAll(list2);
-
+ //灏忕▼搴忕増鏈�
+ List<AppVersionInfo> list3 = appVersionService
+ .getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_XCX);
+ if (list3 == null) {
+ list3 = new ArrayList<AppVersionInfo>();
+ }
+ List<AppVersionInfo> listWxmp = new ArrayList<AppVersionInfo>();
+ listWxmp.add(appVersionInfo);
+ listWxmp.addAll(list3);
+
JSONObject data = new JSONObject();
data.put("android", listAndroid);
data.put("ios", listIOS);
-
+ data.put("wxmp", listWxmp);
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐗堟湰鏌ヨ澶辫触"));
e.printStackTrace();
}
}
+ @RequestMapping(value = "clearCaches")
+ public void clearCaches(String callback, PrintWriter out) {
+ ehCacheCacheManager.getCacheManager().clearAll();
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(""));
+ }
+
}
--
Gitblit v1.8.0