From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/config/HotSearchServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/HotSearchServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/HotSearchServiceImpl.java
index d8d777a..c74ce18 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/HotSearchServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/HotSearchServiceImpl.java
@@ -19,10 +19,10 @@
import com.yeshi.fanli.entity.admin.HotSearchAdmin;
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.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.Utils;
@@ -34,7 +34,7 @@
private HotSearchDao hotSearchDao;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private SuperHotSearchService superHotSearchService;
@@ -44,7 +44,7 @@
String packages, String key) {
final int strat = index * Constant.PAGE_SIZE;
platform = Utils.getMap().get(platform);
- com.yeshi.fanli.entity.system.System system = systemService.getSystem(platform, packages);
+ BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);
List<HotSearch> hotSearchList=null;
List<SuperHotSearch> superHotSearchList=null;
Map<Long,HotSearchAdmin> hotSearchAdminMap=new HashMap<Long, HotSearchAdmin>();
@@ -78,14 +78,14 @@
hsIdList.add(rs.getId());
}
superHotSearchList = superHotSearchService.getSuperHotSearchsByHotSearchs(hsIdList);
- Map<Long,List<System>> superMap = new HashMap<Long, List<System>>();
+ Map<Long,List<BusinessSystem>> superMap = new HashMap<Long, List<BusinessSystem>>();
Long rsId=null;
- List<System> systemList=null;
+ List<BusinessSystem> systemList=null;
for (SuperHotSearch srs : superHotSearchList) {
rsId = srs.getHotSearch().getId();
systemList = superMap.get(rsId);
if(systemList==null){
- systemList=new ArrayList<System>();
+ systemList=new ArrayList<BusinessSystem>();
}
systemList.add(srs.getSystem());
superMap.put(rsId,systemList);
@@ -97,7 +97,7 @@
if(rsa==null){
rsa=new HotSearchAdmin();
}
- List<System> list = superMap.get(id);
+ List<BusinessSystem> list = superMap.get(id);
if(list != null){
rsa.getSystemList().addAll(superMap.get(id));
}
@@ -180,7 +180,7 @@
public int getCount(String platform, String packages, final String key) {
platform = Utils.getMap().get(platform);
- final System system = systemService.getSystem(platform, packages);
+ final BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);
return (Integer) hotSearchDao.excute(new HibernateCallback<Integer>() {
public Integer doInHibernate(Session session)
@@ -258,7 +258,7 @@
}
- List<System> systemList = systemService.getSystems();
+ List<BusinessSystem> systemList = businessSystemService.getBusinessSystems();
List<SuperHotSearch> listSuper = superHotSearchService.listSuperHotSearch(listId);
@@ -269,11 +269,11 @@
} else {
for (HotSearch hotSearch : listObj) {
Long id = hotSearch.getId();
- List<System> newList = new ArrayList<System>();
+ List<BusinessSystem> newList = new ArrayList<BusinessSystem>();
// 鏄惁鏈夊叧鑱旂郴缁熼�夐」
- for (System dsystem : systemList) {
- System newsystem = new System();
+ for (BusinessSystem dsystem : systemList) {
+ BusinessSystem newsystem = new BusinessSystem();
try {
PropertyUtils.copyProperties(newsystem, dsystem);
@@ -287,7 +287,7 @@
for (SuperHotSearch superHotSearch : listSuper) {
HotSearch search = superHotSearch.getHotSearch();
- System system = superHotSearch.getSystem();
+ BusinessSystem system = superHotSearch.getSystem();
// 褰撳墠涓撻 銆佸綋鍓嶇郴缁�
if (search != null && system != null && id == search.getId() && superSystemId == system.getId()) {
--
Gitblit v1.8.0