From e7920b14a9baab97035a1a529da85d124a2bcacd Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 16 六月 2020 10:54:29 +0800
Subject: [PATCH] 云发单对测试用户显示
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 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 f085024..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
@@ -13,10 +13,10 @@
import com.google.gson.reflect.TypeToken;
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;
@@ -31,7 +31,7 @@
private HotSearchService hotSearchService;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private SuperHotSearchService superHotSearchService;
@@ -70,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) {
@@ -80,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);
@@ -123,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("娣诲姞鎴愬姛"));
@@ -155,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("鍒犻櫎澶辫触"));
@@ -178,7 +179,7 @@
}
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(id, system);
@@ -186,14 +187,11 @@
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) {
--
Gitblit v1.8.0