Merge pull request #104 from NJUPT-SAST/dev-mio

修改已订阅的活动列表和已报名的活动列表接口
NJUPT-SAST · Dec 12, 2023 · a79df47 · a79df47
2 parents fc9d3f7 + f7e9fa6
commit a79df47
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 15 deletions.
diff --git a/src/main/java/sast/evento/controller/UserController.java b/src/main/java/sast/evento/controller/UserController.java
@@ -57,6 +57,7 @@ public String subscribe(@RequestParam Integer eventId,
         return participateService.subscribe(user.getId(), eventId, isSubscribe);
     }
 
+    // 本周和未来的活动
     @OperateLog("获取已订阅的活动列表")
     @DefaultActionState(ActionState.LOGIN)
     @GetMapping("/subscribed")
@@ -74,6 +75,7 @@ public String register(@RequestParam Integer eventId,
         return participateService.register(user.getId(), eventId, isRegister);
     }
 
+    // 本周和未来的活动
     @OperateLog("获取已报名的活动列表")
     @DefaultActionState(ActionState.LOGIN)
     @GetMapping("/registered")

diff --git a/src/main/java/sast/evento/mapper/EventModelMapper.java b/src/main/java/sast/evento/mapper/EventModelMapper.java
@@ -77,10 +77,14 @@ List<EventModel> postForEventsByAll(@Param("type_id") List<Integer> typeId,
                                         @Param("next_monday") Date nextMonday);
 
 
-    // 获取已订阅的活动列表
-    List<EventModel> getSubscribed(@Param("userId") String userId);
+    // 获取已订阅的活动列表（本周和未来的活动）
+    List<EventModel> getSubscribed(@Param("userId") String userId,
+                                   @Param("monday") Date monday,
+                                   @Param("next_monday") Date nextMonday);
 
-    // 获取已报名的活动列表
-    List<EventModel> getRegistered(@Param("userId") String userId);
+    // 获取已报名的活动列表（本周和未来的活动）
+    List<EventModel> getRegistered(@Param("userId") String userId,
+                                   @Param("monday") Date monday,
+                                   @Param("next_monday") Date nextMonday);
 
 }
diff --git a/src/main/java/sast/evento/service/EventService.java b/src/main/java/sast/evento/service/EventService.java
@@ -28,10 +28,10 @@ public interface EventService {
     // 获取活动列表
     PageModel<EventModel> getEvents(Integer page, Integer size);
 
-    // 获取已订阅的活动列表
+    // 获取已订阅的活动列表（本周和未来的活动）
     List<EventModel> getSubscribed(String userId);
 
-    // 获取已报名的活动列表
+    // 获取已报名的活动列表（本周和未来的活动）
     List<EventModel> getRegistered(String userId);
 
     // 发起活动（添加活动）

diff --git a/src/main/java/sast/evento/service/impl/EventServiceImpl.java b/src/main/java/sast/evento/service/impl/EventServiceImpl.java
@@ -127,13 +127,21 @@ public PageModel<EventModel> getEvents(Integer page, Integer size) {
         return res;
     }
 
-    // 获取已订阅的活动列表
+    // 获取已订阅的活动列表（本周和未来的活动）
     @Override
     public List<EventModel> getSubscribed(String userId) {
         if (userId == null) {
             throw new LocalRunTimeException(ErrorEnum.PARAM_ERROR);
         }
-        return eventModelMapper.getSubscribed(userId);
+        String time = timeUtil.getTime();
+        List<Date> dates = timeUtil.getDateOfMonday(time);
+        if(dates == null || dates.isEmpty()) {
+            throw new LocalRunTimeException(ErrorEnum.TIME_ERROR);
+        }
+        // 结束日期设为无限大，获取的不是Date最大时间而是MySQL中datetime最大时间
+        final Date FINAL_DATE = timeUtil.validTime("9999-12-31").getTime();
+        dates.set(1, FINAL_DATE);
+        return eventModelMapper.getSubscribed(userId, dates.get(0), dates.get(1));
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -401,12 +409,21 @@ public List<EventModel> postForEvents(List<Integer> typeId, List<Integer> depart
         return eventModelMapper.postForEventsByAll(typeId, departmentId, date.get(0), date.get(1));
     }
 
+    // 获取已报名的活动列表（本周和未来的活动）
     @Override
     public List<EventModel> getRegistered(String userId) {
         if (userId == null) {
             throw new LocalRunTimeException(ErrorEnum.PARAM_ERROR);
         }
-        return eventModelMapper.getRegistered(userId);
+        String time = timeUtil.getTime();
+        List<Date> dates = timeUtil.getDateOfMonday(time);
+        if(dates == null || dates.isEmpty()) {
+            throw new LocalRunTimeException(ErrorEnum.TIME_ERROR);
+        }
+        // 结束日期设为无限大，获取的不是Date最大时间而是MySQL中datetime最大时间
+        final Date FINAL_DATE = timeUtil.validTime("9999-12-31").getTime();
+        dates.set(1, FINAL_DATE);
+        return eventModelMapper.getRegistered(userId, dates.get(0), dates.get(1));
     }
 
     private EventState getMatchState(Date registrationStart, Date registrationEnd, Date eventStart, Date eventEnd) {

diff --git a/src/main/resources/mapper/eventModelMapper.xml b/src/main/resources/mapper/eventModelMapper.xml
@@ -196,19 +196,31 @@
         <include refid="byDepartmentId"/>
     </select>
 
-<!--    获取已订阅的活动列表-->
+<!--    获取已订阅的活动列表（本周和未来的活动）-->
     <select id="getSubscribed" resultMap="eventModelMap">
-        <include refid="selectFrom" />
+        <include refid="selectFrom"/>
         LEFT JOIN
             participate AS p ON e.id = p.event_id
-        WHERE p.user_id = #{userId} AND p.is_subscribe = 1
+        WHERE
+        p.user_id = #{userId}
+        AND
+        p.is_subscribe = 1
+        AND
+        <include refid="byTime"/>
+        ORDER BY e.gmt_event_start DESC
     </select>
 
-    <!--    获取已报名的活动列表-->
+    <!--    获取已报名的活动列表（本周和未来的活动）-->
     <select id="getRegistered" resultMap="eventModelMap">
-        <include refid="selectFrom" />
+        <include refid="selectFrom"/>
         LEFT JOIN
             participate AS p ON e.id = p.event_id
-        WHERE p.user_id = #{userId} AND p.is_registration = 1
+        WHERE
+        p.user_id = #{userId}
+        AND
+        p.is_registration = 1
+        AND
+        <include refid="byTime"/>
+        ORDER BY e.gmt_event_start DESC
     </select>
 </mapper>