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/HelpCenterAdminController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/HelpCenterAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/HelpCenterAdminController.java
index 164fdb6..469fc1d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/HelpCenterAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/HelpCenterAdminController.java
@@ -9,6 +9,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -162,8 +163,8 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Long cid, Integer orderMode,
- String version, String platform, Integer state,PrintWriter out) {
+ public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Long cid, Integer orderMode,
+ String version, String platform, Integer state, PrintWriter out) {
try {
if (orderMode == null)
orderMode = 1;
@@ -174,7 +175,7 @@
if (pageSize == null)
pageSize = Constant.PAGE_SIZE;
- List<HelpCenter> list = helpCenterService.query(0, Integer.MAX_VALUE, key, cid, orderMode, state);
+ List<HelpCenter> list = helpCenterService.query(0, Integer.MAX_VALUE, key, cid, orderMode, state,acceptData.getSystem());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
@@ -189,7 +190,7 @@
if (appVersion != null)
versionList.add(appVersion);
} else {
- List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform);
+ List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform,acceptData.getSystem());
if (appVersionList != null) {
versionList.addAll(appVersionList);
}
@@ -403,9 +404,9 @@
* @param out
*/
@RequestMapping(value = "updateSort")
- public void updateSort(String callback, Integer moveType, Long id, PrintWriter out) {
+ public void updateSort(AdminAcceptData acceptData, String callback, Integer moveType, Long id, PrintWriter out) {
try {
- helpClassService.updateSort(moveType, id);
+ helpClassService.updateSort(moveType, id,acceptData.getSystem());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
} catch (HelpClassException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -455,7 +456,7 @@
* @param out
*/
@RequestMapping(value = "queryClass")
- public void queryClass(String callback, Integer pageIndex, Integer pageSize, String key, Integer showState,
+ public void queryClass(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer showState,
String version, String platform, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
@@ -464,7 +465,7 @@
pageSize = Integer.MAX_VALUE;
try {
- List<HelpClass> list = helpClassService.query(0, pageSize, key, showState);
+ List<HelpClass> list = helpClassService.query(0, pageSize, key, showState,acceptData.getSystem());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
@@ -478,7 +479,7 @@
if (appVersion != null)
versionList.add(appVersion);
} else {
- List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform);
+ List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform,acceptData.getSystem());
if (appVersionList != null) {
versionList.addAll(appVersionList);
}
@@ -551,7 +552,7 @@
* @param out
*/
@RequestMapping(value = "getProvidedClass")
- public void getAllClass(String callback, PrintWriter out) {
+ public void getAllClass(AdminAcceptData acceptData, String callback, PrintWriter out) {
try {
HelpClass helpClass = new HelpClass();
@@ -561,7 +562,7 @@
List<HelpClass> reslut_list = new ArrayList<HelpClass>();
reslut_list.add(helpClass);
- List<HelpClass> list = helpClassService.getProvidedClass();
+ List<HelpClass> list = helpClassService.getProvidedClass(acceptData.getSystem());
if (list != null && list.size() > 0) {
reslut_list.addAll(list);
}
--
Gitblit v1.8.0