From 6fdcc0c26dd33e87a024a69ed635d9aedb59cad6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 一月 2020 12:02:50 +0800
Subject: [PATCH] 订单搜索引擎增量更新
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java | 67 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java
index eea312b..fb5042e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java
@@ -32,18 +32,16 @@
@Resource
private HelpCenterService helpCenterService;
-
+
@Resource
private HelpClassService helpClassService;
-
+
@Resource
private AppVersionService appVersionService;
-
+
@Resource
private AdActivityVersionControlService adActivityVersionControlService;
-
-
-
+
/**
* 鏌ヨ甯姪鍒楄〃
* @param callback
@@ -53,34 +51,35 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback,AcceptData acceptData, Long pageId, Integer pageSize, String key, Long cid,
+ public void query(String callback, AcceptData acceptData, Long pageId, Integer pageSize, String key, Long cid,
PrintWriter out) {
try {
- if (pageSize == null)
+ if (pageSize == null)
pageSize = Constant.PAGE_SIZE;
-
+
if (cid != null && cid == 0)
cid = null; // 鏌ヨ鍏ㄩ儴
-
- if (!StringUtil.isNullOrEmpty(key))
+
+ if (!StringUtil.isNullOrEmpty(key))
key = key.trim();
-
+
if (pageId == null)
pageId = 0L;
-
- List<HelpCenter> list = helpCenterService.listValid(pageId, pageSize, key, cid);
- if (list == null) {
- pageId = 0L;
- list = new ArrayList<HelpCenter>();
- } else if (list.size() == 0) {
+
+ List<HelpCenter> list1 = helpCenterService.listValid(pageId, pageSize, key, cid);
+ List<HelpCenter> list = new ArrayList<>();
+ if (list1 != null && list1.size() > 0)
+ list.addAll(list1);
+
+ if (list.size() == 0) {
pageId = 0L;
} else {
- pageId = list.get(list.size()-1).getId();
-
+ pageId = list.get(list.size() - 1).getId();
+
// 鐗堟湰杩囨护
int version = Integer.parseInt(acceptData.getVersion());
String platform = acceptData.getPlatform().toLowerCase();
- List<AppVersionInfo> versionList = appVersionService.listByPlatformAndMinVersionCode(platform,version);
+ List<AppVersionInfo> versionList = appVersionService.listByPlatformAndMinVersionCode(platform, version);
if (versionList == null || versionList.size() <= 0) {
list.clear();
} else {
@@ -101,7 +100,7 @@
}
}
}
-
+
JSONObject data = new JSONObject();
data.put("pageId", pageId);
data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));
@@ -111,8 +110,7 @@
e.printStackTrace();
}
}
-
-
+
/**
* 鑾峰彇甯姪璇︽儏
* @param callback
@@ -120,7 +118,7 @@
* @param out
*/
@RequestMapping(value = "getInfo")
- public void getInfo(String callback, Long id, PrintWriter out){
+ public void getInfo(String callback, Long id, PrintWriter out) {
try {
if (id == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ュ唴瀹逛笉瀛樺湪"));
@@ -131,16 +129,16 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ュ唴瀹瑰凡涓嶅瓨鍦�"));
return;
}
-
+
String html = null;
HelpInfo helpInfo = helpCenterService.getHelpInfoCache(id);
if (helpInfo != null) {
html = helpInfo.getHtml();
}
-
+
JSONObject data = new JSONObject();
- data.put("id",crrent.getId());
- data.put("title",crrent.getTitle());
+ data.put("id", crrent.getId());
+ data.put("title", crrent.getTitle());
data.put("html", html);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
@@ -148,8 +146,7 @@
e.printStackTrace();
}
}
-
-
+
/**
* 鏌ヨ鍚敤鐨勫垎绫�
* @param callback
@@ -162,11 +159,11 @@
if (list == null || list.size() == 0) {
list = new ArrayList<>();
}
-
+
// 鐗堟湰杩囨护
int version = Integer.parseInt(acceptData.getVersion());
String platform = acceptData.getPlatform().toLowerCase();
- List<AppVersionInfo> versionList = appVersionService.listByPlatformAndMinVersionCode(platform,version);
+ List<AppVersionInfo> versionList = appVersionService.listByPlatformAndMinVersionCode(platform, version);
if (versionList == null || versionList.size() <= 0) {
list.clear();
} else {
@@ -179,7 +176,7 @@
versionIdList.add(versionInfo.getId());
Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
AdActivityType.helpClass, versionIdList);
-
+
for (int i = 0; i < list.size(); i++) {
if (!sets.contains(list.get(i).getId())) {
list.remove(i--);
@@ -195,5 +192,5 @@
e.printStackTrace();
}
}
-
+
}
--
Gitblit v1.8.0