From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java | 125 +++++++----------------------------------
1 files changed, 23 insertions(+), 102 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 2b8c4d1..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,32 +1,27 @@
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 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.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.StringUtil;
-import com.yeshi.fanli.util.Utils;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/search")
@@ -36,83 +31,11 @@
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("鍒犻櫎澶辫触"));
- }
- } else {
- superHotSearchService.addSuperHotSearch(hsid, platform,packageName);
- out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
- }
-
- }
-
- @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) {
- if (hotSearch == null) {
- out.print(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("鍒犻櫎澶辫触"));
- }
- }
@RequestMapping(value = "updateHotSearch")
public void updateSection(String callback, HotSearch hotSearch, PrintWriter out){
@@ -147,7 +70,7 @@
* @param out
*/
@RequestMapping(value = "newHotSearchList")
- public void newHotSearchList(String callback, Integer pageIndex, String key, Long systemId,
+ public void newHotSearchList(String callback, Integer pageIndex, String key, Long systemId, Integer useType,
PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
@@ -157,13 +80,13 @@
int pageSize = Constant.PAGE_SIZE;
try {
- List<HotSearch> list = hotSearchService.listQuery(pageIndex - 1, pageSize, key, systemId);
+ 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);
+ 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);
@@ -200,6 +123,11 @@
}
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("娣诲姞鎴愬姛"));
@@ -232,12 +160,8 @@
return;
}
- Integer type = hotSearchService.deleteHotSearch(hsids);
- if(type==null){
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
- }else{
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
- }
+ hotSearchService.deleteHotSearch(hsids);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
@@ -255,23 +179,20 @@
}
try {
- System system = systemService.getById(systemId);
+ BusinessSystem system = businessSystemService.getById(systemId);
List<SuperHotSearch> list = superHotSearchService.getHotSearchSystem(id, systemId);
if (list == null || list.size() == 0) {
- superHotSearchService.addSuper(systemId, system);
+ superHotSearchService.addSuper(id, 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("淇敼澶辫触"));
- }
- }
+ 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("淇敼寮傚父"));
--
Gitblit v1.8.0