Merge pull request #7 from 1zhangluo1/main

1.增加了获取用户状态时返回周序;2.增加了用户的学习方向字段。
sanyuankexie · Sep 2, 2024 · 942497f · 942497f
2 parents a7d3df8 + 4f0585a
commit 942497f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/src/main/java/org/sanyuankexie/attendance/common/DTO/UserStatusDTO.java b/src/main/java/org/sanyuankexie/attendance/common/DTO/UserStatusDTO.java
@@ -7,4 +7,5 @@ public class UserStatusDTO {
     private Long userId;
     private String userName;
     private Integer status;
+    private Integer week;
 }
diff --git a/src/main/java/org/sanyuankexie/attendance/model/User.java b/src/main/java/org/sanyuankexie/attendance/model/User.java
@@ -21,4 +21,6 @@ public class User {
     private   String githubId;
     @ExcelProperty("年级(例如：22级填22)")
     private String grade;
+    @ExcelProperty("方向")
+    private String learn;
 }
diff --git a/src/main/java/org/sanyuankexie/attendance/service/AttendanceRecordService.java b/src/main/java/org/sanyuankexie/attendance/service/AttendanceRecordService.java
@@ -5,8 +5,10 @@
 import org.sanyuankexie.attendance.common.DTO.UserStatusEnum;
 import org.sanyuankexie.attendance.common.exception.CExceptionEnum;
 import org.sanyuankexie.attendance.common.exception.ServiceException;
+import org.sanyuankexie.attendance.common.helper.TimeHelper;
 import org.sanyuankexie.attendance.mapper.AttendanceRecordMapper;
 import org.sanyuankexie.attendance.model.AttendanceRecord;
+import org.sanyuankexie.attendance.model.SystemInfo;
 import org.sanyuankexie.attendance.model.User;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -30,6 +32,11 @@ public class AttendanceRecordService {
     @Value("${attendance.term}")
     private String term;
 
+    private final TimeHelper timeHelper;
+
+    public AttendanceRecordService(TimeHelper timeHelper, SystemInfo systemInfo) {
+        this.timeHelper = timeHelper;
+    }
 
     DecimalFormat dft = new DecimalFormat("0.00");
 
@@ -102,6 +109,7 @@ public UserStatusDTO isOnlineByUserId(Long userId) {
             userStatusDTO.setUserId(user.getId());
             userStatusDTO.setStatus(UserStatusEnum.OFFLINE.getStatus());
             userStatusDTO.setUserName(user.getName());
+            userStatusDTO.setWeek(timeHelper.getNowWeek());
             return userStatusDTO;
         }
     }