From 88c7df1d5089d8e39f356a68eaccc18f308e190c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:10:07 +0800
Subject: [PATCH] Merge branch 'div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java | 130 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 130 insertions(+), 0 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 f889fde..c46029a 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
@@ -1,15 +1,24 @@
package com.yeshi.fanli.controller.admin;
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;
+import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.common.Config;
+import com.yeshi.fanli.entity.system.ConfigCategory;
+import com.yeshi.fanli.entity.system.ConfigCategory.ConfigCategoryEnum;
+import com.yeshi.fanli.service.inter.config.AppVersionService;
+import com.yeshi.fanli.service.inter.config.ConfigCategoryService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
@@ -24,6 +33,16 @@
@Resource
private ConfigService configService;
+ @Resource
+ private AppVersionService appVersionService;
+
+ @Resource
+ private EhCacheCacheManager ehCacheCacheManager;
+
+ @Resource
+ private ConfigCategoryService configCategoryService;
+
+
/**
* 鏌ヨ鍒楄〃 - 鏂板悗鍙�
*
@@ -42,7 +61,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("鏆傛棤鏇村鏁版嵁"));
@@ -109,7 +143,103 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇敼澶辫触"));
e.printStackTrace();
}
+ }
+ /**
+ * 鐗堟湰鍙蜂俊鎭�
+ *
+ * @param callback
+ * @param out
+ */
+ @RequestMapping(value = "getVersionList")
+ 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) {
+ list1 = new ArrayList<AppVersionInfo>();
+ }
+ List<AppVersionInfo> listIOS = new ArrayList<AppVersionInfo>();
+ listIOS.add(appVersionInfo);
+ listIOS.addAll(list1);
+
+ // 瀹夊崜鐗堟湰
+ 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(""));
+ }
+
+
+ /**
+ * 鏍规嵁鍒嗙被鏌ヨ
+ * @param callback
+ * @param type
+ * @param out
+ */
+ @RequestMapping(value = "getByCategory")
+ public void getByCategory(String callback, String type, PrintWriter out) {
+ try {
+ ConfigCategoryEnum categoryEnum = configCategoryService.getCategoryEnum(type);
+ if (categoryEnum == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐗堟湰鏌ヨ澶辫触"));
+ return;
+ }
+
+ List<Config> list = new ArrayList<>();
+
+ List<ConfigCategory> listCategory = configCategoryService.listByType(categoryEnum);
+ if (listCategory != null) {
+ for (ConfigCategory category: listCategory) {
+ Config config = configService.getConfigBykeyNoCache(category.getKeyEnum().getKey());
+ if (config != null) {
+ list.add(config);
+ }
+ }
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("list", list);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
+ e.printStackTrace();
+ }
}
}
--
Gitblit v1.8.0