tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

讨论，增加教师回复，学生回复

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent 6bf67b151f
commit 47956d6554
5 changed files with 168 additions and 1 deletions
Show Stats Download Patch File Download Diff File

46
web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseChatLogStudentDTO.java
Unescape Escape View File

@ -0,0 +1,46 @@
package com.ibeetl.jlw.entity.dto;
import com.ibeetl.jlw.enums.ChatLogSendTypeEnum;
import lombok.Builder;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
/**
*开课互动查询
*/
@Data
@Builder
@Accessors(chain = true)
public class TeacherOpenCourseChatLogStudentDTO {
/**
* 上级ID
*/
private Long teacherOpenCourseChatLogParentId;
/**
* 课程开课ID
*/
@NotNull(message = "开课ID不能为空！")
private Long teacherOpenCourseId;
/**
* 讨论内容
*/
@NotNull(message = "开课ID不能为空！")
private String chatContent;
/**
* 关键字（多个逗号隔开）
*/
private String keywords;
/**
* 提问方式
*/
@NotNull(message = "提问方式不能为空！")
private ChatLogSendTypeEnum chatLogSendType;
/**
* 附件上传（仅支持图片，多个逗号隔开）
*/
private String chatFiles;
}

50
web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseChatLogTeacherDTO.java
Unescape Escape View File

@ -0,0 +1,50 @@
package com.ibeetl.jlw.entity.dto;
import com.ibeetl.jlw.enums.ChatLogSendTypeEnum;
import lombok.Builder;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
/**
*开课互动查询
*/
@Data
@Builder
@Accessors(chain = true)
public class TeacherOpenCourseChatLogTeacherDTO {
/**
* 上级ID
*/
private Long teacherOpenCourseChatLogParentId;
/**
* 课程开课ID
*/
@NotNull(message = "开课ID不能为空！")
private Long teacherOpenCourseId;
/**
* 班级ID集合
*/
private String schoolClassIds;
/**
* 讨论内容
*/
@NotNull(message = "讨论内容不能为空！")
private String chatContent;
/**
* 关键字（多个逗号隔开）
*/
private String keywords;
/**
* 提问方式
*/
@NotNull(message = "提问方式不能为空！")
private ChatLogSendTypeEnum chatLogSendType;
/**
* 附件上传（仅支持图片，多个逗号隔开）
*/
private String chatFiles;
}

1
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseChatLogService.java
Unescape Escape View File

@ -97,7 +97,6 @@ public class TeacherOpenCourseChatLogService extends CoreBaseService<TeacherOpen
public JsonResult add(TeacherOpenCourseChatLogQuery teacherOpenCourseChatLogQuery){
String msg = "";
TeacherOpenCourseChatLog teacherOpenCourseChatLog = teacherOpenCourseChatLogQuery.pojo();
teacherOpenCourseChatLog.setTeacherOpenCourseChatLogAddTime(new Date());
teacherOpenCourseChatLogDao.insert(teacherOpenCourseChatLog);
teacherOpenCourseChatLogQuery.setTeacherOpenCourseChatLogId(teacherOpenCourseChatLog.getTeacherOpenCourseChatLogId());
JsonResult jsonResult = new JsonResult();

65
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.ibeetl.jlw.web;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import cn.jlw.Interceptor.SCoreUser;
@ -14,6 +15,8 @@ import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.entity.Teacher;
import com.ibeetl.jlw.entity.TeacherOpenCourseChatLog;
import com.ibeetl.jlw.entity.dto.TeacherOpenCourseChatLogStudentDTO;
import com.ibeetl.jlw.entity.dto.TeacherOpenCourseChatLogTeacherDTO;
import com.ibeetl.jlw.service.TeacherOpenCourseChatLogService;
import com.ibeetl.jlw.web.query.TeacherOpenCourseChatLogQuery;
import org.apache.commons.lang3.StringUtils;
@ -132,6 +135,68 @@ public class TeacherOpenCourseChatLogController{
}
}
/**
* 学生身份发布讨论
* @param studentDTO
* @param result
* @param coreUser
* @param student
* @return
*/
@PostMapping(API + "/studentSend.do")
public JsonResult studentSend(
@Validated
@RequestBody TeacherOpenCourseChatLogStudentDTO studentDTO,
BindingResult result, @SCoreUser CoreUser coreUser, @TStudent Student student){
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else{
Assert.notNull(coreUser, "请登录后再操作");
Assert.notNull(student, "该接口仅限学生使用");
TeacherOpenCourseChatLogQuery teacherOpenCourseChatLogQuery = new TeacherOpenCourseChatLogQuery();
teacherOpenCourseChatLogQuery.setUserId(student.getUserId());
teacherOpenCourseChatLogQuery.setOrgId(student.getOrgId());
if (ObjectUtil.isNotEmpty(student)) {
teacherOpenCourseChatLogQuery.setStudentId(student.getStudentId());
}
BeanUtil.copyProperties(studentDTO, teacherOpenCourseChatLogQuery);
teacherOpenCourseChatLogQuery.setDefault();
return teacherOpenCourseChatLogService.add(teacherOpenCourseChatLogQuery);
}
}
/**
* 教师身份发布讨论
* @param teacherDTO
* @param result
* @param coreUser
* @param teacher
* @return
*/
@PostMapping(API + "/teacherSend.do")
public JsonResult teacherSend(
@Validated
@RequestBody TeacherOpenCourseChatLogTeacherDTO teacherDTO,
BindingResult result, @SCoreUser CoreUser coreUser, @TTeacher Teacher teacher){
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else{
Assert.notNull(coreUser, "请登录后再操作");
Assert.notNull(teacher, "该接口仅限教师使用");
TeacherOpenCourseChatLogQuery teacherOpenCourseChatLogQuery = new TeacherOpenCourseChatLogQuery();
teacherOpenCourseChatLogQuery.setUserId(teacher.getUserId());
teacherOpenCourseChatLogQuery.setOrgId(teacher.getOrgId());
if (ObjectUtil.isNotEmpty(teacher)) {
teacherOpenCourseChatLogQuery.setTeacherId(teacher.getTeacherId());
}
BeanUtil.copyProperties(teacherDTO, teacherOpenCourseChatLogQuery);
teacherOpenCourseChatLogQuery.setDefault();
return teacherOpenCourseChatLogService.add(teacherOpenCourseChatLogQuery);
}
}
/**
* 教师端-给学生打分
* @param teacherOpenCourseChatLogId

7
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseChatLogQuery.java
Unescape Escape View File

@ -189,6 +189,13 @@ public class TeacherOpenCourseChatLogQuery extends PageParam {
return pojo;
}
public TeacherOpenCourseChatLogQuery setDefault() {
setReplyStatus(1);
setTeacherOpenCourseChatLogAddTime(new Date());
setTeacherOpenCourseChatLogStatus(1);
return this;
}
public String getTeacherOpenCourseChatLogIdPlural(){
return teacherOpenCourseChatLogIdPlural;
}

Write Preview
Loading…
Cancel
Save