From 9f2b31fa43f74dd6a04c2f3fa3af4d8fab6cd588 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期三, 21 十一月 2018 17:11:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 171 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java
index ca59685..2b8c4d1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java
@@ -7,22 +7,26 @@
import javax.annotation.Resource;
+import net.sf.json.JSONObject;
+
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.admin.HotSearchAdmin;
import com.yeshi.fanli.entity.bus.search.HotSearch;
+import com.yeshi.fanli.entity.bus.su.search.SuperHotSearch;
import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.service.inter.config.HotSearchService;
import com.yeshi.fanli.service.inter.config.SuperHotSearchService;
import com.yeshi.fanli.service.inter.config.SystemService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.Utils;
-import org.yeshi.utils.JsonUtil;
-
-import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/search")
@@ -110,9 +114,169 @@
}
}
- @RequestMapping(value = "updateHotSearch", method = RequestMethod.POST)
- public void updateSection(HotSearch hotSearch,PrintWriter out){
- hotSearchService.updateHotSearch(hotSearch);
- out.print(JsonUtil.loadTrueResult("淇敼鎴愬姛"));
+ @RequestMapping(value = "updateHotSearch")
+ public void updateSection(String callback, HotSearch hotSearch, PrintWriter out){
+ try {
+
+ if (hotSearch.getId() == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(hotSearch.getName())) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐑棬鎼滅储璇嶄笉鑳戒负绌�"));
+ return;
+ }
+
+ hotSearchService.updateHotSearch(hotSearch);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇敼澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 鏌ヨ鍒楄〃- 鏂板悗鍙�
+ * @param callback
+ * @param pageIndex
+ * @param platform
+ * @param packages
+ * @param key
+ * @param out
+ */
+ @RequestMapping(value = "newHotSearchList")
+ public void newHotSearchList(String callback, Integer pageIndex, String key, Long systemId,
+ PrintWriter out) {
+
+ if (pageIndex == null || pageIndex < 1) {
+ pageIndex = 1;
+ }
+
+ int pageSize = Constant.PAGE_SIZE;
+
+ try {
+ List<HotSearch> list = hotSearchService.listQuery(pageIndex - 1, pageSize, key, systemId);
+ if (list == null || list.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏇村鏁版嵁"));
+ return;
+ }
+
+ int count = hotSearchService.countList(key, systemId);
+
+ int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;
+ PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+
+ JSONObject data = new JSONObject();
+ data.put("pe", pe);
+ data.put("result_list", list);
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
+ e.printStackTrace();
+ }
+
+ }
+
+ /**
+ * 鏂板-鏂板悗鍙�
+ * @param callback
+ * @param hotSearch
+ * @param out
+ */
+ @RequestMapping(value = "saveAdd")
+ public void saveAdd(String callback, HotSearch hotSearch, PrintWriter out) {
+ if (hotSearch == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐑棬鎼滅储涓嶈兘涓虹┖"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(hotSearch.getName())) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐑棬鎼滅储璇嶄笉鑳戒负绌�"));
+ return;
+ }
+
+ try {
+ hotSearch.setId(null);
+ hotSearchService.addHotSearch(hotSearch);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("娣诲姞澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎-鏂板悗鍙�
+ * @param callback
+ * @param idArray
+ * @param out
+ */
+ @RequestMapping(value = "delete")
+ public void delete(String callback, String idArray, PrintWriter out){
+
+ if (StringUtil.isNullOrEmpty(idArray)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
+ return;
+ }
+
+ try {
+ Gson gson = new Gson();
+ long[] hsids = gson.fromJson(idArray, new TypeToken<long[]>() {}.getType());
+
+ if (hsids == null || hsids.length == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
+ return;
+ }
+
+ Integer type = hotSearchService.deleteHotSearch(hsids);
+ if(type==null){
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
+ }else{
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+ }
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+
+ @RequestMapping(value = "setSystem")
+ public void setSystem(String callback, String type, Long id, Long systemId, PrintWriter out) {
+
+ if (id == null || systemId == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
+ return;
+ }
+
+ try {
+ System system = systemService.getById(systemId);
+ List<SuperHotSearch> list = superHotSearchService.getHotSearchSystem(id, systemId);
+ if (list == null || list.size() == 0) {
+ superHotSearchService.addSuper(systemId, system);
+ JSONObject data = new JSONObject();
+ data.put("check", 1);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } else {
+ Integer count = superHotSearchService.deleteSuper(id, systemId);
+ if (count > 0) {
+ JSONObject data = new JSONObject();
+ data.put("check", 0);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } else {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇敼澶辫触"));
+ }
+ }
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇敼寮傚父"));
+ e.printStackTrace();
+ }
+
}
}
--
Gitblit v1.8.0