beetlsql3-dev
Mlxa0324
parent 01944d8760
commit 502e0ba8ce

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -350,3 +350,5 @@ create table teacher_open_course_merge_resources_info
COLLATE = utf8_general_ci;
alter table teacher_open_course_merge_resources_info comment '开课关联- 资源管理-离线';
ALTER TABLE course_info ADD COLUMN order_index bigint(20) COMMENT '同级排序';

@ -27226,6 +27226,7 @@ CREATE TABLE `resources_info` (
`resources_info_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源名称',
`resources_info_type` int(11) NULL DEFAULT NULL COMMENT '资源类型 数据字典resources_info_type',
`resources_info_content` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源内容',
`order_index` bigint(20) NULL DEFAULT 1 COMMENT '排序',
`org_id` bigint(20) NULL DEFAULT NULL COMMENT '组织机构ID',
`user_id` bigint(20) NULL DEFAULT NULL COMMENT '后台用户ID',
PRIMARY KEY (`resources_info_id`) USING BTREE

@ -1,5 +1,6 @@
package com.ibeetl.jlw.dao;
import cn.hutool.core.util.ObjectUtil;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeCourseInfo;
import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeCourseInfoQuery;
import org.beetl.sql.core.engine.PageQuery;
@ -25,6 +26,10 @@ public interface TeacherOpenCourseMergeCourseInfoDao extends BaseMapper<TeacherO
@Update
int updateGivenByIds(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery);
List<TeacherOpenCourseMergeCourseInfo> getByIds(String ids);
default TeacherOpenCourseMergeCourseInfo getById(Long id) {
List<TeacherOpenCourseMergeCourseInfo> list = getByIds(id.toString());
return ObjectUtil.isNotEmpty(list) ? list.get(0) : null;
}
List<TeacherOpenCourseMergeCourseInfo> getValuesByQuery(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery);
List<TeacherOpenCourseMergeCourseInfo> getValuesByQueryNotWithPermission(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery);
List<Map<String,Object>>getExcelValues(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery);

@ -6,6 +6,7 @@ import com.ibeetl.admin.core.util.ValidateConfig;
import org.beetl.sql.annotation.entity.AssignID;
import javax.validation.constraints.NotNull;
import java.util.List;
/*
* - -线
@ -328,4 +329,14 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity{
}
public void putChildren(List<TeacherOpenCourseMergeCourseInfo> courseInfoList){
this.set("children", courseInfoList);
}
public List<TeacherOpenCourseMergeCourseInfo> takeChildren(){
return (List<TeacherOpenCourseMergeCourseInfo>)this.get("children");
}
}

@ -1,9 +1,7 @@
package com.ibeetl.jlw.service;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReflectUtil;
import cn.jlw.Interceptor.GetFile;
import cn.jlw.util.ToolUtils;
import com.ibeetl.admin.core.entity.CoreUser;
@ -38,6 +36,7 @@ import java.util.concurrent.*;
import java.util.stream.Collectors;
import static cn.jlw.util.ConvertM3U8.booleanMap;
import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUserId;
/**
@ -784,6 +783,25 @@ public class CourseInfoService extends CoreBaseService<CourseInfo>{
}
/**
*
* @param moveDTO
* @return
*/
public void move(MoveDTO moveDTO) {
moveDTO.getMoveType();
moveDTO.getId();
moveDTO.getNum();
switch(moveDTO.getMoveType()) {
case MOVE_TOP:
case MOVE_LEFT:
case MOVE_RIGHT:
}
}
//线程处理 根据章节分割word
private class TaskCallable2Split implements Callable<Boolean> {
File file;
@ -970,18 +988,12 @@ public class CourseInfoService extends CoreBaseService<CourseInfo>{
* @return
*/
public PageQuery getCourseInfoPageByUniversitiesCollegesId(PageQuery pageQuery) {
Long universitiesCollegesId = null, userId = null;
Long userId = getUserId();
ExtendSchoolInfo extendSchoolInfo = null;
try {
universitiesCollegesId = (Long)ReflectUtil.getFieldValue(pageQuery.getParas(), "universitiesCollegesId");
userId = (Long)ReflectUtil.getFieldValue(pageQuery.getParas(), "userId");
}catch (Exception e){}
Assert.isFalse(ObjectUtil.isAllEmpty(universitiesCollegesId, userId), "院校ID和用户ID两个参数不能同时都为空");
// 如果用户ID不为空则查询这个用户所在的院校ID
if(ObjectUtil.isNotEmpty(userId)) {
CoreUser userInfo = coreUserService.getUserById(userId);
if (userInfo.isStudent()) {
extendSchoolInfo = studentService.getStudentExtendSchoolInfoByUserIds(userInfo.getId().toString());
}

@ -0,0 +1,39 @@
package com.ibeetl.jlw.service;
import com.ibeetl.jlw.enums.MoveEnum;
import lombok.Data;
import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotNull;
/**
* <p>
*
* </p>
*
* @author mlx
* @date 2022/11/4
* @modified
*/
@Validated
@Data
public class MoveDTO {
/**
* id
*/
@NotNull(message = "排序指定的ID不能为空")
private Long id;
/**
*
*/
@NotNull(message = "排序的移动类型不能为空!")
private MoveEnum moveType;
/**
*
*/
private Long num = 1L;
}

@ -37,6 +37,7 @@ import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.*;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
import static java.util.stream.Collectors.joining;
@ -69,6 +70,9 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
@Autowired
private ResourcesQuestionService resourcesQuestionService;
//树结构缓存
private Map<Long,TeacherOpenCourseMergeCourseInfo> TreeCache = new ConcurrentHashMap<>();
public PageQuery<TeacherOpenCourseMergeCourseInfo>queryByCondition(PageQuery query){
PageQuery ret = teacherOpenCourseMergeCourseInfoDao.queryByCondition(query);
queryListAfter(ret.getList());
@ -513,4 +517,51 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
deleteByCondition(teacherOpenCourseMergeCourseInfo);
}
public TeacherOpenCourseMergeCourseInfo getTreeById(Long teacherOpenCourseMergeCourseInfoId){
TeacherOpenCourseMergeCourseInfo courseInfo = null;
if(null != TreeCache.get(teacherOpenCourseMergeCourseInfoId)){
courseInfo = ToolUtils.deepCopy(TreeCache.get(teacherOpenCourseMergeCourseInfoId));
} else {
courseInfo = teacherOpenCourseMergeCourseInfoDao.getById(teacherOpenCourseMergeCourseInfoId);
if(null != courseInfo){
courseInfo.set("id",courseInfo.getTeacherOpenCourseMergeCourseInfoId());
courseInfo.set("title",courseInfo.getCourseInfoName());
courseInfo.set("spread","true");
if(null == courseInfo.getCourseInfoType()){
courseInfo.setCourseInfoType(1);
}
getByParentCourseInfoId(courseInfo, courseInfo.getTeacherOpenCourseMergeCourseInfoId(),1);
}
TreeCache.put(courseInfo.getTeacherOpenCourseMergeCourseInfoId(),ToolUtils.deepCopy(courseInfo));
}
return courseInfo;
}
/**
*
* @param courseInfo
* @param courseInfoId
* @param n
*/
public void getByParentCourseInfoId(TeacherOpenCourseMergeCourseInfo courseInfo, Long courseInfoId,Integer n){
TeacherOpenCourseMergeCourseInfo c = new TeacherOpenCourseMergeCourseInfo();
c.setCourseInfoParentId(courseInfoId);
c.setCourseInfoStatus(1);
List<TeacherOpenCourseMergeCourseInfo> courseInfoList = getValues(c);
if(null != courseInfoList && courseInfoList.size()>0) {
courseInfo.putChildren(courseInfoList);
if(n < 3){// 节后面还是节所以只有3
n++;
}
for (int i = 0; i < courseInfoList.size(); i++) {
if(null == courseInfoList.get(i).getCourseInfoType()){
courseInfoList.get(i).setCourseInfoType(n);
}
getByParentCourseInfoId(courseInfoList.get(i), courseInfoList.get(i).getTeacherOpenCourseMergeCourseInfoId(),n);
}
}else {
courseInfo.putChildren(new ArrayList<>());
}
}
}

@ -13,6 +13,7 @@ import com.ibeetl.jlw.entity.FileEntity;
import com.ibeetl.jlw.entity.ResourcesApplicationCourse;
import com.ibeetl.jlw.service.CourseInfoService;
import com.ibeetl.jlw.service.CourseLabelService;
import com.ibeetl.jlw.service.MoveDTO;
import com.ibeetl.jlw.service.ResourcesApplicationCourseService;
import com.ibeetl.jlw.web.query.CourseInfoQuery;
import com.ibeetl.jlw.web.query.CourseInfoUniCollegesQuery;
@ -272,4 +273,21 @@ public class CourseInfoController{
return JsonResult.success(courseInfoService.getCourseInfoPageByUniversitiesCollegesId(courseInfoQuery.getPageQuery()));
}
}
/**
*
*
* @param coreUser
* @return
*/
@PostMapping(API + "/move.do")
@ResponseBody
public JsonResult move(MoveDTO moveDTO, @SCoreUser CoreUser coreUser) {
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
courseInfoService.move(moveDTO);
return JsonResult.success();
}
}
}

@ -472,4 +472,10 @@ public class TeacherOpenCourseMergeCourseInfoController{
return JsonResult.success();
}
//树结构
@GetMapping(MODEL + "/getTreeById.json")
public JsonResult getTreeById(Long courseInfoId) {
return JsonResult.success(teacherOpenCourseMergeCourseInfoService.getTreeById(courseInfoId));
}
}

@ -20,5 +20,5 @@ public class CourseInfoUniCollegesQuery extends PageParam {
private Long universitiesCollegesId;
private Long userId;
// private Long userId;
}

Loading…
Cancel
Save