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/apph5/AppH5HelpCenterController.java | 98 +++++++++++++++++++++++--------------------------
1 files changed, 46 insertions(+), 52 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 e9100bb..60a1ef3 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,43 +51,42 @@
* @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> resultList = new ArrayList<>();
-
- 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 {
- // 娣诲姞鍒楄〃
- resultList.addAll(list);
-
- pageId = resultList.get(resultList.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) {
- resultList.clear();
+ list.clear();
} else {
List<Long> sourceIdList = new ArrayList<>();
- for (HelpCenter record : resultList) {
+ for (HelpCenter record : list) {
sourceIdList.add(record.getId());
}
List<Long> versionIdList = new ArrayList<>();
@@ -98,25 +95,24 @@
Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
AdActivityType.helpCenter, versionIdList);
- for (int i = 0; i < resultList.size(); i++) {
- if (!sets.contains(resultList.get(i).getId())) {
- resultList.remove(i--);
+ for (int i = 0; i < list.size(); i++) {
+ if (!sets.contains(list.get(i).getId())) {
+ list.remove(i--);
}
}
}
}
-
+
JSONObject data = new JSONObject();
data.put("pageId", pageId);
- data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));
+ data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
e.printStackTrace();
}
}
-
-
+
/**
* 鑾峰彇甯姪璇︽儏
* @param callback
@@ -124,7 +120,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("璇ュ唴瀹逛笉瀛樺湪"));
@@ -135,16 +131,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) {
@@ -152,8 +148,7 @@
e.printStackTrace();
}
}
-
-
+
/**
* 鏌ヨ鍚敤鐨勫垎绫�
* @param callback
@@ -163,18 +158,16 @@
public void getClass(String callback, AcceptData acceptData, PrintWriter out) {
try {
List<HelpClass> resultList = new ArrayList<>();
-
+
List<HelpClass> list = helpClassService.getClassByState(1);
- if (list == null || list.size() == 0) {
- list = new ArrayList<>();
- } else {
+ if (list != null && list.size() > 0) {
resultList.addAll(list);
}
-
+
// 鐗堟湰杩囨护
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) {
resultList.clear();
} else {
@@ -187,10 +180,11 @@
versionIdList.add(versionInfo.getId());
Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
AdActivityType.helpClass, versionIdList);
-
- for (int i = 0; i < resultList.size(); i++) {
- if (!sets.contains(resultList.get(i).getId())) {
- resultList.remove(i--);
+
+ for (int i = 0; i < list.size(); i++) {
+ if (!sets.contains(list.get(i).getId())) {
+ list.remove(i--);
+
}
}
}
@@ -203,5 +197,5 @@
e.printStackTrace();
}
}
-
+
}
--
Gitblit v1.8.0