From ca1ad791b7b7b04e57db6bd4fb93f0c1066a9f99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 九月 2020 18:31:23 +0800
Subject: [PATCH] 淘口令格式兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/HelpCenterAdminController.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 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 3e7607a..7695068 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
@@ -31,10 +31,10 @@
import com.yeshi.fanli.service.inter.help.HelpCenterService;
import com.yeshi.fanli.service.inter.help.HelpClassService;
import com.yeshi.fanli.service.inter.homemodule.AdActivityVersionControlService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -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);
@@ -90,7 +90,7 @@
* @param out
*/
@RequestMapping(value = "switchState")
- public void switchState(String callback, Long id, PrintWriter out) {
+ public void switchState(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
try {
helpCenterService.switchState(id);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
@@ -104,7 +104,7 @@
@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("璇蜂紶閫掓纭弬鏁�"));
@@ -175,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;
@@ -268,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++) {
@@ -284,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);
@@ -303,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;
@@ -324,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("鏈�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -359,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) {
@@ -384,7 +384,7 @@
* @param out
*/
@RequestMapping(value = "switchStateClass")
- public void switchStateClass(String callback, Long id, PrintWriter out) {
+ public void switchStateClass(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
try {
helpClassService.switchState(id);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
@@ -404,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()));
@@ -425,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;
@@ -465,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;
@@ -552,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();
@@ -562,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);
}
@@ -586,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++) {
@@ -602,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