From 9d35ba657fa5e3add766405d76e3ff8c4dcd4ad4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 15:38:00 +0800
Subject: [PATCH] 多系统兼容优化
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 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 ed1cb71..8e44425 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
@@ -11,6 +11,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.cache.ehcache.EhCacheCacheManager;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,6 +22,7 @@
import com.yeshi.fanli.dto.system.ListConfig;
import com.yeshi.fanli.entity.AppVersionInfo;
+import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.common.Config;
import com.yeshi.fanli.entity.system.ConfigCategory;
import com.yeshi.fanli.entity.system.ConfigCategory.ConfigCategoryEnum;
@@ -62,7 +64,7 @@
* @param out
*/
@RequestMapping(value = "getNewConfigList")
- public void getNewConfigList(String callback, String key, Integer pageIndex, PrintWriter out) {
+ public void getNewConfigList(AdminAcceptData acceptData, String callback, String key, Integer pageIndex, PrintWriter out) {
try {
@@ -70,17 +72,17 @@
pageIndex = 1;
}
- List<AppVersionInfo> versionList = appVersionService.getAppVersionInfoListByPlatform("android");
+ List<AppVersionInfo> versionList = appVersionService.getAppVersionInfoListByPlatform("android",acceptData.getSystem());
Map<Integer, String> androidMapName = new HashMap<>();
for (AppVersionInfo version : versionList)
androidMapName.put(version.getVersionCode(), version.getVersion());
- versionList = appVersionService.getAppVersionInfoListByPlatform("ios");
+ versionList = appVersionService.getAppVersionInfoListByPlatform("ios",acceptData.getSystem());
Map<Integer, String> iosMapName = new HashMap<>();
for (AppVersionInfo version : versionList)
iosMapName.put(version.getVersionCode(), version.getVersion());
- List<Config> list = configService.listObjects(key, pageIndex);
+ List<Config> list = configService.listObjects(key, pageIndex,acceptData.getSystem());
for (Config config : list) {
config.setMinAndroidVersion(androidMapName.get(config.getMinAndroidVersionCode()));
@@ -94,7 +96,7 @@
int pageSize = Constant.PAGE_SIZE;
- int count = configService.getCount(key);
+ int count = configService.getCount(key,acceptData.getSystem());
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -154,6 +156,15 @@
}
}
+
+ @RequestMapping(value = "getArticleHot")
+ public void getArticleHot(AcceptData acceptData, PrintWriter out) {
+ JSONObject data = new JSONObject();
+ data.put("list", configService.getValue(ConfigKeyEnum.articleHotWords.getKey(),acceptData.getSystem()));
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
+
/**
* 鐗堟湰鍙蜂俊鎭�
*
@@ -161,14 +172,14 @@
* @param out
*/
@RequestMapping(value = "getVersionList")
- public void getVersionList(String callback, PrintWriter out) {
+ public void getVersionList(AdminAcceptData acceptData, String callback, PrintWriter out) {
try {
AppVersionInfo appVersionInfo = new AppVersionInfo();
appVersionInfo.setVersion("鍏ㄦ帹");
// IOS鐗堟湰
- List<AppVersionInfo> list1 = appVersionService.getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_IOS);
+ List<AppVersionInfo> list1 = appVersionService.getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_IOS,acceptData.getSystem());
if (list1 == null) {
list1 = new ArrayList<AppVersionInfo>();
}
@@ -178,7 +189,7 @@
// 瀹夊崜鐗堟湰
List<AppVersionInfo> list2 = appVersionService
- .getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_ANDROID);
+ .getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_ANDROID,acceptData.getSystem());
if (list2 == null) {
list2 = new ArrayList<AppVersionInfo>();
}
@@ -187,7 +198,7 @@
listAndroid.addAll(list2);
//灏忕▼搴忕増鏈�
List<AppVersionInfo> list3 = appVersionService
- .getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_XCX);
+ .getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_XCX,acceptData.getSystem());
if (list3 == null) {
list3 = new ArrayList<AppVersionInfo>();
}
@@ -222,7 +233,7 @@
* @param out
*/
@RequestMapping(value = "getByCategory")
- public void getByCategory(String callback, String type, PrintWriter out) {
+ public void getByCategory(AdminAcceptData acceptData, String callback, String type, PrintWriter out) {
try {
ConfigCategoryEnum categoryEnum = configCategoryService.getCategoryEnum(type);
if (categoryEnum == null) {
@@ -235,7 +246,7 @@
List<ConfigCategory> listCategory = configCategoryService.listByType(categoryEnum);
if (listCategory != null) {
for (ConfigCategory category: listCategory) {
- Config config = configService.getConfigBykeyNoCache(category.getKeyEnum().getKey());
+ Config config = configService.getConfigBykeyNoCache(category.getKeyEnum().getKey(),acceptData.getSystem());
if (config != null) {
category.setConfig(config);
list.add(category);
@@ -283,9 +294,9 @@
* @param out
*/
@RequestMapping(value = "getBrandBgImg")
- public void getBrandBgImg(String callback, String type, PrintWriter out) {
+ public void getBrandBgImg(AdminAcceptData acceptData,String callback, String type, PrintWriter out) {
try {
- Config config = configService.getConfigBykeyNoCache(ConfigKeyEnum.brandBackgroundPicture.getKey());
+ Config config = configService.getConfigBykeyNoCache(ConfigKeyEnum.brandBackgroundPicture.getKey(),acceptData.getSystem());
JSONObject data = new JSONObject();
if (config == null || StringUtil.isNullOrEmpty(config.getValue())) {
@@ -303,11 +314,10 @@
/**
* 淇敼鍝佺墝鑳屾櫙鍥剧墖
* @param callback
- * @param listConfig
* @param out
*/
@RequestMapping(value = "changeBrandBgImg")
- public void changeBrandBgImg(String callback, HttpServletRequest request, Long id, PrintWriter out) {
+ public void changeBrandBgImg(AdminAcceptData acceptData,String callback, HttpServletRequest request, Long id, PrintWriter out) {
try {
MultipartFile file = null;
if (request instanceof MultipartHttpServletRequest) {
@@ -320,7 +330,7 @@
return;
}
- Config config = configService.getConfigBykeyNoCache(ConfigKeyEnum.brandBackgroundPicture.getKey());
+ Config config = configService.getConfigBykeyNoCache(ConfigKeyEnum.brandBackgroundPicture.getKey(),acceptData.getSystem());
if (config == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍝佺墝瀵硅薄涓嶅瓨鍦�"));
return;
--
Gitblit v1.8.0