diff --git a/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveNewsDTO.java b/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveNewsDTO.java index 97d1121..3b47ba7 100644 --- a/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveNewsDTO.java +++ b/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveNewsDTO.java @@ -2,6 +2,8 @@ package com.jinrui.reference.core.model.dto.news; import com.jinrui.reference.core.model.vo.news.NewsDetailVO; +import java.util.Date; + @SuppressWarnings("unused") public class SaveNewsDTO { @@ -19,6 +21,7 @@ public class SaveNewsDTO { private String content; private Integer status; + private Date publishTime; public SaveNewsDTO() {} @@ -95,4 +98,12 @@ public class SaveNewsDTO { public void setStatus(Integer status) { this.status = status; } + + public Date getPublishTime() { + return publishTime; + } + + public void setPublishTime(Date publishTime) { + this.publishTime = publishTime; + } } 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 511eacd..968b2c2 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 @@ -33,6 +33,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -265,10 +266,10 @@ public class NewsService { if (column != null) { SaveDraftColumnVip vip = column.getVip(); if (vip != null) { - id = vip.getId(); - if (id != null) { + Long vipId = vip.getId(); + if (vipId != null) { Integer type = vip.getType(); - columnMapper.saveNewsColumnRel(newsId, id, type); + columnMapper.saveNewsColumnRel(newsId, vipId, type); } } SaveDraftColumnItem earlyKnow = column.getEarlyKnow(); @@ -289,16 +290,19 @@ public class NewsService { return ResultObject.failed(500, "服务器错误,请联系系统管理员!"); } - // 已发布 - saveNewsDTO.setStatus(2); - saveDraft(saveNewsDTO); + // 发布时创建文章 + if (id == null) { + // 已发布 + saveNewsDTO.setStatus(2); + saveNewsDTO.setPublishTime(new Date()); + saveNewDraft(saveNewsDTO,null); + } + return ResultObject.success(); } public ResultObject saveDraft(SaveNewsDTO saveNewsDTO) { Long id = saveNewsDTO.getId(); - // 未发布 - saveNewsDTO.setStatus(1); if (id == null) { return saveNewDraft(saveNewsDTO, null);