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

1

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent cf1164487c
commit 2a58db5f2e
3 changed files with 70 additions and 43 deletions
Show Stats Download Patch File Download Diff File

8
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
Unescape Escape View File

@ -469,6 +469,14 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
}
public void insertByOpenCourseTitle(Long teacherOpenCourseId, String teacherOpenCourseTitle) {
TeacherOpenCourseMergeCourseInfo model = new TeacherOpenCourseMergeCourseInfo();
model.setTeacherOpenCourseId(teacherOpenCourseId);
model.setCourseInfoStatus(1);
model.setCourseInfoName(teacherOpenCourseTitle);
teacherOpenCourseMergeCourseInfoService.insert(model);
}
/**
* 教师端-导入课程章节操作，逻辑拆分

53
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeTeacherService.java
Unescape Escape View File

@ -21,8 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -238,4 +240,55 @@ public class TeacherOpenCourseMergeTeacherService extends CoreBaseService<Teache
}
}
/**
* 插入表，根据教师ID和开课ID。
* @param teacherOpenCourseId
* @param teacherId
*/
public void insertByTeacher(@NotNull(message = "开课ID不能为空！") Long teacherOpenCourseId,
@NotNull(message = "教师ID不能为空！") Long teacherId) {
// 新建排序值，则默认是1
Long newOrderIndex = 1L;
TeacherOpenCourseMergeTeacher courseMergeTeacherList = teacherOpenCourseMergeTeacherDao.getOneByTeacherId(teacherId);
// 如果没有查询到这个老师创建的开课信息, 则不会递增
if(courseMergeTeacherList != null) {
newOrderIndex = courseMergeTeacherList.getTeacherOpenCourseMergeTeacherOrderIndex() + 1L;
}
TeacherOpenCourseMergeTeacher teacherOpenCourseMergeTeacher = new TeacherOpenCourseMergeTeacher();
teacherOpenCourseMergeTeacher.setTeacherId(teacherId);
teacherOpenCourseMergeTeacher.setTeacherOpenCourseId(teacherOpenCourseId);
teacherOpenCourseMergeTeacher.setTeacherOpenCourseMergeTeacherAddTime(new Date());
teacherOpenCourseMergeTeacher.setTeacherOpenCourseMergeTeacherStatus(1);
teacherOpenCourseMergeTeacher.setTeacherOpenCourseMergeTeacherOrderIndex(newOrderIndex);
// 生成的授权码, 库里唯一
String tempCode = generateCodeWithVerify(RandomUtil.randomString(6));
// 开课授权码：新增开课记录时，则创建授权码
teacherOpenCourseMergeTeacher.setTeacherOpenCourseMergeTeacherAuthCode(tempCode);
// teacherOpenCourseMergeTeacher.setOrgId(teacherOpenCourseQuery.getOrgId());
// teacherOpenCourseMergeTeacher.setUserId(teacherOpenCourseQuery.getUserId());
teacherOpenCourseMergeTeacherDao.insert(teacherOpenCourseMergeTeacher);
}
/**
* 生成唯一的验证码
* @param tempCode
* @return
*/
public String generateCodeWithVerify(@NotBlank(message = "验证码不能为空！") String tempCode) {
boolean isRepeat = teacherOpenCourseMergeTeacherDao.createLambdaQuery()
.andEq(TeacherOpenCourseMergeTeacher::getTeacherOpenCourseMergeTeacherAuthCode, tempCode)
.andEq(TeacherOpenCourseMergeTeacher::getTeacherOpenCourseMergeTeacherStatus, 1)
.count() > 0L;
// 已经存在，则递归创建新的验证码
if(isRepeat) {
return generateCodeWithVerify(RandomUtil.randomString(6));
}
return tempCode;
}
}

52
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java
Unescape Escape View File

@ -1,7 +1,6 @@
package com.ibeetl.jlw.service;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
import cn.jlw.util.ToolUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@ -11,10 +10,8 @@ import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.TeacherOpenCourseDao;
import com.ibeetl.jlw.dao.TeacherOpenCourseMergeTeacherDao;
import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.entity.TeacherOpenCourse;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeTeacher;
import com.ibeetl.jlw.web.query.TeacherOpenCourseQuery;
import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.SqlId;
@ -23,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.Date;
@ -43,7 +39,9 @@ public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse>
@Autowired private TeacherOpenCourseDao teacherOpenCourseDao;
@Autowired
private TeacherOpenCourseMergeTeacherDao teacherOpenCourseMergeTeacherDao;
private TeacherOpenCourseMergeTeacherService teacherOpenCourseMergeTeacherService;
@Autowired
private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService;
@Autowired
private TeacherService teacherService;
@ -113,54 +111,22 @@ public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse>
teacherOpenCourseDao.insert(teacherOpenCourse);
// 开课和教师关联数据
Long teacherId = teacherOpenCourse.getTeacherInfo().getTeacherId();
Long teacherId = teacherOpenCourseQuery.getTeacherId();
Long teacherOpenCourseId = teacherOpenCourse.getTeacherOpenCourseId();
if (ObjectUtil.isNotEmpty(teacherId)) {
// 新建排序值，则默认是1
Long newOrderIndex = 1L;
TeacherOpenCourseMergeTeacher courseMergeTeacherList = teacherOpenCourseMergeTeacherDao.getOneByTeacherId(teacherId);
// 如果没有查询到这个老师创建的开课信息, 则不会递增
if(courseMergeTeacherList != null) {
newOrderIndex = courseMergeTeacherList.getTeacherOpenCourseMergeTeacherOrderIndex() + 1L;
}
TeacherOpenCourseMergeTeacher teacherOpenCourseMergeTeacher = new TeacherOpenCourseMergeTeacher();
teacherOpenCourseMergeTeacher.setTeacherId(teacherId);
teacherOpenCourseMergeTeacher.setTeacherOpenCourseId(teacherOpenCourse.getTeacherOpenCourseId());
teacherOpenCourseMergeTeacher.setTeacherOpenCourseMergeTeacherAddTime(new Date());
teacherOpenCourseMergeTeacher.setTeacherOpenCourseMergeTeacherStatus(1);
teacherOpenCourseMergeTeacher.setTeacherOpenCourseMergeTeacherOrderIndex(newOrderIndex);
// 生成的授权码, 库里唯一
String tempCode = generateCodeWithVerify(RandomUtil.randomString(6));
// 开课授权码：新增开课记录时，则创建授权码
teacherOpenCourseMergeTeacher.setTeacherOpenCourseMergeTeacherAuthCode(tempCode);
teacherOpenCourseMergeTeacher.setOrgId(teacherOpenCourseQuery.getOrgId());
teacherOpenCourseMergeTeacher.setUserId(teacherOpenCourseQuery.getUserId());
teacherOpenCourseMergeTeacherDao.insert(teacherOpenCourseMergeTeacher);
teacherOpenCourseMergeTeacherService.insertByTeacher(teacherOpenCourseId, teacherId);
}
teacherOpenCourseQuery.setTeacherOpenCourseId(teacherOpenCourse.getTeacherOpenCourseId());
teacherOpenCourseMergeCourseInfoService.insertByOpenCourseTitle(teacherOpenCourseId, teacherOpenCourseQuery.getTeacherOpenCourseTitle());
teacherOpenCourseQuery.setTeacherOpenCourseId(teacherOpenCourseId);
JsonResult jsonResult = new JsonResult();
jsonResult.setData(teacherOpenCourse.getTeacherOpenCourseId());//自增的ID丢进去
jsonResult.setData(teacherOpenCourseId);//自增的ID丢进去
jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
jsonResult.setMsg(msg);
return jsonResult;
}
private String generateCodeWithVerify(@NotBlank(message = "验证码不能为空！") String tempCode) {
boolean isRepeat = teacherOpenCourseMergeTeacherDao.createLambdaQuery()
.andEq(TeacherOpenCourseMergeTeacher::getTeacherOpenCourseMergeTeacherAuthCode, tempCode)
.andEq(TeacherOpenCourseMergeTeacher::getTeacherOpenCourseMergeTeacherStatus, 1)
.count() > 0L;
// 已经存在，则递归创建新的验证码
if(isRepeat) {
return generateCodeWithVerify(RandomUtil.randomString(6));
}
return tempCode;
}
public String edit(TeacherOpenCourseQuery teacherOpenCourseQuery){
String msg = "";

Write Preview
Loading…
Cancel
Save