From 49c2d115ab25c28a8ac40b15e49fb77bcfc88e48 Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Thu, 8 Apr 2021 01:24:09 +0800
Subject: [PATCH] up

---
 src/main/java/com/jingcheng/cms/model/Article.java     |  5 +++++
 .../jingcheng/cms/service/impl/ArticleSerivceImpl.java |  5 +++--
 src/main/resources/mapper/ArticleMapper.xml            | 10 ++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/jingcheng/cms/model/Article.java b/src/main/java/com/jingcheng/cms/model/Article.java
index 1f72d0d..40724aa 100644
--- a/src/main/java/com/jingcheng/cms/model/Article.java
+++ b/src/main/java/com/jingcheng/cms/model/Article.java
@@ -47,4 +47,9 @@ public class Article extends BaseEntity{
      * 视频地址
      */
     private String videoUrl;
+
+    /**
+     * 是否推荐
+     */
+    private Integer isRecommend;
 }
diff --git a/src/main/java/com/jingcheng/cms/service/impl/ArticleSerivceImpl.java b/src/main/java/com/jingcheng/cms/service/impl/ArticleSerivceImpl.java
index cb55582..b02224a 100644
--- a/src/main/java/com/jingcheng/cms/service/impl/ArticleSerivceImpl.java
+++ b/src/main/java/com/jingcheng/cms/service/impl/ArticleSerivceImpl.java
@@ -2,13 +2,11 @@ package com.jingcheng.cms.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.generator.config.IFileCreate;
 import com.jingcheng.cms.constants.Constants;
 import com.jingcheng.cms.mapper.ArticleMapper;
 import com.jingcheng.cms.mapper.CategoryMapper;
 import com.jingcheng.cms.model.Article;
 import com.jingcheng.cms.model.Category;
-import com.jingcheng.cms.model.Users;
 import com.jingcheng.cms.service.ArticleSerive;
 import com.jingcheng.cms.util.AjaxResult;
 import com.jingcheng.cms.util.PageUtils;
@@ -44,6 +42,7 @@ public class ArticleSerivceImpl implements ArticleSerive {
         Integer state = jsonObject.getInteger("state");
         String describe = jsonObject.getString("describe");
         String videoUrl = jsonObject.getString("videoUrl");
+        Integer isRecommend = jsonObject.getInteger("isRecommend") == null ? 0 : jsonObject.getInteger("isRecommend");
         if (null == state){
 
             ajaxResult.setRetcode(AjaxResult.FAILED);
@@ -85,6 +84,7 @@ public class ArticleSerivceImpl implements ArticleSerive {
             article.setContent(content);
             article.setDescribe(describe);
             article.setVideoUrl(videoUrl);
+            article.setIsRecommend(isRecommend);
             articleMapper.addArticle(article);
             ajaxResult.setRetmsg("成功新增文章");
         }else {
@@ -108,6 +108,7 @@ public class ArticleSerivceImpl implements ArticleSerive {
             article.setContent(content);
             article.setDescribe(describe);
             article.setVideoUrl(videoUrl);
+            article.setIsRecommend(isRecommend);
             articleMapper.updateByExampleSelective(article,example);
             ajaxResult.setRetmsg("成功修改文章");
         }
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index 10a4fd2..98720df 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -3,15 +3,15 @@
 <mapper namespace="com.jingcheng.cms.mapper.ArticleMapper">
 
     <insert id="addArticle" parameterType="com.jingcheng.cms.model.Article">
-        INSERT INTO article(`title`,`first_category`,`second_category`,`keyword`,`file_type`,`content`,`state`,`describe`,`video_url`)
-        values (#{title},#{firstCategory},#{secondCategory},#{keyword},#{fileType},#{content},#{state},#{describe},#{videoUrl})
+        INSERT INTO article(`title`,`first_category`,`second_category`,`keyword`,`file_type`,`content`,`state`,`describe`,`video_url`,`is_recommend`)
+        values (#{title},#{firstCategory},#{secondCategory},#{keyword},#{fileType},#{content},#{state},#{describe},#{videoUrl},#{isRecommend})
     </insert>
 
     <select id="getArticleListByCondition" resultType="com.jingcheng.cms.vo.ArticleVo">
         select ar.`id`,ar.`title`,c1.`name` as `first_category_name`,c2.`name` as `second_category_name`,
         ar.`keyword`,ar.`file_type`,ar.`content`,ar.`create_date_time`,ar.`update_date_time`,ar.`state`,
         c1.level as `first_level`,c2.level as `second_level`,c1.`sort_num` as `first_sort_num`,c2.`sort_num` as `second_sort_num`,
-        ar.`keyword`,ar.`file_type`,ar.`describe`,ar.`video_url`
+        ar.`keyword`,ar.`file_type`,ar.`describe`,ar.`video_url`,ar.`is_recommend`
         FROM article ar
         left join category c1
         on
@@ -36,6 +36,7 @@
         <if test="state != null ">
             and ar.state = #{state}
         </if>
+        ORDER BY is_recommend Desc
     </select>
 
     <select id="getFirstCategory" resultType="com.jingcheng.cms.model.Category">
@@ -67,7 +68,7 @@
         select ar.`id`,ar.`title`,c1.`name` as `first_category_name`,c2.`name` as `second_category_name`,
         ar.`keyword`,ar.`file_type`,ar.`content`,ar.`create_date_time`,ar.`update_date_time`,ar.`state`,
         c1.level as `first_level`,c2.level as `second_level`,c1.`sort_num` as `first_sort_num`,c2.`sort_num` as `second_sort_num`,
-        ar.`keyword`,ar.`file_type`,ar.`describe`,ar.`video_url`
+        ar.`keyword`,ar.`file_type`,ar.`describe`,ar.`video_url`,ar.`is_recommend`
         FROM article ar
         left join category c1
         on
@@ -90,5 +91,6 @@
             and ar.second_category = #{secondCategory}
         </if>
         and ar.state = 1
+        ORDER BY is_recommend Desc
     </select>
 </mapper>
\ No newline at end of file