From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java
index c52bb82..619f84f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java
@@ -5,19 +5,20 @@
import javax.annotation.Resource;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.entity.bus.help.HelpCenter;
+import com.yeshi.fanli.entity.bus.help.HelpClass;
import com.yeshi.fanli.entity.bus.help.HelpInfo;
import com.yeshi.fanli.exception.HelpCenterException;
import com.yeshi.fanli.service.inter.help.HelpCenterService;
+import com.yeshi.fanli.service.inter.help.HelpClassService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.annotation.RequestNoSignValidate;
-import org.yeshi.utils.JsonUtil;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/apph5/v1/helpCenter")
@@ -26,6 +27,8 @@
@Resource
private HelpCenterService helpCenterService;
+ @Resource
+ private HelpClassService helpClassService;
/**
* 鏌ヨ甯姪鍒楄〃
@@ -35,9 +38,8 @@
* @param key
* @param out
*/
- @RequestNoSignValidate()
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key,
+ public void query(String callback, Integer pageIndex, Integer pageSize, String key, Long cid,
PrintWriter out) {
try {
@@ -48,15 +50,19 @@
if (pageSize == null)
pageSize = Constant.PAGE_SIZE;
+ if (cid != null && cid == 0) {
+ cid = null; // 鏌ヨ鍏ㄩ儴
+ }
+
List<HelpCenter> helpCenterList =
- helpCenterService.queryIdAndTitle((pageIndex - 1) * pageSize, pageSize, key);
+ helpCenterService.queryIdAndTitle((pageIndex - 1) * pageSize, pageSize, key, cid);
if (helpCenterList == null || helpCenterList.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
return;
}
- long count = helpCenterService.countQuery(key);
+ long count = helpCenterService.countQuery(key, cid);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -82,7 +88,6 @@
* @param id
* @param out
*/
- @RequestNoSignValidate()
@RequestMapping(value = "getInfo")
public void getInfo(String callback, Long id, PrintWriter out){
try {
@@ -119,4 +124,30 @@
}
}
+
+ /**
+ * 鏌ヨ鍚敤鐨勫垎绫�
+ * @param callback
+ * @param out
+ */
+ @RequestMapping(value = "getClass")
+ public void getClass(String callback, PrintWriter out) {
+
+ try {
+ List<HelpClass> list = helpClassService.getClassByState(1);
+ if (list == null || list.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
+ return;
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("class_list", list);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ e.printStackTrace();
+ }
+ }
+
}
--
Gitblit v1.8.0