Browse Source

Revert "新闻投放区分省份"

This reverts commit 7644e39246ae8a1389ae9855797ecdded20615a4.
wanghui 8 years ago
parent
commit
d64bee81c1

+ 2 - 3
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -54,9 +54,8 @@ public class WebpageController extends BaseController {
 		if (!banners.isEmpty()) {
 			modelview.addObject("banner", banners.get(0));
 		}
-		String domainName = request.getServerName();
-		modelview.addObject("zfwl", newsService.findIndexNewsList(0, NewsType.ZFWL.getCode(), 2,domainName));
-		modelview.addObject("jtdt", newsService.findIndexNewsList(0, NewsType.JTDT.getCode(), 4,domainName));
+		modelview.addObject("zfwl", newsService.findIndexNewsList(0, NewsType.ZFWL.getCode(), 2));
+		modelview.addObject("jtdt", newsService.findIndexNewsList(0, NewsType.JTDT.getCode(), 4));
 		return modelview;
 	}
 

+ 4 - 16
src/main/java/com/goafanti/common/mapper/NewsMapperExt.xml

@@ -40,23 +40,11 @@
 	
 	<select id="findIndexNewsList" resultMap="SummaryResultMap">
 		select
-			a.id,
-			a.create_time as createTime,
-			a.title,
-			a.title_img as titleImg,
-			a.type,
-			a.hot,
-			a.summary,
-			a.source
-		from news a
-		join branch_office_info b
-		on a.province_id = b.province_id
-		where a.hot = 1 
+		<include refid="Summary_Column_List" />
+		from news
+		where hot = 1 
 		<if test=" type != null">
-			and a.type = #{type,jdbcType=INTEGER}
-		</if>
-		<if test="website != null">
-			and b.website = #{website,jdbcType=VARCHAR}
+			and type = #{type,jdbcType=INTEGER}
 		</if>
 		order by create_time desc
 		limit #{pageNo,jdbcType=INTEGER}, #{pageSize,jdbcType=INTEGER}

+ 2 - 3
src/main/java/com/goafanti/news/service/NewsService.java

@@ -35,13 +35,12 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 
 	private static final Logger	logger	= LoggerFactory.getLogger(NewsService.class);
 	
-	@Cacheable(value = "IndexNewsListCache", key = "'NewsList:Page:'+#pageNo+'Type:'+#type+'Size:'+#pageSize+'domainName:'+#domainName")
-	public List<NewsSummary> findIndexNewsList(Integer pageNo, Integer type, Integer pageSize,String domainName) {
+	@Cacheable(value = "IndexNewsListCache", key = "'NewsList:Page:'+#pageNo+'Type:'+#type+'Size:'+#pageSize")
+	public List<NewsSummary> findIndexNewsList(Integer pageNo, Integer type, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("type", type);
 		params.put("pageSize", pageSize);
 		params.put("pageNo", pageNo);
-		params.put("website", domainName);
 		return newsMapper.findIndexNewsList(params);
 	}