fix 基本需求完成

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ColumnNewsController.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.ColumnNews;
+import com.ruoyi.common.core.domain.entity.ColumnNews;
 import com.ruoyi.system.service.IColumnNewsService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/QueryController.java

@@ -1,8 +1,10 @@
 package com.ruoyi.web.controller.system;
 
 import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.ColumnNavigationBar;
+import com.ruoyi.common.core.domain.entity.ColumnNews;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.service.*;
@@ -19,7 +21,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/gateway/query")
-public class QueryController {
+public class QueryController extends BaseController {
 
     @Autowired
     private IQueryService queryService;
@@ -67,7 +69,6 @@ public class QueryController {
      * 获取各个部分首页标题
      */
     @GetMapping("/titleList")
-    @RepeatSubmit
     public AjaxResult titleList(ColumnNavigationBar columnNavigationBar)
     {
         List<ColumnNavigationBar> columnNavigationBars = columnNavigationBarService.selectColumnNavigationBarListMenHu(columnNavigationBar);
@@ -90,10 +91,11 @@ public class QueryController {
      */
     @PostMapping("/getNewS")
     @RepeatSubmit
-    public AjaxResult getNewS(ColumnNews columnNews)
+    public TableDataInfo getNewS(ColumnNews columnNews)
     {
+        startPage();
         List<ColumnNews> list = columnNewsService.selectColumnNewsListMenHu(columnNews);
-        return AjaxResult.success(list);
+        return getDataTable(list);
     }
 
     /**
@@ -112,10 +114,12 @@ public class QueryController {
      */
     @PostMapping("/getNotice")
     @RepeatSubmit
-    public AjaxResult getNotice(SysNotice notice)
+    public TableDataInfo getNotice(SysNotice notice)
     {
+        startPage();
         List<SysNotice> list = noticeService.selectNoticeListMenHu(notice);
-        return AjaxResult.success(list);
+        return getDataTable(list);
+
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ColumnNavigationBar.java

@@ -60,6 +60,17 @@ public class ColumnNavigationBar extends BaseEntity
     /** 子部门 */
     private List<ColumnNavigationBar> children = new ArrayList<ColumnNavigationBar>();
 
+    private List<ColumnNews> columnNewsList = new ArrayList<ColumnNews>();
+
+
+    public List<ColumnNews> getColumnNewsList() {
+        return columnNewsList;
+    }
+
+    public void setColumnNewsList(List<ColumnNews> columnNewsList) {
+        this.columnNewsList = columnNewsList;
+    }
+
     public List<ColumnNavigationBar> getChildren() {
         return children;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/ColumnNews.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ColumnNews.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.common.core.domain.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -32,6 +32,10 @@ public class ColumnNews extends BaseEntity
     /** 新闻内容 */
     @Excel(name = "新闻内容")
     private String newsContent;
+    /**
+     * 是否头条
+     */
+    private String isTop;
 
     /** 新闻状态（0审核通过 1待审核 2驳回） */
     @Excel(name = "新闻状态", readConverterExp = "0=审核通过,1=待审核,2=驳回")
@@ -45,6 +49,14 @@ public class ColumnNews extends BaseEntity
     @Excel(name = "原因")
     private String reason;
 
+    public String getIsTop() {
+        return isTop;
+    }
+
+    public void setIsTop(String isTop) {
+        this.isTop = isTop;
+    }
+
     public String getColumnName() {
         return columnName;
     }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ColumnNewsMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
-import com.ruoyi.system.domain.ColumnNews;
+import com.ruoyi.common.core.domain.entity.ColumnNews;
 
 /**
  * 新闻信息Mapper接口
@@ -41,6 +41,13 @@ public interface ColumnNewsMapper
      */
     public List<ColumnNews> selectColumnNewsListMenHu(ColumnNews columnNews);
 
+    /**
+     * 查询门户标题新闻
+     * @param columnId
+     * @return
+     */
+    public List<ColumnNews> selectColumnNewsListMenHuByColumnId(Long columnId);
+
     /**
      * 新增新闻信息
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/IColumnNewsService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
-import com.ruoyi.system.domain.ColumnNews;
+import com.ruoyi.common.core.domain.entity.ColumnNews;
 
 /**
  * 新闻信息Service接口

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ColumnNavigationBarServiceImpl.java

@@ -7,12 +7,14 @@ import java.util.stream.Collectors;
 
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.TreeSelect;
+import com.ruoyi.common.core.domain.entity.ColumnNews;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.domain.entity.ColumnNavigationBar;
+import com.ruoyi.system.mapper.ColumnNewsMapper;
 import com.ruoyi.system.service.IColumnNavigationBarService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +33,9 @@ public class ColumnNavigationBarServiceImpl implements IColumnNavigationBarServi
     @Autowired
     private ColumnNavigationBarMapper columnNavigationBarMapper;
 
+    @Autowired
+    private ColumnNewsMapper columnNewsMapper;
+
     /**
      * 查询栏目导航
      * 
@@ -62,7 +67,16 @@ public class ColumnNavigationBarServiceImpl implements IColumnNavigationBarServi
      */
     @Override
     public List<ColumnNavigationBar> selectColumnNavigationBarListMenHu(ColumnNavigationBar columnNavigationBar) {
-        return columnNavigationBarMapper.selectColumnNavigationBarListMenHu(columnNavigationBar);
+        List<ColumnNavigationBar> columnNavigationBars = columnNavigationBarMapper.selectColumnNavigationBarListMenHu(columnNavigationBar);
+        if (columnNavigationBars.size() > 0){
+            for (ColumnNavigationBar navigationBar : columnNavigationBars) {
+                Long columnId = navigationBar.getColumnId();
+                //去查询文章
+                List<ColumnNews> columnNews = columnNewsMapper.selectColumnNewsListMenHuByColumnId(columnId);
+                navigationBar.setColumnNewsList(columnNews);
+            }
+        }
+        return columnNavigationBars;
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ColumnNewsServiceImpl.java

@@ -5,7 +5,7 @@ import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ColumnNewsMapper;
-import com.ruoyi.system.domain.ColumnNews;
+import com.ruoyi.common.core.domain.entity.ColumnNews;
 import com.ruoyi.system.service.IColumnNewsService;
 
 /**

ruoyi-system/src/main/resources/mapper/system/ColumnNewsMapper.xml

@@ -1,49 +1,69 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.ColumnNewsMapper">
-    
+
     <resultMap type="ColumnNews" id="ColumnNewsResult">
-        <result property="newsId"    column="news_id"    />
-        <result property="newsTitle"    column="news_title"    />
-        <result property="columnId"    column="column_id"    />
-        <result property="columnName"    column="column_name"    />
-        <result property="newsContent"    column="news_content"    />
-        <result property="status"    column="status"    />
-        <result property="isDel"    column="is_del"    />
-        <result property="reason"    column="reason"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="newsId" column="news_id"/>
+        <result property="newsTitle" column="news_title"/>
+        <result property="columnId" column="column_id"/>
+        <result property="columnName" column="column_name"/>
+        <result property="newsContent" column="news_content"/>
+        <result property="isTop" column="is_top"/>
+        <result property="status" column="status"/>
+        <result property="isDel" column="is_del"/>
+        <result property="reason" column="reason"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectColumnNewsVo">
-        select n.news_id, n.news_title, n.column_id, n.news_content, n.status,  n.reason, n.create_by, n.create_time, n.update_by, n.update_time, n.remark,c.column_name from column_news n
+        select n.news_id, n.news_title, n.column_id, n.news_content,n.is_top, n.status,  n.reason, n.create_by, n.create_time, n.update_by, n.update_time, n.remark,c.column_name from column_news n
         left join column_navigation_bar c on n.column_id = c.column_id
     </sql>
 
     <select id="selectColumnNewsList" parameterType="ColumnNews" resultMap="ColumnNewsResult">
         <include refid="selectColumnNewsVo"/>
-        <where>  
-            <if test="newsTitle != null  and newsTitle != ''"> and n.news_title like concat('%', #{newsTitle}, '%')</if>
-            <if test="newsContent != null  and newsContent != ''"> and n.news_content like concat('%', #{newsContent}, '%')</if>
-            <if test="status != null  and status != ''"> and n.status = #{status}</if>
-            <if test="isDel != null  and isDel != ''"> and n.is_del = #{isDel}</if>
-            <if test="columnName != null  and columnName != ''"> and c.column_name = #{columnName}</if>
+        <where>
+            <if test="newsTitle != null  and newsTitle != ''">and n.news_title like concat('%', #{newsTitle}, '%')</if>
+            <if test="newsContent != null  and newsContent != ''">and n.news_content like concat('%', #{newsContent},
+                '%')
+            </if>
+            <if test="status != null  and status != ''">and n.status = #{status}</if>
+            <if test="isDel != null  and isDel != ''">and n.is_del = #{isDel}</if>
+            <if test="columnName != null  and columnName != ''">and c.column_name = #{columnName}</if>
+            <if test="isTop != null  and isTop != ''">and n.is_top = #{isTop}</if>
         </where>
+        order by n.create_time,n.update_time
     </select>
 
     <select id="selectColumnNewsListMenHu" parameterType="ColumnNews" resultMap="ColumnNewsResult">
         select n.news_id, n.news_title, n.create_time from column_news n
-        <where>
-            <if test="newsTitle != null  and newsTitle != ''"> and (n.news_title like concat('%', #{newsTitle}, '%') or n.news_content like concat('%', #{newsContent}, '%'))</if>
-            <if test="columnId != null  and columnId != ''"> and n.column_id = #{columnId}</if>
-        </where>
+        where
+        n.status = '0'
+        and n.is_del = 'N'
+        <if test="newsTitle != null  and newsTitle != ''">and (n.news_title like concat('%', #{newsTitle}, '%') or
+            n.news_content like concat('%', #{newsContent}, '%'))
+        </if>
+        <if test="columnId != null  and columnId != ''">and n.column_id = #{columnId}</if>
+        <if test="isTop != null  and isTop != ''">and n.is_top = #{isTop}</if>
+
+        order by n.create_time,n.update_time
+    </select>
+
+    <select id="selectColumnNewsListMenHuByColumnId" parameterType="Long" resultMap="ColumnNewsResult">
+        select n.news_id, n.news_title, n.create_time from column_news n
+        where
+        n.status = '0'
+        and n.is_del = 'N'
+        <if test="columnId != null  and columnId != ''">and n.column_id = #{columnId}</if>
+        order by n.create_time,n.update_time limit 6
     </select>
-    
+
     <select id="selectColumnNewsByNewsId" parameterType="Integer" resultMap="ColumnNewsResult">
         <include refid="selectColumnNewsVo"/>
         where n.news_id = #{newsId}
@@ -53,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select n.news_id, n.news_title, n.column_id, n.news_content, n.status,  n.reason, n.create_by, n.create_time, n.update_by, n.update_time, n.remark from column_news n
         where n.news_id = #{newsId}
     </select>
-        
+
     <insert id="insertColumnNews" parameterType="ColumnNews" useGeneratedKeys="true" keyProperty="newsId">
         insert into column_news
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -61,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="columnId != null">column_id,</if>
             <if test="newsContent != null and newsContent != ''">news_content,</if>
             <if test="status != null">status,</if>
+            <if test="isTop != null">is_top,</if>
             <if test="isDel != null">is_del,</if>
             <if test="reason != null">reason,</if>
             <if test="createBy != null">create_by,</if>
@@ -68,12 +89,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="newsTitle != null and newsTitle != ''">#{newsTitle},</if>
             <if test="columnId != null">#{columnId},</if>
             <if test="newsContent != null and newsContent != ''">#{newsContent},</if>
             <if test="status != null">#{status},</if>
+            <if test="isTop != null">#{isTop},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="reason != null">#{reason},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -81,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateColumnNews" parameterType="ColumnNews">
@@ -91,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="columnId != null">column_id = #{columnId},</if>
             <if test="newsContent != null and newsContent != ''">news_content = #{newsContent},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="isTop != null">is_top = #{isTop},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="reason != null">reason = #{reason},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -107,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteColumnNewsByNewsIds" parameterType="String">
-        delete from column_news where news_id in 
+        delete from column_news where news_id in
         <foreach item="newsId" collection="array" open="(" separator="," close=")">
             #{newsId}
         </foreach>

ruoyi-ui/src/views/system/image/index.vue

@@ -39,10 +39,6 @@
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['system:image:remove']">删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['system:image:export']">导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -57,19 +53,14 @@
         </template>
       </el-table-column>
       <el-table-column label="附件简介" align="center" prop="imageIntroduce" />
-      <el-table-column label="附件状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.image_status" :value="scope.row.status" />
-        </template>
-      </el-table-column>
       <el-table-column label="附件类型" align="center" prop="type">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.image_type" :value="scope.row.type" />
         </template>
       </el-table-column>
-      <el-table-column label="是否删除" align="center" prop="isDel">
+      <el-table-column label="附件状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_del" :value="scope.row.isDel" />
+          <dict-tag :options="dict.type.image_status" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />