From fe646416d8d46de7b896ddbf65a3ad0cd30b729b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 七月 2020 16:05:56 +0800
Subject: [PATCH] 大淘客与好单库与主包剥离
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 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 285404b..bc491e4 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
@@ -5,6 +5,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -38,7 +39,7 @@
@RequestMapping(value = "updateHotSearch")
- public void updateSection(String callback, HotSearch hotSearch, PrintWriter out){
+ public void updateSection(AdminAcceptData acceptData, String callback, HotSearch hotSearch, PrintWriter out){
try {
if (hotSearch.getId() == null) {
@@ -64,13 +65,11 @@
* 鏌ヨ鍒楄〃- 鏂板悗鍙�
* @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,
+ public void newHotSearchList(AdminAcceptData acceptData,String callback, Integer pageIndex, String key, Long systemId, Integer useType,
PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
@@ -80,13 +79,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,acceptData.getSystem());
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,acceptData.getSystem());
int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -111,7 +110,7 @@
* @param out
*/
@RequestMapping(value = "saveAdd")
- public void saveAdd(String callback, HotSearch hotSearch, PrintWriter out) {
+ public void saveAdd(AdminAcceptData acceptData,String callback, HotSearch hotSearch, PrintWriter out) {
if (hotSearch == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐑棬鎼滅储涓嶈兘涓虹┖"));
return;
@@ -123,6 +122,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("娣诲姞鎴愬姛"));
@@ -139,7 +143,7 @@
* @param out
*/
@RequestMapping(value = "delete")
- public void delete(String callback, String idArray, PrintWriter out){
+ public void delete(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out){
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -155,12 +159,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("鍒犻櫎澶辫触"));
@@ -170,7 +170,7 @@
@RequestMapping(value = "setSystem")
- public void setSystem(String callback, String type, Long id, Long systemId, PrintWriter out) {
+ public void setSystem(AdminAcceptData acceptData,String callback, String type, Long id, Long systemId, PrintWriter out) {
if (id == null || systemId == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -186,14 +186,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