Prechádzať zdrojové kódy

fix(通知查看, 通知分页): 输出模型增加发布时间.

eric 2 rokov pred
rodič
commit
ef504fdef1

+ 11 - 0
src/main/java/com/finikes/oc/base/dto/NoticeViewDto.java

@@ -7,6 +7,8 @@ public class NoticeViewDto {
     private String secondTitle;
     private String content;
 
+    private String publishTime;
+
     @Override
     public String toString() {
         return "NoticeViewDto{" +
@@ -15,6 +17,7 @@ public class NoticeViewDto {
                 ", title='" + title + '\'' +
                 ", secondTitle='" + secondTitle + '\'' +
                 ", content='" + content + '\'' +
+                ", publishTime='" + publishTime + '\'' +
                 '}';
     }
 
@@ -57,4 +60,12 @@ public class NoticeViewDto {
     public void setContent(String content) {
         this.content = content;
     }
+
+    public String getPublishTime() {
+        return publishTime;
+    }
+
+    public void setPublishTime(String publishTime) {
+        this.publishTime = publishTime;
+    }
 }

+ 16 - 3
src/main/java/com/finikes/oc/base/service/NoticeServiceImpl.java

@@ -11,6 +11,8 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -65,16 +67,27 @@ public class NoticeServiceImpl implements NoticeService {
         if (notice == null) {
             throw new BusinessException("无此通知");
         }
-        return NoticeMapper.INSTANCE.noticeToNoticeViewDto(notice);
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+        NoticeViewDto dto = NoticeMapper.INSTANCE.noticeToNoticeViewDto(notice);
+        dto.setPublishTime(dateFormat.format(new Date(notice.getPublishTime())));
+        return dto;
     }
 
     @Override
     public PageResponse<NoticeViewDto> searchNotice(NoticeSearchDto dto) {
-        try (Page<Notice> page = PageHelper.startPage(dto.getPage(), dto.getPageCapacity())){
+        try (Page<Notice> page = PageHelper.startPage(dto.getPage(), dto.getPageCapacity())) {
             List<Notice> notices = noticeDao.selectByType(dto.getType());
 
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
             List<NoticeViewDto> list = notices.stream()
-                    .map(NoticeMapper.INSTANCE::noticeToNoticeViewDto)
+                    .map(i -> {
+                        NoticeViewDto viewDto = NoticeMapper.INSTANCE.noticeToNoticeViewDto(i);
+                        viewDto.setPublishTime(dateFormat.format(new Date(i.getPublishTime())));
+                        return viewDto;
+                    })
                     .collect(Collectors.toList());
 
             PageResponse<NoticeViewDto> response = new PageResponse<>();