From 51c0049fb70c85bf515dc0fecd96bf13ca23aa28 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 24 四月 2020 18:37:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/controller/admin/HelpCenterAdminController.java | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 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..164fdb6 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 @@ -25,7 +25,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; @@ -83,6 +82,26 @@ } } + /** + * 淇敼鐘舵�� + * @param callback + * @param id + * @param out + */ + @RequestMapping(value = "switchState") + public void switchState(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) { @@ -349,7 +368,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 +376,25 @@ } } + /** + * 淇敼鐘舵�� + * @param callback + * @param id + * @param out + */ + @RequestMapping(value = "switchStateClass") + public void switchStateClass(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(); + } + } + /** * 淇敼鎺掑簭 -- Gitblit v1.8.0