remove Article ABOUT type,classId and add canList attr

src/main/java/com/imyeyu/server/modules/blog/entity/Article.java

@@ -25,9 +25,6 @@ public class Article extends Entity implements CommentSupport, Destroyable {
 	 */
 	public enum Type {
 
-		/** 关于 */
-		ABOUT,
-
 		/** 公版 */
 		PUBLIC,
 
@@ -44,9 +41,6 @@ public class Article extends Entity implements CommentSupport, Destroyable {
 	/** 类型 */
 	protected Type type;
 
-	/** 分类 ID */
-	protected long classId;
-
 	/** 摘要 */
 	protected String digest;
 
@@ -62,7 +56,7 @@ public class Article extends Entity implements CommentSupport, Destroyable {
 	/** 喜欢数量 */
 	protected int likes;
 
-	/** 是否显示评论 */
+	/** true 为显示评论 */
 	protected boolean showComment;
 
 	/** true 为可评论 */
@@ -71,6 +65,9 @@ public class Article extends Entity implements CommentSupport, Destroyable {
 	/** true 为可排位 */
 	protected boolean canRanking;
 
+	/** true 为可通过列表查询 */
+	protected boolean canList;
+
 	/** @return true 为可评论 */
 	@Override
 	public boolean canComment() {

src/main/resources/mapper/blog/ArticleMapper.xml

@@ -2,27 +2,24 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.imyeyu.server.modules.blog.mapper.ArticleMapper">
 	<sql id="table">article</sql>
-
 	<!-- 查询列表的文章字段 -->
 	<sql id="listColumn">
-		article.id,
+		`id`,
-		article.type,
+		`type`,
-		article.title,
+		`title`,
-		article.digest,
+		`digest`,
-		article.likes,
+		`likes`,
-		article.reads,
+		`reads`,
-		article.created_at,
+		`created_at`,
-		article.updated_at
+		`updated_at`
 	</sql>
-
+	<!-- 列表 -->
-
-	<!-- 主页列表 -->
 	<sql id="normalCondition">
 		FROM
 			article
 		WHERE
-			1 &lt; article.id
+			can_list IS TRUE
-			AND article.deleted_at IS NULL
+			AND deleted_at IS NULL
 	</sql>
 	<select id="count" resultType="long">
 		SELECT COUNT(1) <include refid="normalCondition" />
@@ -32,23 +29,17 @@
 			<include refid="listColumn" />
 		<include refid="normalCondition" />
 		ORDER BY
-			COALESCE(article.updated_at, article.created_at) DESC
+			COALESCE(updated_at, created_at) DESC
 		LIMIT
 			#{offset}, #{limit}
 	</select>
-
-
 	<!-- 根据关键字获取列表 -->
 	<sql id="byKeywordCondition">
-		FROM
+		<include refid="normalCondition" />
-			article
+		AND (
-		WHERE
+			`title` LIKE CONCAT('%', #{keyword}, '%')
-			1 &lt; article.id
+			OR `digest` LIKE CONCAT('%', #{keyword}, '%')
-			AND (
+		)
-				article.title LIKE CONCAT('%', #{keyword}, '%')
-				OR article.digest LIKE CONCAT('%', #{keyword}, '%')
-			)
-			AND article.deleted_at IS NULL
 	</sql>
 	<select id="countByKeyword" resultType="long">
 		SELECT COUNT(1) <include refid="byKeywordCondition" />
@@ -58,8 +49,8 @@
 			<include refid="listColumn" />
 		<include refid="byKeywordCondition" />
 		ORDER BY
-			COALESCE(article.updated_at, article.created_at) DESC
+			COALESCE(updated_at, created_at) DESC
 		LIMIT
 			#{offset}, #{limit}
 	</select>
-</mapper>
+</mapper>