新闻增加置顶

webstudio-modules/webstudio-modules-staticize/src/main/java/com/webstudio/staticize/controller/StaticizeController.java

@@ -107,16 +107,33 @@ public class StaticizeController {
     @ApiOperation(value = "发展历程", httpMethod = "GET")
     public AjaxResult intoTime(){
         Map map = getFooter();
-        //seo
-        map.put("TDK",getSeo("intoTime"));
+        //首页轮播图
+        List<Banner> bannerList = staticizeService.selectBanner();
+        for (Banner banner:
+                bannerList) {
+            //tile换行
+            List<String> titleList = new ArrayList<>();
+            if(StringUtils.isNotBlank(banner.getTitle())){
+                String[] split = banner.getTitle().split("@");
+                for (int i = 0; i < split.length; i++) {
+                    titleList.add(split[i]);
+                }
+            }
+            banner.setTitleList(titleList);
+        }
+        map.put("bannerList",bannerList);
+        //首页新闻
+        List<Map> indexNewsList = staticizeService.getIndexNews();
+        map.put("indexNewsList",indexNewsList);
         //发展历程
-        List<Map> dhMapList = staticizeService.getDevelopHistory();
-        map.put("dhMapList",dhMapList);
-
+        Map dhMap = staticizeService.getHistoryData();
+        map.put("dhMap",dhMap);
+        //seo
+        map.put("TDK",getSeo("index"));
         // html名字
-        map.put("fileName", "intoTime");
+        map.put("fileName", "index");
         // 模板
-        map.put("template", "intoTime.ftl");
+        map.put("template", "index.ftl");
         try {
             staticizeService.pushHtml(map, "");
             return AjaxResult.success("发布成功");
@@ -135,7 +152,7 @@ public class StaticizeController {
             //seo
             map.put("TDK",getSeo("news"));
             //最近三篇新闻
-            List<News> recentlyNewsList = staticizeService.getNewsByParm(null, 3);
+            List<News> recentlyNewsList = staticizeService.getNewsByParm(null, 1, null);
             map.put("recentlyNewsList", recentlyNewsList);
             //按全部、新闻分类 分类
             List<Map> newsIndexList = staticizeService.getNewsIndex();

webstudio-modules/webstudio-modules-staticize/src/main/java/com/webstudio/staticize/domain/News.java

@@ -64,6 +64,9 @@ public class News {
     @ApiModelProperty(value = "浏览数量")
     private Integer vievNum;
 
+    @ApiModelProperty(value = "新闻置顶")
+    private Integer newsTop;
+
     public String getUuid() {
         return uuid;
     }
@@ -199,4 +202,12 @@ public class News {
     public void setVievNum(Integer vievNum) {
         this.vievNum = vievNum;
     }
+
+    public Integer getNewsTop() {
+        return newsTop;
+    }
+
+    public void setNewsTop(Integer newsTop) {
+        this.newsTop = newsTop;
+    }
 }

webstudio-modules/webstudio-modules-staticize/src/main/java/com/webstudio/staticize/mapper/master/StaticizeMapper.java

@@ -12,7 +12,7 @@ public interface StaticizeMapper {
 
     List<SysEnumData> columnList(@Param("enumUuid")String enumUuid);
 
-    List<News> getNewsByParm(@Param("column") String column, @Param("limit")Integer limit);
+    List<News> getNewsByParm(@Param("column") String column, @Param("newsTop") Integer newsTop,@Param("limit")Integer limit);
 
     List<News> getNewsList(@Param("uuid")String newsDetailUuid);
 

webstudio-modules/webstudio-modules-staticize/src/main/java/com/webstudio/staticize/service/StaticizeService.java

@@ -13,7 +13,7 @@ public interface StaticizeService {
 
     List<Map> getIndexNews();
 
-    List<News> getNewsByParm(String cloumn, Integer limit);
+    List<News> getNewsByParm(String cloumn, Integer newsTop, Integer limit);
 
     List<Map> getNewsIndex();
 

webstudio-modules/webstudio-modules-staticize/src/main/java/com/webstudio/staticize/service/impl/StaticizeServiceImpl.java

@@ -81,7 +81,7 @@ public class StaticizeServiceImpl implements StaticizeService {
             Map map = new HashMap();
             map.put("columnName",enumData.getDataName());
             //该分类下的最新四篇新闻
-            List<News> newsList = getNewsByParm(enumData.getUuid(),4);
+            List<News> newsList = getNewsByParm(enumData.getUuid(),null,4);
             map.put("newsList",newsList);
             indexNewsList.add(map);
         }
@@ -103,8 +103,8 @@ public class StaticizeServiceImpl implements StaticizeService {
 
     //新闻列表，按分类和分页查询
     @Override
-    public List<News> getNewsByParm(String cloumn, Integer limit) {
-        List<News> newsList = staticizeMapper.getNewsByParm(cloumn,limit);
+    public List<News> getNewsByParm(String cloumn, Integer newsTop, Integer limit) {
+        List<News> newsList = staticizeMapper.getNewsByParm(cloumn,newsTop,limit);
         for (News n : newsList){
             if (n.getSurface() != null && !"".equals(n.getSurface())){
                 SysFile sysFileR = fileService.selectSysFileByUUID(n.getSurface()).getData();
@@ -342,7 +342,7 @@ public class StaticizeServiceImpl implements StaticizeService {
         List<Map> newsIndexList = new ArrayList<>();
         //所有新闻
         Map allNewsMap = new HashMap();
-        List<News> allNewsList = getNewsByParm(null,null);
+        List<News> allNewsList = getNewsByParm(null,null,null);
         allNewsMap.put("columnName","全部");
         allNewsMap.put("columnCode","");
         allNewsMap.put("sort",0);
@@ -357,7 +357,7 @@ public class StaticizeServiceImpl implements StaticizeService {
             map.put("columnCode",enumData.getDataValue());
             map.put("sort",enumData.getSort());
             //该分类下的新闻
-            List<News> newsList = getNewsByParm(enumData.getUuid(),null);
+            List<News> newsList = getNewsByParm(enumData.getUuid(),null,null);
             map.put("newsList",newsList);
             newsIndexList.add(map);
         }

webstudio-modules/webstudio-modules-staticize/src/main/resources/mapper/system/StaticizeMapper.xml

@@ -49,6 +49,7 @@
         <result property="createTime" column="create_time"/>
         <result property="vievNum" column="news_viev_num"/>
         <result property="source" column="news_source"/>
+        <result property="newsTop" column="news_top"/>
         <result property="year" column="year"/>
         <result property="month" column="month"/>
         <result property="day" column="day"/>
@@ -56,7 +57,7 @@
     <!--    新闻列表-->
     <select id="getNewsByParm" resultMap="NewsResult">
         select news_uuid,news_push_status,news_title,news_column,news_date,
-               news_surface,news_digest,news_key,news_content,create_time,news_viev_num,news_source,
+               news_surface,news_digest,news_key,news_content,create_time,news_viev_num,news_source,news_top
             YEAR(news_date) as year,
             LPAD(MONTH(news_date),2,0) as month ,
             LPAD(DAY(news_date),2,0) as day
@@ -65,6 +66,9 @@
         <if test="column != null">
             and news_column = #{column}
         </if>
+        <if test="newsTop != null">
+            and news_top = #{newsTop}
+        </if>
         order by news_date desc
         <if test="limit != null">
             limit 0,#{limit}

webstudio-modules/webstudio-modules-system/src/main/java/com/webstudio/system/domain/News.java

@@ -64,6 +64,9 @@ public class News {
     @ApiModelProperty(value = "浏览数量")
     private Integer vievNum;
 
+    @ApiModelProperty(value = "新闻置顶")
+    private Integer newsTop;
+
     public String getUuid() {
         return uuid;
     }
@@ -199,4 +202,12 @@ public class News {
     public void setVievNum(Integer vievNum) {
         this.vievNum = vievNum;
     }
+
+    public Integer getNewsTop() {
+        return newsTop;
+    }
+
+    public void setNewsTop(Integer newsTop) {
+        this.newsTop = newsTop;
+    }
 }

webstudio-modules/webstudio-modules-system/src/main/resources/mapper/system/NewsMapper.xml

@@ -17,6 +17,7 @@
         <result property="createTime" column="create_time"/>
         <result property="vievNum" column="news_viev_num"/>
         <result property="source" column="news_source"/>
+        <result property="newsTop" column="news_top"/>
         <result property="year" column="year"/>
         <result property="month" column="month"/>
         <result property="day" column="day"/>
@@ -24,7 +25,7 @@
 
     <sql id="selectNewsVo">
         select news_uuid,news_push_status,news_title,news_column,news_date,
-               news_surface,news_digest,news_key,news_content,create_time,news_viev_num,news_source,
+               news_surface,news_digest,news_key,news_content,create_time,news_viev_num,news_source,news_top,
                YEAR(news_date) as year,
                LPAD(MONTH(news_date),2,0) as month ,
                LPAD(DAY(news_date),2,0) as day
@@ -43,6 +44,7 @@
         <if test="content != null and content != ''">,news_content</if>
         <if test="vievNum != null">,news_viev_num</if>
         <if test="source != null and source != ''">,news_source</if>
+        <if test="newsTop != null">,news_top</if>
         ,create_time
         ) values (
         <if test="uuid != null and uuid != ''">#{uuid}</if>
@@ -56,6 +58,7 @@
         <if test="content != null and content != ''">,#{content}</if>
         <if test="vievNum != null">,#{vievNum}</if>
         <if test="source != null and source != ''">,#{source}</if>
+        <if test="newsTop != null">,#{newsTop}</if>
         ,now()
         )
     </insert>
@@ -73,6 +76,7 @@
             <if test="content != null">news_content = #{content},</if>
             <if test="vievNum != null">news_viev_num = #{vievNum},</if>
             <if test="source != null">news_source = #{source},</if>
+            <if test="newsTop != null">news_top = #{newsTop},</if>
             create_time = now()
         </set>
         where news_uuid = #{uuid}