Commit 9e0dacc7 authored by wujipeng's avatar wujipeng
Browse files

Merge remote-tracking branch 'origin/dev-v1.0' into dev-v1.0

parents 4ff3e0e4 1ea1a030
package com.platform.business.model.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
* 实训室机位定义。机位本身不保存预约状态,预约/使用状态按日期和时段动态计算。
*/
@Data
@TableName("training_room_seat")
public class TrainingRoomSeatEntity {
/** 机位字符串雪花ID。 */
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
/** 机位所属实训室ID。 */
@TableField("room_id")
private String roomId;
/** 实训室内连续递增的机位编号。 */
@TableField("seat_no")
private Integer seatNo;
/** 缩减机位时置为 false,再次扩容时可以恢复原机位。 */
private Boolean enabled;
/** 机位记录创建时间。 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
}
package com.platform.business.model.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class AttendanceCourseStatisticsVO {
private Integer subjectId;
private String subjectName;
private Integer classId;
private String className;
private String teacherId;
private String teacherName;
private String teacherPhone;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date subjectDate;
private String timeFrame;
private long requiredCount;
private long normalCount;
private long lateCount;
private long absentCount;
private long leaveCount;
private BigDecimal attendanceRate;
}
package com.platform.business.model.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@Data
public class AttendanceRecordVO {
private String id;
private Integer subjectId;
private String subjectName;
private Integer classId;
private String className;
private String studentId;
private String studentName;
private String studentPhone;
private String teacherId;
private String teacherName;
private String teacherPhone;
private String status;
private String checkInMethod;
private String checkInIp;
private Boolean teacherConfirmed;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date subjectDate;
private String timeFrame;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date checkInTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date confirmedAt;
}
package com.platform.business.model.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@Data
public class AttendanceSessionVO {
private String sessionId;
private Integer subjectId;
private String subjectName;
private String className;
private String teacherId;
private String teacherName;
private String teacherPhone;
private String verificationCode;
private String status;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date scheduledStartTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date scheduledEndTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startedAt;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date codeExpiresAt;
}
package com.platform.business.model.vo;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class AttendanceStudentStatisticsVO {
private String studentId;
private String studentName;
private String studentPhone;
private long requiredCount;
private long normalCount;
private long lateCount;
private long absentCount;
private long leaveCount;
private BigDecimal attendanceRate;
}
package com.platform.business.model.vo;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class AttendanceSummaryVO {
private long requiredCount;
private long normalCount;
private long lateCount;
private long absentCount;
private long leaveCount;
private BigDecimal attendanceRate;
private List<AttendanceStudentStatisticsVO> studentStatistics;
private List<AttendanceCourseStatisticsVO> courseStatistics;
}
...@@ -45,6 +45,12 @@ public class CalendarVO { ...@@ -45,6 +45,12 @@ public class CalendarVO {
@ApiModelProperty(value = "是否签到") @ApiModelProperty(value = "是否签到")
private Boolean isSignIn; private Boolean isSignIn;
@ApiModelProperty(value = "出勤状态:NORMAL/LATE/ABSENT/LEAVE/PENDING")
private String attendanceStatus;
@ApiModelProperty(value = "签到方式:IP_CODE/IP_ONLY/TEACHER/SYSTEM")
private String checkInMethod;
@ApiModelProperty(value = "签到时间") @ApiModelProperty(value = "签到时间")
@JsonFormat(pattern = "HH:mm", timezone = "GMT+8") @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
private Date signInTime; private Date signInTime;
......
package com.platform.business.model.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class LeaveApplicationVO {
private String id;
private String studentId;
private String studentName;
private String studentPhone;
private String leaveType;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
private Long durationMinutes;
private String reason;
private String emergencyContactName;
private String emergencyContactPhone;
private String status;
private String approverId;
private String approverName;
private String approverPhone;
private String approverRole;
private String approvalOpinion;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date appliedAt;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date reviewedAt;
private List<LeaveSubjectVO> subjects;
private List<LeaveAttachmentVO> attachments;
}
package com.platform.business.model.vo;
import lombok.Data;
@Data
public class LeaveAttachmentVO {
private Integer fileId;
private String fileName;
}
package com.platform.business.model.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@Data
public class LeaveSubjectVO {
private Integer subjectId;
private String subjectName;
private Integer classId;
private String className;
private String teacherId;
private String teacherName;
private String teacherPhone;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date subjectDate;
private String timeFrame;
}
package com.platform.business.model.vo;
import lombok.Data;
/**
* 教学资源统计数据;学生端返回值只统计当前学生有权查看的课程资源。
*/
@Data
public class TeachingResourceStatisticsVO {
private Long totalCount;
private Long totalSize;
private Long totalDownloads;
private Long docCount;
private Long videoCount;
private Long imageCount;
private Long otherCount;
}
package com.platform.business.model.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
* 教学资源列表返回对象,补充课程名称及班级信息供两端展示。
*/
@Data
public class TeachingResourceVO {
private String id;
private Integer fileId;
private String resourceName;
private String resourceType;
private Integer courseId;
private String courseName;
private Integer classId;
private String className;
private Long fileSize;
private String uploaderId;
private String uploaderName;
private Long downloadCount;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
}
package com.platform.business.model.vo;
import com.platform.business.model.entity.TrainingRoomBookingLogEntity;
import lombok.Data;
import java.util.List;
/** 预约详情及操作时间线。 */
@Data
public class TrainingRoomBookingDetailVO {
/** 预约基本信息及关联实训室信息。 */
private TrainingRoomBookingVO booking;
/** 按操作时间升序排列的预约状态变更记录。 */
private List<TrainingRoomBookingLogEntity> operationLogs;
}
package com.platform.business.model.vo;
import lombok.Data;
/** 单个实训室的预约状态统计。 */
@Data
public class TrainingRoomBookingStatisticsVO {
/** 预约记录总数,包含已取消记录。 */
private Long totalCount;
/** 未开始的有效预约数。 */
private Long bookedCount;
/** 当前使用中的预约数。 */
private Long usingCount;
/** 已完成的预约数。 */
private Long doneCount;
/** 已取消的预约数。 */
private Long canceledCount;
}
package com.platform.business.model.vo;
import com.platform.business.model.entity.TrainingRoomBookingEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/** 预约列表展示对象。 */
@Data
@EqualsAndHashCode(callSuper = true)
public class TrainingRoomBookingVO extends TrainingRoomBookingEntity {
/** 预约关联的实训室名称。 */
private String roomName;
/** 预约关联的实训室位置。 */
private String roomLocation;
/** 固定时段的可读文本,例如08:00 - 10:00。 */
private String slotLabel;
}
package com.platform.business.model.vo;
import lombok.Data;
/** 指定日期和时段下的机位可用情况。 */
@Data
public class TrainingRoomSeatVO {
/** 机位雪花ID。 */
private String id;
/** 实训室内的机位编号。 */
private Integer seatNo;
/** free、booked、using。 */
private String status;
/** 机位被占用时对应的有效预约ID,空闲时为空。 */
private String bookingId;
}
package com.platform.business.model.vo;
import lombok.Data;
/** 实训室KPI统计。 */
@Data
public class TrainingRoomStatisticsVO {
/** 实训室总数。 */
private Long totalRooms;
/** 运行中的实训室数量。 */
private Long runningRooms;
/** 已停用的实训室数量。 */
private Long disabledRooms;
/** 机位总数。 */
private Long totalSeats;
/** 当前时刻未被使用的机位数。 */
private Long freeSeats;
/** 当前存在使用中预约的实训室数量。 */
private Long usingRooms;
/** 当前所有机位均在使用的实训室数量。 */
private Long fullRooms;
/** 当前时刻之后的有效预约数。 */
private Long futureBookings;
}
package com.platform.business.model.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
/** 固定预约时段返回对象。 */
@Data
@AllArgsConstructor
public class TrainingRoomTimeSlotVO {
/** 时段编码,取值范围为1至5。 */
private Integer code;
/** 时段名称。 */
private String label;
/** 时段开始时间,格式为HH:mm。 */
private String startTime;
/** 时段结束时间,格式为HH:mm。 */
private String endTime;
}
package com.platform.business.model.vo;
import com.platform.business.model.entity.TrainingRoomEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/** 实训室卡片展示对象。 */
@Data
@EqualsAndHashCode(callSuper = true)
public class TrainingRoomVO extends TrainingRoomEntity {
/** 实训室管理员姓名。 */
private String managerName;
/** 实训室管理员手机号。 */
private String managerPhone;
/** 当前时刻正在使用的机位数。 */
private Integer currentUsingCount;
/** 未开始的有效预约数。 */
private Integer bookedCount;
/** 已完成的预约数。 */
private Integer doneCount;
/** 当前时刻的空闲机位数。 */
private Integer freeSeatCount;
/** 当前时刻之后的有效预约数。 */
private Integer futureBookingCount;
/** 当前时刻动态状态:free、busy、full。 */
private String availabilityStatus;
}
package com.platform.business.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
@Data
@Component
@ConfigurationProperties(prefix = "attendance")
public class AttendanceProperties {
/** 计划开始后的验证码有效分钟数。 */
private int verificationCodeValidMinutes = 15;
/**
* 允许签到的IPv4网段,例如 192.168.10.0/24。为空时安全拒绝签到,等待部署时补充。
*/
private List<String> allowedIpCidrs = new ArrayList<>();
/** 只有网关已清洗转发头时才应开启。 */
private boolean trustForwardedHeaders = false;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment