1、初始化

src/main/java/com/lqkj/business/controller/CmsCategoryController.java

@@ -37,6 +37,13 @@ public class CmsCategoryController extends BaseController
     @Autowired
     private CmsCategoryService cmsCategoryService;
 
+    @ApiOperation("根据父分类编号查询")
+    @GetMapping("/front/child/{categoryId}")
+    public ResultUtil selectByParentId(@PathVariable("categoryId") Long categoryId){
+        CmsCategory category = new CmsCategory();
+        category.setParentId(categoryId);
+        return ResultUtil.success(cmsCategoryService.selectCmsCategoryList(category));
+    }
     @ApiOperation("查询一级分类列表")
     @GetMapping("/parentList")
     public ResultUtil selectParentList(){

src/main/java/com/lqkj/business/controller/CmsNewsController.java

@@ -124,6 +124,9 @@ public class CmsNewsController extends BaseController
         if(StringUtils.isNotEmpty(cmsNews.getContent())){
             cmsNews.setContent(HtmlUtils.htmlUnescape(cmsNews.getContent()));
         }
+        if(StringUtils.isNotEmpty(cmsNews.getTitle())){
+            cmsNews.setTitle(HtmlUtils.htmlUnescape(cmsNews.getTitle()));
+        }
         cmsNews.setCreateBy(getNickName());
         return resultByRows(cmsNewsService.insertCmsNews(cmsNews));
     }
@@ -140,6 +143,9 @@ public class CmsNewsController extends BaseController
         if(StringUtils.isNotEmpty(cmsNews.getContent())){
             cmsNews.setContent(HtmlUtils.htmlUnescape(cmsNews.getContent()));
         }
+        if(StringUtils.isNotEmpty(cmsNews.getTitle())){
+            cmsNews.setTitle(HtmlUtils.htmlUnescape(cmsNews.getTitle()));
+        }
         cmsNews.setUpdateBy(getNickName());
         return resultByRows(cmsNewsService.updateCmsNews(cmsNews));
     }
@@ -154,6 +160,18 @@ public class CmsNewsController extends BaseController
     public ResultUtil updateTopStatus(@RequestBody CmsNews cmsNews){
         return resultByRows(cmsNewsService.updateTopStatus(cmsNews));
     }
+
+    /**
+     * 轮播操作
+     */
+    @ApiOperation("轮播状态")
+    @PreAuthorize("@ss.hasPermi('business:cmsNews:edit')")
+    @Log(title = "信息管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateCarouselStatus")
+    public ResultUtil updateCarouselStatus(@RequestBody CmsNews cmsNews){
+        return resultByRows(cmsNewsService.updateCarouselStatus(cmsNews));
+    }
+
     /**
      * 删除信息
      */

src/main/java/com/lqkj/business/entity/CmsNews.java

@@ -20,7 +20,7 @@ public class CmsNews extends BaseEntity
     private String newsId;
 
     /** 所属分类 */
-    @Excel(name = "所属分类")
+//    @Excel(name = "所属分类")
     private Integer categoryId;
 
     /** 标题 */
@@ -35,9 +35,13 @@ public class CmsNews extends BaseEntity
     private Integer viewCount;
 
     /** 是否置顶 */
-    @Excel(name = "是否置顶")
+    @Excel(name = "是否置顶", readConverterExp = "true=是,false=否")
     private Boolean isTop;
 
+    /** 是否轮播 */
+    @Excel(name = "是否轮播", readConverterExp = "true=是,false=否")
+    private Boolean carousel;
+
     /** 缩略图 */
     @Excel(name = "缩略图")
     private String thumbnail;
@@ -49,7 +53,7 @@ public class CmsNews extends BaseEntity
     private Object focusImgs;
 
     @Excels({
-            @Excel(name = "分类", targetAttr = "name", type = Excel.Type.EXPORT)})
+            @Excel(name = "分类名称", targetAttr = "name", type = Excel.Type.EXPORT)})
     private CmsCategory cmsCategory;
 
     public void setNewsId(String newsId)
@@ -141,22 +145,29 @@ public class CmsNews extends BaseEntity
         this.focusImgs = focusImgs;
     }
 
+
+    public Boolean getCarousel() {
+        return carousel;
+    }
+
+    public void setCarousel(Boolean carousel) {
+        this.carousel = carousel;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("newsId", getNewsId())
-                .append("categoryId", getCategoryId())
-                .append("title", getTitle())
-                .append("content", getContent())
-                .append("viewCount", getViewCount())
-                .append("isTop", getIsTop())
-                .append("thumbnail", getThumbnail())
-                .append("videoUrl", getVideoUrl())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
+        return "CmsNews{" +
+                "newsId='" + newsId + '\'' +
+                ", categoryId=" + categoryId +
+                ", title='" + title + '\'' +
+                ", content='" + content + '\'' +
+                ", viewCount=" + viewCount +
+                ", isTop=" + isTop +
+                ", carousel=" + carousel +
+                ", thumbnail='" + thumbnail + '\'' +
+                ", videoUrl='" + videoUrl + '\'' +
+                ", focusImgs=" + focusImgs +
+                ", cmsCategory=" + cmsCategory +
+                '}';
     }
 }

src/main/java/com/lqkj/business/mapper/CmsNewsMapper.java

@@ -66,4 +66,6 @@ public interface CmsNewsMapper
     public int updateTopStatus(CmsNews cmsNews);
 
     public int plusViewCount(String newsId);
+
+    public int updateCarouselStatus(CmsNews cmsNews);
 }

src/main/java/com/lqkj/business/service/CmsNewsService.java

@@ -101,6 +101,10 @@ public class CmsNewsService
         return cmsNewsMapper.updateTopStatus(cmsNews);
     }
 
+    public int updateCarouselStatus(CmsNews cmsNews){
+        return cmsNewsMapper.updateCarouselStatus(cmsNews);
+    }
+
     public int plusViewCount(String newsId){
         return cmsNewsMapper.plusViewCount(newsId);
     }

src/main/java/com/lqkj/framework/security/ResourceServerConfig.java

@@ -45,6 +45,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .antMatchers("/oauth/**",
                 "/v1/captchaImage",
                 "/business/cmsNews/front/**",
+                "/business/cmsCategory/front/**",
                 "/login",
                 "/**/*.css",
                 "/**/*.js",

src/main/resources/db/migration/V1_1__init.sql

@@ -1320,6 +1320,7 @@ create table cms_news (
       content              TEXT                 null,
       view_count           INT4                 null,
       is_top               BOOL                 null,
+      is_carousel             BOOL                 null,
       thumbnail            VARCHAR(255)         null,
       focus_imgs           JSONB                null,
       video_url            VARCHAR(255)         null,
@@ -1352,6 +1353,9 @@ comment on column cms_news.view_count is
 comment on column cms_news.is_top is
 '是否置顶';
 
+comment on column cms_news.is_carousel is
+'是否轮播';
+
 comment on column cms_news.thumbnail is
 '缩略图';
 

src/main/resources/db/migration/V1_2__20230202.sql

@@ -1,3 +1,23 @@
 update sys_config set config_value = '白玉县水利局管理系统' where config_key = 'sys.index.title';
 
+delete from cms_category;
+insert into cms_category values(1, 0, null, '新闻资讯', 0, null, 1, '超级管理员', now());
+insert into cms_category values(2, 0, null, '关于我们', 0, null, 2, '超级管理员', now());
+insert into cms_category values(3, 0, null, '水电站简介', 0, null, 3, '超级管理员', now());
 
+insert into cms_category values(4, 1, null, '水利要闻', 0, null, 1, '超级管理员', now());
+insert into cms_category values(5, 1, null, '通知公告', 0, null, 2, '超级管理员', now());
+insert into cms_category values(6, 1, null, '政策文件', 0, null, 3, '超级管理员', now());
+
+insert into cms_category values(7, 2, null, '单位简介', 1, null, 1, '超级管理员', now());
+insert into cms_category values(8, 2, null, '机构设置', 1, null, 2, '超级管理员', now());
+insert into cms_category values(9, 2, null, '河湖长简介', 1, null, 3, '超级管理员', now());
+
+insert into cms_category values(10, 3, null, '叶巴滩水电站', 1, null, 1, '超级管理员', now());
+insert into cms_category values(11, 3, null, '松雪水电站', 1, null, 2, '超级管理员', now());
+insert into cms_category values(12, 3, null, '拉哇水电站', 1, null, 3, '超级管理员', now());
+
+SELECT setval('cms_category_category_id_seq', 100, true);
+
+delete from sys_menu where parent_id = 107 or parent_id = 120 or parent_id = 123;
+delete from sys_menu where menu_id = 107 or menu_id = 120 or menu_id = 123;

src/main/resources/mapper/business/CmsCategoryMapper.xml

@@ -32,6 +32,7 @@
         <where>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="categoryType != null "> and category_type = #{categoryType}</if>
+            <if test="parentId != null"> and parent_id = #{parentId}</if>
         </where>
         order by order_num, create_time
 

src/main/resources/mapper/business/CmsNewsMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="content"    column="content"    />
         <result property="viewCount"    column="view_count"    />
         <result property="isTop"    column="is_top"    />
+        <result property="carousel" column="is_carousel" />
         <result property="thumbnail"    column="thumbnail"    />
         <result property="videoUrl"    column="video_url"    />
         <result property="createBy"    column="create_by"    />
@@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmsNewsVo">
-        select t1.news_id, t1.category_id, t1.title, t1.content, t1.view_count, t1.is_top, t1.thumbnail, t1.focus_imgs, t1.video_url, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.remark, t2.name as category_name from cms_news as t1
+        select t1.news_id, t1.category_id, t1.title, t1.content, t1.view_count, t1.is_top, t1.is_carousel, t1.thumbnail, t1.focus_imgs, t1.video_url, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.remark, t2.name as category_name from cms_news as t1
         left join cms_category as t2 on t1.category_id = t2.category_id
     </sql>
 
@@ -37,10 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="title != null  and title != ''"> and t1.title like concat('%', #{title}, '%')</if>
             <if test="isTop != null "> and t1.is_top = #{isTop}</if>
+            <if test="carousel != null"> and t1.is_carousel = #{carousel}</if>
             <if test="categoryId != null"> and (t1.category_id = #{categoryId} or t1.category_id in ( SELECT t.category_id FROM cms_category t WHERE parent_id = #{categoryId} ))</if>
         </where>
-        order by t1.create_time desc
-
+        order by t1.is_top desc, t1.create_time desc
     </select>
     
     <select id="selectCmsNewsByNewsId" parameterType="String" resultMap="CmsNewsResult">
@@ -62,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">content,</if>
             <if test="viewCount != null">view_count,</if>
             <if test="isTop != null">is_top,</if>
+            <if test="carousel != null">is_carousel,</if>
             <if test="thumbnail != null and thumbnail != ''">thumbnail,</if>
             <if test="focusImgs != null">focus_imgs,</if>
             <if test="videoUrl != null and videoUrl != ''">video_url,</if>
@@ -78,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null and content != ''">#{content},</if>
             <if test="viewCount != null">#{viewCount},</if>
             <if test="isTop != null">#{isTop},</if>
+            <if test="carousel != null">#{carousel},</if>
             <if test="thumbnail != null and thumbnail != ''">#{thumbnail},</if>
             <if test="focusImgs != null">#{focusImgs,jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler},</if>
             <if test="videoUrl != null and videoUrl != ''">#{videoUrl},</if>
@@ -88,6 +91,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null and remark != ''">#{remark},</if>
          </trim>
     </insert>
+    <update id="updateCarouselStatus" parameterType="CmsNews">
+        update cms_news set is_carousel = #{carousel} where news_id = #{newsId}
+    </update>
     <update id="updateTopStatus" parameterType="CmsNews">
         update cms_news set is_top = #{isTop} where news_id = #{newsId}
     </update>
@@ -102,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             content = #{content},
             <if test="viewCount != null ">view_count = #{viewCount},</if>
             <if test="isTop != null ">is_top = #{isTop},</if>
+            <if test="carousel != null ">is_carousel = #{carousel},</if>
             thumbnail = #{thumbnail},
             focus_imgs = #{focusImgs, jdbcType=OTHER, typeHandler=com.lqkj.framework.sql.JsonbTypeHandler},
             video_url = #{videoUrl},