From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 60a1ef3..1186b2d 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
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.SystemEnum;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -45,7 +46,6 @@
/**
* 鏌ヨ甯姪鍒楄〃
* @param callback
- * @param pageIndex
* @param pageSize
* @param key
* @param out
@@ -53,6 +53,8 @@
@RequestMapping(value = "query")
public void query(String callback, AcceptData acceptData, Long pageId, Integer pageSize, String key, Long cid,
PrintWriter out) {
+ //鍏朵粬APP鏃犲府鍔╀腑蹇冨垪琛�
+ acceptData.setSystem(SystemEnum.blks);
try {
if (pageSize == null)
pageSize = Constant.PAGE_SIZE;
@@ -66,7 +68,7 @@
if (pageId == null)
pageId = 0L;
- List<HelpCenter> list1 = helpCenterService.listValid(pageId, pageSize, key, cid);
+ List<HelpCenter> list1 = helpCenterService.listValid(pageId, pageSize, key, cid,acceptData.getSystem());
List<HelpCenter> list = new ArrayList<>();
if (list1 != null && list1.size() > 0)
list.addAll(list1);
@@ -81,7 +83,7 @@
// 鐗堟湰杩囨护
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,acceptData.getSystem());
if (versionList == null || versionList.size() <= 0) {
list.clear();
} else {
@@ -159,7 +161,7 @@
try {
List<HelpClass> resultList = new ArrayList<>();
- List<HelpClass> list = helpClassService.getClassByState(1);
+ List<HelpClass> list = helpClassService.getClassByState(1,acceptData.getSystem());
if (list != null && list.size() > 0) {
resultList.addAll(list);
}
@@ -167,7 +169,7 @@
// 鐗堟湰杩囨护
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,acceptData.getSystem());
if (versionList == null || versionList.size() <= 0) {
resultList.clear();
} else {
--
Gitblit v1.8.0