From ee582a5d091966cf2324653c53a7553623e09730 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 23 九月 2019 19:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java | 233 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 159 insertions(+), 74 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..713caea 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
@@ -1,26 +1,25 @@
package com.yeshi.fanli.controller.admin;
import java.io.PrintWriter;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import javax.annotation.Resource;
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.yeshi.fanli.entity.admin.HotSearchAdmin;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.bus.search.HotSearch;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.bus.su.search.SuperHotSearch;
+import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
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.Utils;
-import org.yeshi.utils.JsonUtil;
+import com.yeshi.fanli.util.StringUtil;
import net.sf.json.JSONObject;
@@ -32,87 +31,173 @@
private HotSearchService hotSearchService;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private SuperHotSearchService superHotSearchService;
- @RequestMapping(value = "hotSearchList", method = RequestMethod.POST)
- public void getHotSearchList(int pageIndex,String platform,String packages,String key, PrintWriter out) {
-
- List<HotSearchAdmin> hotSearchs = hotSearchService.getHotSearchs(pageIndex - 1,platform,packages,key);
- int count =hotSearchService.getCount( platform, packages, key);
- int totalPage = count % Constant.PAGE_SIZE == 0 ? count
- / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;
- PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count,
- totalPage);
- Map<String, String> map = new HashMap<String, String>();
- map.put("platform", platform);
- map.put("packages", packages);
- map.put("key", key);
- pe.setParams(map);
- JSONObject data = new JSONObject();
- data.put("pe", pe);
- List<System> systemList = systemService.getSystems();
- data.put("systemList", systemList);
- data.put("hotSerachList", hotSearchs);
- out.print(JsonUtil.loadTrueResult(data));
- return;
- }
- @RequestMapping(value = "setHotSearchSystem", method = RequestMethod.POST)
- public void setHotSearchSystem(String type, long hsid, String platform,
- String packageName, PrintWriter out) {
- platform = Utils.getMap().get(platform);
- if (Constant.DEL.equals(type)) {
- Integer integer = superHotSearchService
- .deleteSuperHotSearch(hsid, platform, packageName);
- if (integer > 0) {
- out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
- } else {
- 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;
}
- } else {
- superHotSearchService.addSuperHotSearch(hsid, platform,packageName);
- out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
+
+ 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, Integer useType,
+ 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, useType);
+ if (list == null || list.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏇村鏁版嵁"));
+ return;
+ }
+
+ int count = hotSearchService.countList(key, systemId, useType);
+
+ 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();
}
}
- @RequestMapping(value = "getHotSearch", method = RequestMethod.POST)
- public void getHotSearch(long id,PrintWriter out){
- HotSearch rb = hotSearchService.getHotSearch(id);
- if(rb != null){
- out.print(JsonUtil.loadTrueResult(rb));
- return;
- }
- out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鐑棬鎼滅储"));
- }
-
- @RequestMapping(value = "addHotSearch", method = RequestMethod.POST)
- public void addHotSearch(HotSearch hotSearch, PrintWriter out) {
+ /**
+ * 鏂板-鏂板悗鍙�
+ * @param callback
+ * @param hotSearch
+ * @param out
+ */
+ @RequestMapping(value = "saveAdd")
+ public void saveAdd(String callback, HotSearch hotSearch, PrintWriter out) {
if (hotSearch == null) {
- out.print(JsonUtil.loadFalseResult("鐑棬鎼滅储涓嶈兘涓虹┖"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐑棬鎼滅储涓嶈兘涓虹┖"));
return;
}
- hotSearchService.addHotSearch(hotSearch);
- out.print(JsonUtil.loadTrueResult("娣诲姞鐑棬鎼滅储鎴愬姛"));
- return;
- }
-
- @RequestMapping(value = "deleteHotSearch", method = RequestMethod.POST)
- public void deleteSection(long[] hsids,PrintWriter out){
- Integer type = hotSearchService.deleteHotSearch(hsids);
- if(type==null){
- out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
- }else{
- out.print(JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+
+ if (StringUtil.isNullOrEmpty(hotSearch.getName())) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐑棬鎼滅储璇嶄笉鑳戒负绌�"));
+ return;
+ }
+
+ try {
+ Integer useType = hotSearch.getUseType();
+ if (useType == null) {
+ hotSearch.setUseType(Constant.SOURCE_TYPE_TAOBAO);
+ }
+
+ hotSearch.setId(null);
+ hotSearchService.addHotSearch(hotSearch);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("娣诲姞澶辫触"));
+ e.printStackTrace();
}
}
- @RequestMapping(value = "updateHotSearch", method = RequestMethod.POST)
- public void updateSection(HotSearch hotSearch,PrintWriter out){
- hotSearchService.updateHotSearch(hotSearch);
- out.print(JsonUtil.loadTrueResult("淇敼鎴愬姛"));
+ /**
+ * 鎵归噺鍒犻櫎-鏂板悗鍙�
+ * @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;
+ }
+
+ hotSearchService.deleteHotSearch(hsids);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
+
+ } 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 {
+ BusinessSystem system = businessSystemService.getById(systemId);
+ List<SuperHotSearch> list = superHotSearchService.getHotSearchSystem(id, systemId);
+ if (list == null || list.size() == 0) {
+ superHotSearchService.addSuper(id, system);
+ JSONObject data = new JSONObject();
+ data.put("check", 1);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } else {
+ superHotSearchService.deleteSuper(id, systemId);
+
+ JSONObject data = new JSONObject();
+ data.put("check", 0);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ }
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇敼寮傚父"));
+ e.printStackTrace();
+ }
+
}
}
--
Gitblit v1.8.0