mjh 4 years ago
parent
commit
169d2c6f60

+ 2 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/config/SpringSecurityConfiguration.java

@@ -88,10 +88,11 @@ public class SpringSecurityConfiguration extends WebSecurityConfigurerAdapter {
                         "/api/announcement",
                         "/api/announcement",
                         "/api/announcement/getAllByCourseId",
                         "/api/announcement/getAllByCourseId",
                         "/api/announcement/getUnreadByUserId",
                         "/api/announcement/getUnreadByUserId",
+                        "/api/announcement/read",
                         "/api/message",
                         "/api/message",
                         "/api/message/getUnreadByUser",
                         "/api/message/getUnreadByUser",
                         "/api/message/getByCourseId"
                         "/api/message/getByCourseId"
-                        )
+                )
                 .permitAll() // authenticate
                 .permitAll() // authenticate
                 .and()
                 .and()
                 .authorizeRequests()
                 .authorizeRequests()

+ 8 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/AnnouncementService.java

@@ -145,4 +145,12 @@ public class AnnouncementService {
                 .map(announcementMapper::toAnnouncementVO)
                 .map(announcementMapper::toAnnouncementVO)
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
     }
     }
+
+    public String readAnnouncement(Long id, Long userId){
+        AnnouncementRecord record = announcementRecordRepository.findById(new AnnouncementRecordKey(id, userId)).orElseThrow(CustomErrorException::announcementNotFound);
+        record.setState(true);
+        record.setReadAt(OffsetDateTime.now());
+        announcementRecordRepository.save(record);
+        return "公告阅读完成";
+    }
 }
 }

+ 5 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/AnnouncementController.java

@@ -45,4 +45,9 @@ public class AnnouncementController {
         return OkResponse.of(announcementService.getUnreadAnnouncementsByUserId(SecurityUtils.getCurrentUser().getId()));
         return OkResponse.of(announcementService.getUnreadAnnouncementsByUserId(SecurityUtils.getCurrentUser().getId()));
     }
     }
 
 
+    @PutMapping("/read")
+    public OkResponse<String> readAnnouncement(@RequestBody AnnouncementVO announcementVO){
+        return OkResponse.of(announcementService.readAnnouncement(announcementVO.getId(), SecurityUtils.getCurrentUser().getId()));
+    }
+
 }
 }