From d24d4fa72504f24d02595b4b0748ed8b2659c0df Mon Sep 17 00:00:00 2001 From: "34701892@qq.com" <34701892@qq.com> Date: Sat, 14 Dec 2024 18:05:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A4=A9=E4=B8=8B=E4=BA=8B=E7=9A=84type?= =?UTF-8?q?=E7=9A=84=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reference/core/mapper/NewsMapper.java | 4 +-- .../core/model/dto/news/SaveDraftColumn.java | 9 ++++++ .../reference/core/model/entity/News.java | 1 + .../core/model/vo/news/NewsDetailColumn.java | 9 ++++++ .../reference/core/service/NewsService.java | 30 +++++++++++++++---- 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java b/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java index 961254f..75abd1b 100644 --- a/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java +++ b/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java @@ -71,8 +71,8 @@ public interface NewsMapper { "values (#{title}, #{summary}, #{picture}, #{type}, #{content}, now(), now())") void saveDraft(NewsDraft newsDraft); - @Insert("insert into news(draft_id, title, summary, picture, type, content, create_time, update_time, status)" + - "values (#{draftId}, #{title}, #{summary}, #{picture}, #{type}, #{content}, now(), now(), #{status})") + @Insert("insert into news(draft_id, title, summary, picture, type, content, create_time, update_time, status, publish_time)" + + "values (#{draftId}, #{title}, #{summary}, #{picture}, #{type}, #{content}, now(), now(), #{status}, #{publishTime})") void saveNews(News news); diff --git a/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveDraftColumn.java b/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveDraftColumn.java index bcd239a..3aeb5b3 100644 --- a/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveDraftColumn.java +++ b/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveDraftColumn.java @@ -11,6 +11,7 @@ public class SaveDraftColumn { private SaveDraftColumnItem earlyKnow; private Boolean showEverything; + private SaveDraftColumnItem everything; public SaveDraftColumn() {} @@ -46,4 +47,12 @@ public class SaveDraftColumn { public void setShowEverything(Boolean showEverything) { this.showEverything = showEverything; } + + public SaveDraftColumnItem getEverything() { + return everything; + } + + public void setEverything(SaveDraftColumnItem everything) { + this.everything = everything; + } } diff --git a/core/src/main/java/com/jinrui/reference/core/model/entity/News.java b/core/src/main/java/com/jinrui/reference/core/model/entity/News.java index e910eb0..886c316 100644 --- a/core/src/main/java/com/jinrui/reference/core/model/entity/News.java +++ b/core/src/main/java/com/jinrui/reference/core/model/entity/News.java @@ -80,6 +80,7 @@ public class News { this.type = 1; this.status = saveNewsDTO.getStatus(); this.content = saveNewsDTO.getContent(); + this.publishTime = saveNewsDTO.getPublishTime(); // this.status = 0; this.createTime = new Date(); this.updateTime = new Date(); diff --git a/core/src/main/java/com/jinrui/reference/core/model/vo/news/NewsDetailColumn.java b/core/src/main/java/com/jinrui/reference/core/model/vo/news/NewsDetailColumn.java index cbad37d..9dfb80a 100644 --- a/core/src/main/java/com/jinrui/reference/core/model/vo/news/NewsDetailColumn.java +++ b/core/src/main/java/com/jinrui/reference/core/model/vo/news/NewsDetailColumn.java @@ -10,6 +10,7 @@ public class NewsDetailColumn { private SaveDraftColumnItem earlyKnow; private boolean showEverything = false; + private SaveDraftColumnItem everything; public NewsDetailColumnVip getVip() { return vip; @@ -42,4 +43,12 @@ public class NewsDetailColumn { public void setShowEverything(Boolean showEverything) { this.showEverything = showEverything; } + + public SaveDraftColumnItem getEverything() { + return everything; + } + + public void setEverything(SaveDraftColumnItem everything) { + this.everything = everything; + } } diff --git a/core/src/main/java/com/jinrui/reference/core/service/NewsService.java b/core/src/main/java/com/jinrui/reference/core/service/NewsService.java index f8dbf98..42e6531 100644 --- a/core/src/main/java/com/jinrui/reference/core/service/NewsService.java +++ b/core/src/main/java/com/jinrui/reference/core/service/NewsService.java @@ -123,6 +123,11 @@ public class NewsService { item.setType(type); } else if (columnId == 14) { newsDetailColumn.setShowEverything(true); + //zzp + SaveDraftColumnItem item = new SaveDraftColumnItem(); + newsDetailColumn.setEverything(item); + item.setShow(true); + item.setType(type); } else { NewsDetailColumnVip vip = new NewsDetailColumnVip(); vip.setId(columnId); @@ -210,6 +215,13 @@ public class NewsService { item.setType(type); } else if (columnId == 14) { newsDetailColumn.setShowEverything(true); + //zzp + SaveDraftColumnItem item = new SaveDraftColumnItem(); + newsDetailColumn.setEarlyKnow(item); + item.setShow(true); + item.setType(type); + + newsDetailColumn.setEverything(item); } else { NewsDetailColumnVip vip = new NewsDetailColumnVip(); vip.setId(columnId); @@ -334,11 +346,13 @@ public class NewsService { } } Boolean showEverything = column.getShowEverything(); - Integer type = null; - if (earlyKnow != null) { - type = earlyKnow.getType();//时间紧，暂时把早知道的type挪过来 - } +// Integer type = null; +// if (earlyKnow != null) { +// type = earlyKnow.getType();//时间紧，暂时把早知道的type挪过来 +// } + SaveDraftColumnItem everything = column.getEverything(); if (showEverything != null && showEverything) { + Integer type = everything.getType(); columnMapper.saveNewsColumnRel(newIdRl, 14L, type); } } @@ -521,6 +535,7 @@ public class NewsService { } } SaveDraftColumnItem earlyKnow = column.getEarlyKnow(); + SaveDraftColumnItem everything = column.getEverything(); if (earlyKnow != null) { Boolean show = earlyKnow.getShow(); if (show != null && show) { @@ -530,7 +545,9 @@ public class NewsService { } Boolean showEverything = column.getShowEverything(); if (showEverything != null && showEverything) { - columnMapper.saveDraftColumnRel(draftId, 14L, null); + //zzp + Integer type = everything.getType(); + columnMapper.saveDraftColumnRel(draftId, 14L, type); } } } catch (Exception e) { @@ -544,7 +561,8 @@ public class NewsService { Integer last, Integer current, String orderBy, String direction) { int offset = 0; if (current != null) { - offset = (Math.max(0, page - current)) * size; +// offset = (Math.max(0, page - current)) * size; + offset = (Math.max(0, current-1)) * size; } if (StringUtils.hasText(columnParam)) {