From f5379a7100a20f538092eb839b2f4c9f6d3a1b45 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 04 七月 2024 17:06:10 +0800
Subject: [PATCH] 上课记录Bug修复
---
src/main/java/com/ycl/jxkg/domain/entity/MeetStudent.java | 16 +++++++++++++++-
src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java | 16 ++++++++++++++--
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/MeetStudent.java b/src/main/java/com/ycl/jxkg/domain/entity/MeetStudent.java
index 774663b..65d69f0 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/MeetStudent.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/MeetStudent.java
@@ -1,16 +1,30 @@
package com.ycl.jxkg.domain.entity;
+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 lombok.Data;
import java.util.Date;
@Data
+@TableName("t_meet_student")
public class MeetStudent {
-
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ @TableField("meet_id")
private Integer meetId;
+ @TableField("meet_name")
+ private String meetName;
+ @TableField("student_id")
private Integer studentId;
+ @TableField("start_time")
private Date startTime;
+ @TableField("create_time")
private Date createTime;
+ @TableField("during_time")
private Long duringTime;
+ @TableField
+ private Integer version;
}
diff --git a/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
index ccef48e..5493e04 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
@@ -1,6 +1,7 @@
package com.ycl.jxkg.service.impl;
import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -170,15 +171,26 @@
Meet vo = baseMapper.getById(id);
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
if(vo.getStatus().equals(MeetStatusEnum.Starting.getCode())){
- //澧炲姞瀛︾敓涓婅璁板綍
Integer userId = webContext.getCurrentUser().getId();
+ //楠岃瘉鏈夋病鏈夐噸澶嶈繘鍏ワ紙閲嶅杩涘叆浼氬鑷翠笂璇炬鏁板澶氾級
+ QueryWrapper<MeetStudent> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("meet_id",id);
+ queryWrapper.eq("student_id",userId);
+ queryWrapper.eq("version",vo.getUpdateVersion());
+ MeetStudent one = meetStudentMapper.selectOne(queryWrapper);
+ if(one != null){
+ return Result.ok();
+ }
+ //澧炲姞瀛︾敓涓婅璁板綍
MeetStudent meetStudent = new MeetStudent();
meetStudent.setMeetId(id);
meetStudent.setStudentId(userId);
meetStudent.setCreateTime(new Date());
meetStudent.setStartTime(vo.getStartTime());
+ meetStudent.setVersion(vo.getUpdateVersion());
+ meetStudent.setMeetName(vo.getMeetName());
//TODO锛氭殏鏃跺鐞嗭紝鍚庢湡鑰冭檻jitsiApi
- meetStudent.setDuringTime((vo.getEndTime().getTime()-new Date().getTime())/1000);
+ meetStudent.setDuringTime(0L);
meetStudentMapper.insert(meetStudent);
//瀛︾敓瀛︿範妗ｆ鏇存柊
StudyRecord studyRecord = studyRecordMapper.getByStudentId(userId);
--
Gitblit v1.8.0