From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/HelpCenterAdminController.java | 85 +++++++++++++++++++++++++++++++-----------
1 files changed, 62 insertions(+), 23 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 5ab3123..3a9b11e 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;
@@ -25,7 +26,6 @@
import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;
import com.yeshi.fanli.exception.config.HelpCenterException;
import com.yeshi.fanli.exception.config.HelpClassException;
-import com.yeshi.fanli.exception.homemodule.FloatADException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.help.HelpCenterService;
@@ -66,7 +66,7 @@
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback, HelpCenter helpCenter, String acction, String content, String html,
+ public void save(AdminAcceptData acceptData,String callback, HelpCenter helpCenter, String acction, String content, String html,
PrintWriter out) {
try {
helpCenterService.save(helpCenter, content, html);
@@ -83,8 +83,28 @@
}
}
+ /**
+ * 淇敼鐘舵��
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "switchState")
+ public void switchState(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
+ try {
+ helpCenterService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (HelpCenterException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+
@RequestMapping(value = "getInfo")
- public void getInfo(String callback, Long id, PrintWriter out) {
+ public void getInfo(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
if (id == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭弬鏁�"));
@@ -143,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;
@@ -155,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;
@@ -170,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);
}
@@ -248,7 +268,7 @@
* @param out
*/
@RequestMapping(value = "setCenterVersions")
- public void setCenterVersions(String callback, Long id, String versions, PrintWriter out) {
+ public void setCenterVersions(AdminAcceptData acceptData,String callback, Long id, String versions, PrintWriter out) {
JSONArray versionArray = JSONArray.fromObject(versions);
List<Long> versionIds = new ArrayList<>();
for (int i = 0; i < versionArray.size(); i++) {
@@ -264,7 +284,7 @@
}
@RequestMapping(value = "getCenterVersions")
- public void getCenterVersions(String callback, Long id, PrintWriter out) {
+ public void getCenterVersions(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
List<AdActivityVersionControl> list = adActivityVersionControlService
.listByTypeAndSourceId(AdActivityType.helpCenter, id);
@@ -283,7 +303,7 @@
* @param out
*/
@RequestMapping(value = "setWeight")
- public void setWeight(String callback, Long id, Integer weight, PrintWriter out) {
+ public void setWeight(AdminAcceptData acceptData,String callback, Long id, Integer weight, PrintWriter out) {
if (id == null || weight == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭弬鏁�"));
return;
@@ -304,7 +324,7 @@
* @param out
*/
@RequestMapping(value = "deleteBatch")
- public void deleteBatch(String callback, String idArray, PrintWriter out) {
+ public void deleteBatch(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -339,7 +359,7 @@
* @param out
*/
@RequestMapping(value = "saveClass")
- public void saveClass(String callback, HelpClass helpClass, HttpServletRequest request, PrintWriter out) {
+ public void saveClass(AdminAcceptData acceptData,String callback, HelpClass helpClass, HttpServletRequest request, PrintWriter out) {
try {
// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
if (request instanceof MultipartHttpServletRequest) {
@@ -349,7 +369,7 @@
helpClassService.save(helpClass, null);
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
- } catch (FloatADException e) {
+ } catch (HelpClassException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
@@ -357,6 +377,25 @@
}
}
+ /**
+ * 淇敼鐘舵��
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "switchStateClass")
+ public void switchStateClass(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
+ try {
+ helpClassService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (HelpClassException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
/**
* 淇敼鎺掑簭
@@ -365,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()));
@@ -386,7 +425,7 @@
* @param out
*/
@RequestMapping(value = "deleteClass")
- public void deleteClass(String callback, String idArray, PrintWriter out) {
+ public void deleteClass(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
return;
@@ -417,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) {
@@ -426,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;
@@ -440,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);
}
@@ -513,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();
@@ -523,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);
}
@@ -547,7 +586,7 @@
* @param out
*/
@RequestMapping(value = "setVersions")
- public void setVersions(String callback, Long id, String versions, PrintWriter out) {
+ public void setVersions(AdminAcceptData acceptData,String callback, Long id, String versions, PrintWriter out) {
JSONArray versionArray = JSONArray.fromObject(versions);
List<Long> versionIds = new ArrayList<>();
for (int i = 0; i < versionArray.size(); i++) {
@@ -563,7 +602,7 @@
}
@RequestMapping(value = "getVersions")
- public void getVersions(String callback, Long id, PrintWriter out) {
+ public void getVersions(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
List<AdActivityVersionControl> list = adActivityVersionControlService
.listByTypeAndSourceId(AdActivityType.helpClass, id);
--
Gitblit v1.8.0