|
|
@@ -12,6 +12,8 @@ import java.util.Map;
|
|
|
|
|
|
import com.jeeplus.common.config.Global;
|
|
|
import com.jeeplus.common.utils.StringUtils;
|
|
|
+import com.jeeplus.modules.hpadvertisement.entity.HpBroadcast;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
@@ -29,6 +31,8 @@ import com.jeeplus.modules.hpadvertisement.mapper.HpAdvBannerMapper;
|
|
|
@Service
|
|
|
@Transactional(readOnly = true)
|
|
|
public class HpAdvBannerService extends CrudService<HpAdvBannerMapper, HpAdvBanner> {
|
|
|
+ @Autowired
|
|
|
+ private HpBroadcastService hpBroadcastService;
|
|
|
|
|
|
public HpAdvBanner get(String id) {
|
|
|
return super.get(id);
|
|
|
@@ -90,7 +94,10 @@ public class HpAdvBannerService extends CrudService<HpAdvBannerMapper, HpAdvBann
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ //获取跑马灯内容
|
|
|
+ List<HpBroadcast> hpBroadcastList = hpBroadcastService.findBroadList();
|
|
|
returnMap.put("bannerList", list);
|
|
|
+ returnMap.put("broadcastList", hpBroadcastList);
|
|
|
return returnMap;
|
|
|
}
|
|
|
}
|