Просмотр исходного кода

Merge remote-tracking branch 'origin/master' into prod

wanghui лет назад: 8
Родитель
Сommit
b94d29a1ca

+ 19 - 6
src/main/java/com/goafanti/common/mapper/NewsMapperExt.xml

@@ -14,14 +14,27 @@
 	<sql id="Summary_Column_List">
 		id, create_time, title, title_img, type, hot, summary, source
 	</sql>
-	<select id="findList" resultMap="SummaryResultMap">
+	<select id="findList" resultType="com.goafanti.news.bo.NewsSummary">
 		select
-		<include refid="Summary_Column_List" />
-		from news where 1=1
-		<if test=" type != null">
-			and type = #{type,jdbcType=INTEGER}
+			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 1=1
+		<if test="type != null">
+			and a.type = #{type,jdbcType=INTEGER}
 		</if>
-		order by id desc
+		<if test="website != null">
+			and b.website = #{website,jdbcType=VARCHAR}
+		</if>
+		order by create_time desc
 		limit #{pageNo,jdbcType=INTEGER}, #{pageSize,jdbcType=INTEGER}
 	</select>
 	

+ 6 - 5
src/main/java/com/goafanti/news/controller/NewsController.java

@@ -41,11 +41,12 @@ public class NewsController extends BaseController {
 		if (StringUtils.equals(noCache, "clear")) {
 			newsService.cleanList();
 		}
-		modelview.addObject("kjkx", newsService.findNewsList(0, NewsType.KJZX.getCode(), 2));
-		modelview.addObject("jtdt", newsService.findNewsList(0, NewsType.JTDT.getCode(), 2));
-		modelview.addObject("zfwl", newsService.findNewsList(0, NewsType.ZFWL.getCode(), 3));
-		modelview.addObject("gjzc", newsService.findNewsList(0, NewsType.GJZC.getCode(), 3));
-		modelview.addObject("dfzc", newsService.findNewsList(0, NewsType.DFZC.getCode(), 3));
+		String domainName = request.getServerName();
+		modelview.addObject("kjkx", newsService.findNewsList(0, NewsType.KJZX.getCode(), 2,domainName));
+		modelview.addObject("jtdt", newsService.findNewsList(0, NewsType.JTDT.getCode(), 2,domainName));
+		modelview.addObject("zfwl", newsService.findNewsList(0, NewsType.ZFWL.getCode(), 3,domainName));
+		modelview.addObject("gjzc", newsService.findNewsList(0, NewsType.GJZC.getCode(), 3,domainName));
+		modelview.addObject("dfzc", newsService.findNewsList(0, NewsType.DFZC.getCode(), 3,domainName));
 		handleBanners(modelview, BannersType.CE_YUAN_DI);
 		return modelview;
 	}

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

@@ -5,6 +5,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,12 +54,13 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 		return newsMapper.selectByPrimaryKey(id);
 	}
 
-	@Cacheable(value = "NewsListCache", key = "'NewsList:Page:'+#pageNo+'Type:'+#type+'Size:'+#pageSize")
-	public List<NewsSummary> findNewsList(Integer pageNo, Integer type, Integer pageSize) {
+	@Cacheable(value = "NewsListCache", key = "'NewsList:Page:'+#pageNo+'Type:'+#type+'Size:'+#pageSize+'domainName:'+#domainName")
+	public List<NewsSummary> findNewsList(Integer pageNo, Integer type, Integer pageSize,String domainName) {
 		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.findList(params);
 	}