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

修复新增，删除开课学生时，班级关联没有联动的bug，添加部分表新增是来源赋值

Browse Source
beetlsql3-dev
yaodan 2 years ago
parent 5b6d9a1aca
commit 03bf5e81f0
13 changed files with 551 additions and 450 deletions
Show Stats Download Patch File Download Diff File

2
web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java
Unescape Escape View File

@ -45,4 +45,6 @@ public interface TeacherOpenCourseMergeStudentDao extends BaseMapper<TeacherOpen
* @return * @return
*/ */
List<Student> randomStudentList(RandomStudentListDTO dto); List<Student> randomStudentList(RandomStudentListDTO dto);
List<Long> getStudentClassIdList(Long teacherOpenCourseId);
} }

3
web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java
Unescape Escape View File

@ -3,7 +3,6 @@ package com.ibeetl.jlw.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSON;
import com.ibeetl.admin.core.dao.CoreUserDao; import com.ibeetl.admin.core.dao.CoreUserDao;
import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.util.enums.DelFlagEnum; import com.ibeetl.admin.core.util.enums.DelFlagEnum;
@ -135,7 +134,7 @@ public class StatisticalAnalysisService {
long count1 = scoreDashboards.stream().filter(v -> long count1 = scoreDashboards.stream().filter(v ->
"不及格".equals(v.getLastStatus()) || "E".equals(v.getLastStatus())).count(); "不及格".equals(v.getLastStatus()) || "E".equals(v.getLastStatus())).count();
long l = scoreDashboards.size() - count1; long l = scoreDashboards.size() - count1;
data.put("passRate", NumberUtil.formatPercent(NumberUtil.div(l, studentList.size()), 0)); data.put("passRate", studentList.size()==0?0:NumberUtil.formatPercent(NumberUtil.div(l, studentList.size()), 0));
data.put("studentPassNum", l); data.put("studentPassNum", l);
} else { } else {
data.put("passRate", "0%"); data.put("passRate", "0%");

2
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java
Unescape Escape View File

@ -152,6 +152,8 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
String msg = ""; String msg = "";
TeacherOpenCourseHandsOn teacherOpenCourseHandsOn = teacherOpenCourseHandsOnQuery.pojo(); TeacherOpenCourseHandsOn teacherOpenCourseHandsOn = teacherOpenCourseHandsOnQuery.pojo();
teacherOpenCourseHandsOn.setAddTime(new Date()); teacherOpenCourseHandsOn.setAddTime(new Date());
teacherOpenCourseHandsOn.setFromType(CopyFromEnum.FROM_OPEN_COURSE);
teacherOpenCourseHandsOn.setSourceFromId(-1L);
teacherOpenCourseHandsOnDao.insert(teacherOpenCourseHandsOn); teacherOpenCourseHandsOnDao.insert(teacherOpenCourseHandsOn);
teacherOpenCourseHandsOnQuery.setHandsOnId(teacherOpenCourseHandsOn.getHandsOnId()); teacherOpenCourseHandsOnQuery.setHandsOnId(teacherOpenCourseHandsOn.getHandsOnId());
JsonResult jsonResult = new JsonResult(); JsonResult jsonResult = new JsonResult();

13
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java
Unescape Escape View File

@ -20,6 +20,7 @@ import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVO; import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVO;
import com.ibeetl.jlw.entity.vo.HandsOnTaskScoreVO; import com.ibeetl.jlw.entity.vo.HandsOnTaskScoreVO;
import com.ibeetl.jlw.entity.vo.StudentHandsOnScoreVO; import com.ibeetl.jlw.entity.vo.StudentHandsOnScoreVO;
import com.ibeetl.jlw.enums.CopyFromEnum;
import com.ibeetl.jlw.enums.HandsOnTaskEnum; import com.ibeetl.jlw.enums.HandsOnTaskEnum;
import com.ibeetl.jlw.web.query.*; import com.ibeetl.jlw.web.query.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -155,9 +156,13 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
public JsonResult add(TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery) { public JsonResult add(TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery) {
Long userId = teacherOpenCourseHandsOnSimulationTasksQuery.getUserId();
Long orgId = teacherOpenCourseHandsOnSimulationTasksQuery.getOrgId();
String msg = ""; String msg = "";
TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks = teacherOpenCourseHandsOnSimulationTasksQuery.pojo(); TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks = teacherOpenCourseHandsOnSimulationTasksQuery.pojo();
teacherOpenCourseHandsOnSimulationTasks.setAddTime(new Date()); teacherOpenCourseHandsOnSimulationTasks.setAddTime(new Date());
teacherOpenCourseHandsOnSimulationTasks.setFromType(CopyFromEnum.FROM_OPEN_COURSE);
teacherOpenCourseHandsOnSimulationTasks.setSourceFromId(-1L);
String handsOnTaskProblemVo = teacherOpenCourseHandsOnSimulationTasksQuery.getHandsOnTaskProblemVo(); String handsOnTaskProblemVo = teacherOpenCourseHandsOnSimulationTasksQuery.getHandsOnTaskProblemVo();
Long handsOnId = teacherOpenCourseHandsOnSimulationTasks.getHandsOnId(); Long handsOnId = teacherOpenCourseHandsOnSimulationTasks.getHandsOnId();
//分数 //分数
@ -214,6 +219,10 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
// teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setTeacherOpenCourseId(teacherOpenCourseHandsOnSimulationTasks.getTeacherOpenCourseId()); // teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setTeacherOpenCourseId(teacherOpenCourseHandsOnSimulationTasks.getTeacherOpenCourseId());
teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setHandsOnId(handsOnId); teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setHandsOnId(handsOnId);
teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setHandsOnTaskId(teacherOpenCourseHandsOnSimulationTasks.getTaskId()); teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setHandsOnTaskId(teacherOpenCourseHandsOnSimulationTasks.getTaskId());
teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setFromType(CopyFromEnum.FROM_OPEN_COURSE);
teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setSourceFromId(-1L);
teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setOrgId(orgId);
teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setUserId(userId);
tasksAssessments.add(teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.pojo()); tasksAssessments.add(teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.pojo());
} }
if (CollectionUtil.isNotEmpty(tasksAssessments)) { if (CollectionUtil.isNotEmpty(tasksAssessments)) {
@ -229,6 +238,10 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
teacherOpenCourseHandsOnSimulationTasksFile.setTeacherOpenCourseId(teacherOpenCourseHandsOnSimulationTasks.getTeacherOpenCourseId()); teacherOpenCourseHandsOnSimulationTasksFile.setTeacherOpenCourseId(teacherOpenCourseHandsOnSimulationTasks.getTeacherOpenCourseId());
teacherOpenCourseHandsOnSimulationTasksFile.setHandsOnId(handsOnId); teacherOpenCourseHandsOnSimulationTasksFile.setHandsOnId(handsOnId);
teacherOpenCourseHandsOnSimulationTasksFile.setTaskId(teacherOpenCourseHandsOnSimulationTasks.getTaskId()); teacherOpenCourseHandsOnSimulationTasksFile.setTaskId(teacherOpenCourseHandsOnSimulationTasks.getTaskId());
teacherOpenCourseHandsOnSimulationTasksFile.setFromType(CopyFromEnum.FROM_OPEN_COURSE);
teacherOpenCourseHandsOnSimulationTasksFile.setSourceFromId(-1L);
teacherOpenCourseHandsOnSimulationTasksFile.setOrgId(orgId);
teacherOpenCourseHandsOnSimulationTasksFile.setUserId(userId);
tasksFiles.add(teacherOpenCourseHandsOnSimulationTasksFile.pojo()); tasksFiles.add(teacherOpenCourseHandsOnSimulationTasksFile.pojo());
} }
if (CollectionUtil.isNotEmpty(tasksFiles)) { if (CollectionUtil.isNotEmpty(tasksFiles)) {

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

@ -249,6 +249,9 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
BigDecimal bigDecimal = getFuncIncrement(paras, TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoOrder); BigDecimal bigDecimal = getFuncIncrement(paras, TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoOrder);
teacherOpenCourseMergeCourseInfo.setTeacherOpenCourseMergeCourseInfoOrder(bigDecimal); teacherOpenCourseMergeCourseInfo.setTeacherOpenCourseMergeCourseInfoOrder(bigDecimal);
teacherOpenCourseMergeCourseInfo.setFromType(FROM_OPEN_COURSE);
teacherOpenCourseMergeCourseInfo.setSourceFromId(-1L);
teacherOpenCourseMergeCourseInfoDao.insert(teacherOpenCourseMergeCourseInfo); teacherOpenCourseMergeCourseInfoDao.insert(teacherOpenCourseMergeCourseInfo);
// teacherOpenCourseMergeCourseInfoService.invalidateCourseInfoTreeLocalCache(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseId()); // teacherOpenCourseMergeCourseInfoService.invalidateCourseInfoTreeLocalCache(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseId());

3
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
Unescape Escape View File

@ -138,7 +138,8 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
public JsonResult add(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery) { public JsonResult add(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery) {
String msg = ""; String msg = "";
TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoQuery.pojo(); TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoQuery.pojo();
teacherOpenCourseMergeResourcesInfo.setFromType(CopyFromEnum.FROM_OPEN_COURSE);
teacherOpenCourseMergeResourcesInfo.setSourceFromId(-1L);
// 获取新的排序值 // 获取新的排序值
TeacherOpenCourseMergeResourcesInfo paras = new TeacherOpenCourseMergeResourcesInfo(); TeacherOpenCourseMergeResourcesInfo paras = new TeacherOpenCourseMergeResourcesInfo();
paras.setTeacherOpenCourseMergeResourcesInfoId(teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeResourcesInfoId()); paras.setTeacherOpenCourseMergeResourcesInfoId(teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeResourcesInfoId());

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

@ -167,6 +167,7 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
String msg = ""; String msg = "";
TeacherOpenCourseMergeResourcesQuestion teacherOpenCourseMergeResourcesQuestion = teacherOpenCourseMergeResourcesQuestionQuery.pojo(); TeacherOpenCourseMergeResourcesQuestion teacherOpenCourseMergeResourcesQuestion = teacherOpenCourseMergeResourcesQuestionQuery.pojo();
teacherOpenCourseMergeResourcesQuestion.setFromType(CopyFromEnum.FROM_OPEN_COURSE); teacherOpenCourseMergeResourcesQuestion.setFromType(CopyFromEnum.FROM_OPEN_COURSE);
teacherOpenCourseMergeResourcesQuestion.setSourceFromId(-1L);
teacherOpenCourseMergeResourcesQuestionDao.insert(teacherOpenCourseMergeResourcesQuestion); teacherOpenCourseMergeResourcesQuestionDao.insert(teacherOpenCourseMergeResourcesQuestion);
teacherOpenCourseMergeResourcesQuestionQuery.setTeacherOpenCourseMergeResourcesQuestionId(teacherOpenCourseMergeResourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId()); teacherOpenCourseMergeResourcesQuestionQuery.setTeacherOpenCourseMergeResourcesQuestionId(teacherOpenCourseMergeResourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId());
JsonResult jsonResult = new JsonResult(); JsonResult jsonResult = new JsonResult();

58
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java
Unescape Escape View File

@ -32,6 +32,7 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
import static cn.hutool.core.util.ObjectUtil.defaultIfNull; import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
import static com.ibeetl.admin.core.util.StreamUtils.listJoin; import static com.ibeetl.admin.core.util.StreamUtils.listJoin;
@ -90,7 +91,25 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
public void deleteTeacherOpenCourseMergeStudent(String ids) { public void deleteTeacherOpenCourseMergeStudent(String ids) {
try { try {
List<TeacherOpenCourseMergeStudent> teacherOpenCourseMergeStudentList = teacherOpenCourseMergeStudentDao.getByIds(ids);
teacherOpenCourseMergeStudentDao.deleteTeacherOpenCourseMergeStudentByIds(ids); teacherOpenCourseMergeStudentDao.deleteTeacherOpenCourseMergeStudentByIds(ids);
//删除以后要判断这个开课是否还有这个班级的学生，没有就把班级关联也给删了
List<Long> teacherOpenCourseIdList = teacherOpenCourseMergeStudentList.stream().map(TeacherOpenCourseMergeStudent::getTeacherOpenCourseId).distinct().collect(Collectors.toList());
for (Long teacherOpenCourseId : teacherOpenCourseIdList) {
List<Long> classIdList = teacherOpenCourseMergeStudentDao.getStudentClassIdList(teacherOpenCourseId);
List<TeacherOpenCourseMergeSchoolClass> teacherOpenCourseMergeSchoolClassList = teacherOpenCourseMergeSchoolClassDao.createLambdaQuery()
.andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseId, teacherOpenCourseId)
.andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseMergeSchoolClassStatus, 1).select();
List<TeacherOpenCourseMergeSchoolClass> noExistClassList = teacherOpenCourseMergeSchoolClassList.stream().filter(e -> !classIdList.contains(e.getSchoolClassId())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(noExistClassList)) {
String teacherOpenCourseMergeSchoolClassIds = noExistClassList.stream().filter(e -> e != null && e.getTeacherOpenCourseMergeSchoolClassId() != null).map(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseMergeSchoolClassId).map(String::valueOf).collect(Collectors.joining(","));
teacherOpenCourseMergeSchoolClassDao.deleteTeacherOpenCourseMergeSchoolClassByIds(teacherOpenCourseMergeSchoolClassIds);
}
}
} catch (Exception e) { } catch (Exception e) {
throw new PlatformException("批量删除开课关联学生失败", e); throw new PlatformException("批量删除开课关联学生失败", e);
} }
@ -129,9 +148,46 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
OpenCourseMergeJoinTypeEnum joinType = teacherOpenCourseMergeStudent.getTeacherOpenCourseSchoolClassMergeStudentJoinType(); OpenCourseMergeJoinTypeEnum joinType = teacherOpenCourseMergeStudent.getTeacherOpenCourseSchoolClassMergeStudentJoinType();
teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentJoinType(defaultIfNull(joinType, student_join)); teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentJoinType(defaultIfNull(joinType, student_join));
teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentStatus(1); teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentStatus(1);
teacherOpenCourseMergeStudent.setUserId(teacherOpenCourseMergeStudentQuery.getUserId());
} }
insertBatch(teacherOpenCourseMergeStudentList); insertBatch(teacherOpenCourseMergeStudentList);
//看下有没有班级关联，没有就加上
List<Long> teacherOpenCourseIdList = teacherOpenCourseMergeStudentList.stream().map(TeacherOpenCourseMergeStudent::getTeacherOpenCourseId).distinct().collect(Collectors.toList());
for (Long teacherOpenCourseId : teacherOpenCourseIdList) {
//获取这个开课的现有的学生的所有班级
List<Long> allStudentClassIdList = teacherOpenCourseMergeStudentDao.getStudentClassIdList(teacherOpenCourseId);
//获取这个开课的所有班级关联
List<TeacherOpenCourseMergeSchoolClass> select = teacherOpenCourseMergeSchoolClassDao.createLambdaQuery()
.andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseId, teacherOpenCourseId)
.andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseMergeSchoolClassStatus, 1)
.select();
List<Long> existClassIdList = select.stream().map(TeacherOpenCourseMergeSchoolClass::getSchoolClassId).distinct().collect(Collectors.toList());
List<Long> notExistClassList = allStudentClassIdList.stream().filter(e -> !existClassIdList.contains(e)).collect(Collectors.toList());
for (Long classId : notExistClassList) {
TeacherOpenCourseMergeSchoolClass teacherOpenCourseMergeSchoolClass = new TeacherOpenCourseMergeSchoolClass();
teacherOpenCourseMergeSchoolClass.setTeacherOpenCourseId(teacherOpenCourseId);
teacherOpenCourseMergeSchoolClass.setSchoolClassId(classId);
teacherOpenCourseMergeSchoolClass.setTeacherOpenCourseMergeSchoolClassAddTime(new Date());
teacherOpenCourseMergeSchoolClass.setTeacherOpenCourseMergeSchoolClassStatus(1);
teacherOpenCourseMergeSchoolClass.setUserId(teacherOpenCourseMergeStudentQuery.getUserId());
teacherOpenCourseMergeSchoolClass.setOrgId(teacherOpenCourseMergeStudentQuery.getOrgId());
teacherOpenCourseMergeSchoolClassDao.insert(teacherOpenCourseMergeSchoolClass);
} }
}
}
return msg; return msg;
} }
@ -254,7 +310,7 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
if (teacher == null) { if (teacher == null) {
throw new PlatformException("教师不存在"); throw new PlatformException("教师不存在");
} }
if (!Objects.equals(teacher.getOrgId(),student.getOrgId())) { if (!Objects.equals(teacher.getOrgId(), student.getOrgId())) {
return JsonResult.failMessage("该开课课程不属于本学校"); return JsonResult.failMessage("该开课课程不属于本学校");
} }
// 如果为空，则表示班级没有关联，给他关联上 // 如果为空，则表示班级没有关联，给他关联上

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

@ -206,7 +206,6 @@ public class TeacherOpenCourseHandsOnSimulationTasksController{
* *
* *
* @param teacherOpenCourseHandsOnSimulationTasksQuery * @param teacherOpenCourseHandsOnSimulationTasksQuery
* @param teacherOpenCourseHandsOnSimulationTasksFile 附件
* @param result * @param result
* @param coreUser * @param coreUser
* @return * @return

126
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java
Unescape Escape View File

@ -51,24 +51,26 @@ import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
@RestController @RestController
@Validated @Validated
public class TeacherOpenCourseMergeCourseInfoController{ public class TeacherOpenCourseMergeCourseInfoController {
private final Log log = LogFactory.getLog(this.getClass()); private final Log log = LogFactory.getLog(this.getClass());
private static final String MODEL = "/jlw/teacherOpenCourseMergeCourseInfo"; private static final String MODEL = "/jlw/teacherOpenCourseMergeCourseInfo";
private static final String API = "/api/teacherOpenCourseMergeCourseInfo"; private static final String API = "/api/teacherOpenCourseMergeCourseInfo";
@Autowired private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService; @Autowired
private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService;
@Autowired FileService fileService; @Autowired
FileService fileService;
/* 前端接口 */ /* 前端接口 */
@PostMapping(API + "/getPageList.do") @PostMapping(API + "/getPageList.do")
public JsonResult<PageQuery> getPageList(TeacherOpenCourseMergeCourseInfoQuery condition,@SCoreUser CoreUser coreUser){ public JsonResult<PageQuery> getPageList(TeacherOpenCourseMergeCourseInfoQuery condition, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return JsonResult.failMessage("请登录后再操作"); return JsonResult.failMessage("请登录后再操作");
}else{ } else {
PageQuery page = condition.getPageQuery(); PageQuery page = condition.getPageQuery();
condition.setInnerJoin(defaultIfNull(condition.getInnerJoin(), true)); condition.setInnerJoin(defaultIfNull(condition.getInnerJoin(), true));
condition.setCourseInfoStatus(defaultIfNull(condition.getCourseInfoStatus(), 1)); condition.setCourseInfoStatus(defaultIfNull(condition.getCourseInfoStatus(), 1));
@ -80,10 +82,10 @@ public class TeacherOpenCourseMergeCourseInfoController{
@GetMapping(API + "/getInfo.do") @GetMapping(API + "/getInfo.do")
public JsonResult<TeacherOpenCourseMergeCourseInfo>getInfo(TeacherOpenCourseMergeCourseInfoQuery param,@SCoreUser CoreUser coreUser) { public JsonResult<TeacherOpenCourseMergeCourseInfo> getInfo(TeacherOpenCourseMergeCourseInfoQuery param, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return JsonResult.failMessage("请登录后再操作"); return JsonResult.failMessage("请登录后再操作");
}else{ } else {
param.setInnerJoin(defaultIfNull(param.getInnerJoin(), true)); param.setInnerJoin(defaultIfNull(param.getInnerJoin(), true));
TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = teacherOpenCourseMergeCourseInfoService.getInfo(param); TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = teacherOpenCourseMergeCourseInfoService.getInfo(param);
return JsonResult.success(teacherOpenCourseMergeCourseInfo); return JsonResult.success(teacherOpenCourseMergeCourseInfo);
@ -92,14 +94,14 @@ public class TeacherOpenCourseMergeCourseInfoController{
@GetMapping(API + "/getList.do") @GetMapping(API + "/getList.do")
public JsonResult<List<TeacherOpenCourseMergeCourseInfo>>getList(TeacherOpenCourseMergeCourseInfoQuery param,@SCoreUser CoreUser coreUser) { public JsonResult<List<TeacherOpenCourseMergeCourseInfo>> getList(TeacherOpenCourseMergeCourseInfoQuery param, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return JsonResult.failMessage("请登录后再操作"); return JsonResult.failMessage("请登录后再操作");
}else{ } else {
param.setInnerJoin(defaultIfNull(param.getInnerJoin(), true)); param.setInnerJoin(defaultIfNull(param.getInnerJoin(), true));
param.setCourseInfoStatus(defaultIfNull(param.getCourseInfoStatus(), 1)); param.setCourseInfoStatus(defaultIfNull(param.getCourseInfoStatus(), 1));
param.setCourseInfoType(defaultIfNull(param.getCourseInfoType(), 1)); param.setCourseInfoType(defaultIfNull(param.getCourseInfoType(), 1));
List<TeacherOpenCourseMergeCourseInfo>list = teacherOpenCourseMergeCourseInfoService.getValuesByQuery(param); List<TeacherOpenCourseMergeCourseInfo> list = teacherOpenCourseMergeCourseInfoService.getValuesByQuery(param);
return JsonResult.success(list); return JsonResult.success(list);
} }
} }
@ -110,7 +112,7 @@ public class TeacherOpenCourseMergeCourseInfoController{
@GetMapping(MODEL + "/index.do") @GetMapping(MODEL + "/index.do")
@Function("teacherOpenCourseMergeCourseInfo.query") @Function("teacherOpenCourseMergeCourseInfo.query")
public ModelAndView index() { public ModelAndView index() {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeCourseInfo/index.html") ; ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeCourseInfo/index.html");
view.addObject("search", TeacherOpenCourseMergeCourseInfoQuery.class.getName()); view.addObject("search", TeacherOpenCourseMergeCourseInfoQuery.class.getName());
return view; return view;
} }
@ -118,7 +120,7 @@ public class TeacherOpenCourseMergeCourseInfoController{
@GetMapping(MODEL + "/wdcd.do") @GetMapping(MODEL + "/wdcd.do")
@Function("teacherOpenCourseMergeCourseInfo.wfcdindex") @Function("teacherOpenCourseMergeCourseInfo.wfcdindex")
public ModelAndView wdcd() { public ModelAndView wdcd() {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeCourseInfo/wdcd.html") ; ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeCourseInfo/wdcd.html");
return view; return view;
} }
@ -135,10 +137,10 @@ public class TeacherOpenCourseMergeCourseInfoController{
@Function("teacherOpenCourseMergeCourseInfo.add") @Function("teacherOpenCourseMergeCourseInfo.add")
public ModelAndView add(Long teacherOpenCourseMergeCourseInfoId) { public ModelAndView add(Long teacherOpenCourseMergeCourseInfoId) {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeCourseInfo/add.html"); ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeCourseInfo/add.html");
if(null != teacherOpenCourseMergeCourseInfoId){ if (null != teacherOpenCourseMergeCourseInfoId) {
TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = teacherOpenCourseMergeCourseInfoService.queryById(teacherOpenCourseMergeCourseInfoId); TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = teacherOpenCourseMergeCourseInfoService.queryById(teacherOpenCourseMergeCourseInfoId);
view.addObject("teacherOpenCourseMergeCourseInfo", teacherOpenCourseMergeCourseInfo); view.addObject("teacherOpenCourseMergeCourseInfo", teacherOpenCourseMergeCourseInfo);
}else { } else {
view.addObject("teacherOpenCourseMergeCourseInfo", new TeacherOpenCourseMergeCourseInfo()); view.addObject("teacherOpenCourseMergeCourseInfo", new TeacherOpenCourseMergeCourseInfo());
} }
return view; return view;
@ -148,7 +150,7 @@ public class TeacherOpenCourseMergeCourseInfoController{
@PostMapping(MODEL + "/list.json") @PostMapping(MODEL + "/list.json")
@Function("teacherOpenCourseMergeCourseInfo.query") @Function("teacherOpenCourseMergeCourseInfo.query")
public JsonResult<PageQuery> list(TeacherOpenCourseMergeCourseInfoQuery condition){ public JsonResult<PageQuery> list(TeacherOpenCourseMergeCourseInfoQuery condition) {
PageQuery page = condition.getPageQuery(); PageQuery page = condition.getPageQuery();
condition.setInnerJoin(defaultIfNull(condition.getInnerJoin(), true)); condition.setInnerJoin(defaultIfNull(condition.getInnerJoin(), true));
condition.setCourseInfoStatus(defaultIfNull(condition.getCourseInfoStatus(), 1)); condition.setCourseInfoStatus(defaultIfNull(condition.getCourseInfoStatus(), 1));
@ -159,28 +161,27 @@ public class TeacherOpenCourseMergeCourseInfoController{
@PostMapping(MODEL + "/addAll.json") @PostMapping(MODEL + "/addAll.json")
@Function("teacherOpenCourseMergeCourseInfo.add") @Function("teacherOpenCourseMergeCourseInfo.add")
public JsonResult addAll(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery,@SCoreUser CoreUser coreUser){ public JsonResult addAll(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return JsonResult.failMessage("请登录后再操作"); return JsonResult.failMessage("请登录后再操作");
}else{ } else {
teacherOpenCourseMergeCourseInfoQuery.setUserId(coreUser.getId()); teacherOpenCourseMergeCourseInfoQuery.setUserId(coreUser.getId());
teacherOpenCourseMergeCourseInfoQuery.setOrgId(coreUser.getOrgId()); teacherOpenCourseMergeCourseInfoQuery.setOrgId(coreUser.getOrgId());
String msg = teacherOpenCourseMergeCourseInfoService.addAll(teacherOpenCourseMergeCourseInfoQuery); String msg = teacherOpenCourseMergeCourseInfoService.addAll(teacherOpenCourseMergeCourseInfoQuery);
if (StringUtils.isBlank(msg)) { if (StringUtils.isBlank(msg)) {
return JsonResult.success(); return JsonResult.success();
} else { } else {
return JsonResult.failMessage("新增失败,"+msg); return JsonResult.failMessage("新增失败," + msg);
} }
} }
} }
@PostMapping(MODEL + "/add.json") @PostMapping(MODEL + "/add.json")
@Function("teacherOpenCourseMergeCourseInfo.add") @Function("teacherOpenCourseMergeCourseInfo.add")
public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery, BindingResult result,@SCoreUser CoreUser coreUser){ public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery, BindingResult result, @SCoreUser CoreUser coreUser) {
if(result.hasErrors()){ if (result.hasErrors()) {
return JsonResult.failMessage(result); return JsonResult.failMessage(result);
}else{ } else {
teacherOpenCourseMergeCourseInfoQuery.setUserId(coreUser.getId()); teacherOpenCourseMergeCourseInfoQuery.setUserId(coreUser.getId());
teacherOpenCourseMergeCourseInfoQuery.setOrgId(coreUser.getOrgId()); teacherOpenCourseMergeCourseInfoQuery.setOrgId(coreUser.getOrgId());
return teacherOpenCourseMergeCourseInfoService.addCourseAndQuestionWithQuestionSnap(teacherOpenCourseMergeCourseInfoQuery, null, new HashMap<>()); return teacherOpenCourseMergeCourseInfoService.addCourseAndQuestionWithQuestionSnap(teacherOpenCourseMergeCourseInfoQuery, null, new HashMap<>());
@ -190,9 +191,9 @@ public class TeacherOpenCourseMergeCourseInfoController{
@PostMapping(MODEL + "/edit.json") @PostMapping(MODEL + "/edit.json")
@Function("teacherOpenCourseMergeCourseInfo.edit") @Function("teacherOpenCourseMergeCourseInfo.edit")
public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery, BindingResult result) { public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery, BindingResult result) {
if(result.hasErrors()){ if (result.hasErrors()) {
return JsonResult.failMessage(result); return JsonResult.failMessage(result);
}else { } else {
Assert.notNull(getUser(), "请登录后再操作"); Assert.notNull(getUser(), "请登录后再操作");
teacherOpenCourseMergeCourseInfoQuery.setUserId(null); teacherOpenCourseMergeCourseInfoQuery.setUserId(null);
teacherOpenCourseMergeCourseInfoQuery.setOrgId(null); teacherOpenCourseMergeCourseInfoQuery.setOrgId(null);
@ -200,7 +201,7 @@ public class TeacherOpenCourseMergeCourseInfoController{
if (StringUtils.isBlank(msg)) { if (StringUtils.isBlank(msg)) {
return JsonResult.success(); return JsonResult.success();
} else { } else {
return JsonResult.failMessage("更新失败,"+msg); return JsonResult.failMessage("更新失败," + msg);
} }
} }
} }
@ -208,16 +209,16 @@ public class TeacherOpenCourseMergeCourseInfoController{
@GetMapping(MODEL + "/view.json") @GetMapping(MODEL + "/view.json")
@Function("teacherOpenCourseMergeCourseInfo.query") @Function("teacherOpenCourseMergeCourseInfo.query")
public JsonResult<TeacherOpenCourseMergeCourseInfo>queryInfo(Long teacherOpenCourseMergeCourseInfoId) { public JsonResult<TeacherOpenCourseMergeCourseInfo> queryInfo(Long teacherOpenCourseMergeCourseInfoId) {
TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = teacherOpenCourseMergeCourseInfoService.queryById( teacherOpenCourseMergeCourseInfoId); TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = teacherOpenCourseMergeCourseInfoService.queryById(teacherOpenCourseMergeCourseInfoId);
return JsonResult.success(teacherOpenCourseMergeCourseInfo); return JsonResult.success(teacherOpenCourseMergeCourseInfo);
} }
@GetMapping(MODEL + "/getValues.json") @GetMapping(MODEL + "/getValues.json")
@Function("teacherOpenCourseMergeCourseInfo.query") @Function("teacherOpenCourseMergeCourseInfo.query")
public JsonResult<List<TeacherOpenCourseMergeCourseInfo>>getValues(TeacherOpenCourseMergeCourseInfoQuery param) { public JsonResult<List<TeacherOpenCourseMergeCourseInfo>> getValues(TeacherOpenCourseMergeCourseInfoQuery param) {
param.setInnerJoin(defaultIfNull(param.getInnerJoin(), true)); param.setInnerJoin(defaultIfNull(param.getInnerJoin(), true));
List<TeacherOpenCourseMergeCourseInfo>list = teacherOpenCourseMergeCourseInfoService.getValuesByQuery(param); List<TeacherOpenCourseMergeCourseInfo> list = teacherOpenCourseMergeCourseInfoService.getValuesByQuery(param);
return JsonResult.success(list); return JsonResult.success(list);
} }
@ -233,23 +234,23 @@ public class TeacherOpenCourseMergeCourseInfoController{
//下载模板信息 //下载模板信息
@GetMapping(MODEL + "/downloadTemplate.json") @GetMapping(MODEL + "/downloadTemplate.json")
public void download(HttpServletRequest request,HttpServletResponse response,@SCoreUser CoreUser coreUser) { public void download(HttpServletRequest request, HttpServletResponse response, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return; return;
} }
XSSFWorkbook workbook = null; XSSFWorkbook workbook = null;
InputStream is = null; InputStream is = null;
try { try {
//TODO 改导入模板名字 //TODO 改导入模板名字
is = new FileInputStream(GetFile.p + File.separator +"filesystem"+ File.separator +"template"+ File.separator+ "导入模板.xlsx"); is = new FileInputStream(GetFile.p + File.separator + "filesystem" + File.separator + "template" + File.separator + "导入模板.xlsx");
workbook = new XSSFWorkbook(is); workbook = new XSSFWorkbook(is);
try { try {
if(null != is){ if (null != is) {
is.close(); is.close();
} }
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -258,16 +259,16 @@ public class TeacherOpenCourseMergeCourseInfoController{
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
//这后面可以设置导出Excel的名称，此例中名为template.xls //这后面可以设置导出Excel的名称，此例中名为template.xls
String fileName = ToolUtils.web2fileName(request,"teacherOpenCourseMergeCourseInfoTemplate(" + TimeTool.getNowTime("YMD") + ").xlsx"); String fileName = ToolUtils.web2fileName(request, "teacherOpenCourseMergeCourseInfoTemplate(" + TimeTool.getNowTime("YMD") + ").xlsx");
response.setHeader("Content-disposition", "attachment;filename="+fileName); response.setHeader("Content-disposition", "attachment;filename=" + fileName);
//刷新缓冲 //刷新缓冲
response.flushBuffer(); response.flushBuffer();
//workbook将Excel写入到response的输出流中，供页面下载 //workbook将Excel写入到response的输出流中，供页面下载
workbook.write(response.getOutputStream()); workbook.write(response.getOutputStream());
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
try { try {
@ -277,20 +278,21 @@ public class TeacherOpenCourseMergeCourseInfoController{
if (null != response && null != response.getOutputStream()) { if (null != response && null != response.getOutputStream()) {
response.getOutputStream().close(); response.getOutputStream().close();
} }
} catch (Exception e) { } } catch (Exception e) {
}
} }
} }
//导入模板信息 //导入模板信息
@PostMapping(MODEL + "/importTemplate.json") @PostMapping(MODEL + "/importTemplate.json")
@Function("teacherOpenCourseMergeCourseInfo.importTemplate") @Function("teacherOpenCourseMergeCourseInfo.importTemplate")
public JsonResult importTemplate(@RFile List<FileEntity> fileEntityList,@SCoreUser CoreUser coreUser) { public JsonResult importTemplate(@RFile List<FileEntity> fileEntityList, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return JsonResult.failMessage("请登录后再操作"); return JsonResult.failMessage("请登录后再操作");
} }
List<Long>list=new ArrayList<>(); List<Long> list = new ArrayList<>();
JsonResult jsonResult = teacherOpenCourseMergeCourseInfoService.importTemplate(fileEntityList,list,coreUser); JsonResult jsonResult = teacherOpenCourseMergeCourseInfoService.importTemplate(fileEntityList, list, coreUser);
if(list.size()>0){ if (list.size() > 0) {
teacherOpenCourseMergeCourseInfoService.deleteByList(list); teacherOpenCourseMergeCourseInfoService.deleteByList(list);
} }
return jsonResult; return jsonResult;
@ -299,8 +301,8 @@ public class TeacherOpenCourseMergeCourseInfoController{
//导出信息 //导出信息
@GetMapping(MODEL + "/excel/export.json") @GetMapping(MODEL + "/excel/export.json")
@Function("teacherOpenCourseMergeCourseInfo.exportDocument") @Function("teacherOpenCourseMergeCourseInfo.exportDocument")
public void export(HttpServletRequest request,HttpServletResponse response,TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery,@SCoreUser CoreUser coreUser) { public void export(HttpServletRequest request, HttpServletResponse response, TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return; return;
} }
HSSFWorkbook workbook = null; HSSFWorkbook workbook = null;
@ -385,7 +387,7 @@ public class TeacherOpenCourseMergeCourseInfoController{
//设置表格特定的列宽度 //设置表格特定的列宽度
if (null != widthMap.get(headerCode[i])) { if (null != widthMap.get(headerCode[i])) {
String width = widthMap.get(headerCode[i]).toString().split("\\.")[0]; String width = widthMap.get(headerCode[i]).toString().split("\\.")[0];
Integer w = Integer.parseInt(width) > header[i].length()*3?Integer.parseInt(width):header[i].length()*3; Integer w = Integer.parseInt(width) > header[i].length() * 3 ? Integer.parseInt(width) : header[i].length() * 3;
sheet.setColumnWidth(i, w * 190); sheet.setColumnWidth(i, w * 190);
} }
@ -406,7 +408,7 @@ public class TeacherOpenCourseMergeCourseInfoController{
for (int i = 0; i < mapList.size(); i++) { for (int i = 0; i < mapList.size(); i++) {
HSSFRow row = sheet.createRow(i + 1); HSSFRow row = sheet.createRow(i + 1);
row.setHeight((short) (50*10)); row.setHeight((short) (50 * 10));
Map<String, Object> map = mapList.get(i); Map<String, Object> map = mapList.get(i);
for (int j = 0; j < headerCode.length; j++) { for (int j = 0; j < headerCode.length; j++) {
@ -423,16 +425,16 @@ public class TeacherOpenCourseMergeCourseInfoController{
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
//这后面可以设置导出Excel的名称，此例中名为student.xls //这后面可以设置导出Excel的名称，此例中名为student.xls
String fileName = ToolUtils.web2fileName(request,"teacherOpenCourseMergeCourseInfo(" + TimeTool.getNowTime("YMD") + ").xls"); String fileName = ToolUtils.web2fileName(request, "teacherOpenCourseMergeCourseInfo(" + TimeTool.getNowTime("YMD") + ").xls");
response.setHeader("Content-disposition", "attachment;filename="+fileName); response.setHeader("Content-disposition", "attachment;filename=" + fileName);
//刷新缓冲 //刷新缓冲
response.flushBuffer(); response.flushBuffer();
//workbook将Excel写入到response的输出流中，供页面下载 //workbook将Excel写入到response的输出流中，供页面下载
workbook.write(response.getOutputStream()); workbook.write(response.getOutputStream());
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
try { try {
@ -442,14 +444,16 @@ public class TeacherOpenCourseMergeCourseInfoController{
if (null != response && null != response.getOutputStream()) { if (null != response && null != response.getOutputStream()) {
response.getOutputStream().close(); response.getOutputStream().close();
} }
} catch (Exception e) { } } catch (Exception e) {
}
} }
} }
/** /**
* 教师端-导入课程章节操作，逻辑拆分 * 教师端-导入课程章节操作，逻辑拆分
* * <p>
* 从系统章节库拉取章节到教师开课的课程章节中。 * 从系统章节库拉取章节到教师开课的课程章节中。
*
* @param courseInfoIds 超管端的章节ID * @param courseInfoIds 超管端的章节ID
* @param teacherOpenCourseId 开课ID * @param teacherOpenCourseId 开课ID
* @return * @return
@ -470,11 +474,11 @@ public class TeacherOpenCourseMergeCourseInfoController{
* @return * @return
*/ */
@PostMapping(API + "/importCourseInfo.do") @PostMapping(API + "/importCourseInfo.do")
public JsonResult importCourseInfo(Long[] courseInfoIds,Integer courseType, Long teacherOpenCourseId) { public JsonResult importCourseInfo(Long[] courseInfoIds, Integer courseType, Long teacherOpenCourseId) {
//这里是授权课绑定到开课 //这里是授权课绑定到开课
if (Objects.equals(courseType,1)){ if (Objects.equals(courseType, 1)) {
teacherOpenCourseMergeCourseInfoService.importCourseInfo(CollectionUtil.newHashSet(courseInfoIds), teacherOpenCourseId); teacherOpenCourseMergeCourseInfoService.importCourseInfo(CollectionUtil.newHashSet(courseInfoIds), teacherOpenCourseId);
} else if (Objects.equals(courseType,0)) { } else if (Objects.equals(courseType, 0)) {
// 这里是开课绑定到开课 // 这里是开课绑定到开课
teacherOpenCourseMergeCourseInfoService.importOpenCourseInfo(CollectionUtil.newHashSet(courseInfoIds), teacherOpenCourseId); teacherOpenCourseMergeCourseInfoService.importOpenCourseInfo(CollectionUtil.newHashSet(courseInfoIds), teacherOpenCourseId);
} }
@ -595,10 +599,10 @@ public class TeacherOpenCourseMergeCourseInfoController{
* 只传左元素，表示：拖动元素 在 左元素的左侧； * 只传左元素，表示：拖动元素 在 左元素的左侧；
* 只传右元素，表示：拖动元素 在 右元素的右侧； * 只传右元素，表示：拖动元素 在 右元素的右侧；
* 左右元素都传，则拖动元素放置在两个元素的中间。 * 左右元素都传，则拖动元素放置在两个元素的中间。
* * <p>
* 左侧（上） ==> 右侧（下） * 左侧（上） ==> 右侧（下）
* 小数值 ==> 大数值 * 小数值 ==> 大数值
* * <p>
* 数值越小，越靠前 * 数值越小，越靠前
* *
* @param id 拖动元素的ID * @param id 拖动元素的ID

141
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesInfoController.java
Unescape Escape View File

@ -58,24 +58,26 @@ import static com.ibeetl.jlw.enums.GlobalUpStatusEnum.UP;
@RestController @RestController
@Validated @Validated
public class TeacherOpenCourseMergeResourcesInfoController{ public class TeacherOpenCourseMergeResourcesInfoController {
private final Log log = LogFactory.getLog(this.getClass()); private final Log log = LogFactory.getLog(this.getClass());
private static final String MODEL = "/jlw/teacherOpenCourseMergeResourcesInfo"; private static final String MODEL = "/jlw/teacherOpenCourseMergeResourcesInfo";
private static final String API = "/api/teacherOpenCourseMergeResourcesInfo"; private static final String API = "/api/teacherOpenCourseMergeResourcesInfo";
@Autowired private TeacherOpenCourseMergeResourcesInfoService teacherOpenCourseMergeResourcesInfoService; @Autowired
private TeacherOpenCourseMergeResourcesInfoService teacherOpenCourseMergeResourcesInfoService;
@Autowired FileService fileService; @Autowired
FileService fileService;
/* 前端接口 */ /* 前端接口 */
@PostMapping(API + "/getPageList.do") @PostMapping(API + "/getPageList.do")
public JsonResult<PageQuery> getPageList(TeacherOpenCourseMergeResourcesInfoQuery condition,@SCoreUser CoreUser coreUser){ public JsonResult<PageQuery> getPageList(TeacherOpenCourseMergeResourcesInfoQuery condition, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return JsonResult.failMessage("请登录后再操作"); return JsonResult.failMessage("请登录后再操作");
}else{ } else {
PageQuery page = condition.getPageQuery(); PageQuery page = condition.getPageQuery();
PageQuery<TeacherOpenCourseMergeResourcesInfo> pageQuery = teacherOpenCourseMergeResourcesInfoService.queryByConditionQuery(page); PageQuery<TeacherOpenCourseMergeResourcesInfo> pageQuery = teacherOpenCourseMergeResourcesInfoService.queryByConditionQuery(page);
@ -92,10 +94,10 @@ public class TeacherOpenCourseMergeResourcesInfoController{
@GetMapping(API + "/getInfo.do") @GetMapping(API + "/getInfo.do")
public JsonResult<TeacherOpenCourseMergeResourcesInfo>getInfo(TeacherOpenCourseMergeResourcesInfoQuery param,@SCoreUser CoreUser coreUser) { public JsonResult<TeacherOpenCourseMergeResourcesInfo> getInfo(TeacherOpenCourseMergeResourcesInfoQuery param, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return JsonResult.failMessage("请登录后再操作"); return JsonResult.failMessage("请登录后再操作");
}else{ } else {
TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoService.getInfo(param); TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoService.getInfo(param);
return JsonResult.success(teacherOpenCourseMergeResourcesInfo); return JsonResult.success(teacherOpenCourseMergeResourcesInfo);
} }
@ -103,20 +105,20 @@ public class TeacherOpenCourseMergeResourcesInfoController{
@GetMapping(API + "/getList.do") @GetMapping(API + "/getList.do")
public JsonResult<List<TeacherOpenCourseMergeResourcesInfo>>getList(TeacherOpenCourseMergeResourcesInfoQuery param,@SCoreUser CoreUser coreUser) { public JsonResult<List<TeacherOpenCourseMergeResourcesInfo>> getList(TeacherOpenCourseMergeResourcesInfoQuery param, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return JsonResult.failMessage("请登录后再操作"); return JsonResult.failMessage("请登录后再操作");
}else{ } else {
List<TeacherOpenCourseMergeResourcesInfo>list = teacherOpenCourseMergeResourcesInfoService.getValuesByQuery(param); List<TeacherOpenCourseMergeResourcesInfo> list = teacherOpenCourseMergeResourcesInfoService.getValuesByQuery(param);
return JsonResult.success(list); return JsonResult.success(list);
} }
} }
@PostMapping(API + "/add.do") @PostMapping(API + "/add.do")
public JsonResult addDo(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, BindingResult result,@SCoreUser CoreUser coreUser){ public JsonResult addDo(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, BindingResult result, @SCoreUser CoreUser coreUser) {
if(result.hasErrors()){ if (result.hasErrors()) {
return JsonResult.failMessage(result); return JsonResult.failMessage(result);
}else{ } else {
teacherOpenCourseMergeResourcesInfoQuery.setUserId(coreUser.getId()); teacherOpenCourseMergeResourcesInfoQuery.setUserId(coreUser.getId());
teacherOpenCourseMergeResourcesInfoQuery.setOrgId(coreUser.getOrgId()); teacherOpenCourseMergeResourcesInfoQuery.setOrgId(coreUser.getOrgId());
return teacherOpenCourseMergeResourcesInfoService.add(teacherOpenCourseMergeResourcesInfoQuery); return teacherOpenCourseMergeResourcesInfoService.add(teacherOpenCourseMergeResourcesInfoQuery);
@ -125,9 +127,9 @@ public class TeacherOpenCourseMergeResourcesInfoController{
@PostMapping(API + "/edit.do") @PostMapping(API + "/edit.do")
public JsonResult<String> updateDo(@Validated(ValidateConfig.UPDATE.class) TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, BindingResult result, @SCoreUser CoreUser coreUser) { public JsonResult<String> updateDo(@Validated(ValidateConfig.UPDATE.class) TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, BindingResult result, @SCoreUser CoreUser coreUser) {
if(result.hasErrors()){ if (result.hasErrors()) {
return JsonResult.failMessage(result); return JsonResult.failMessage(result);
}else { } else {
teacherOpenCourseMergeResourcesInfoService.validateIsTeacher(teacherOpenCourseMergeResourcesInfoQuery.getTeacherOpenCourseMergeResourcesInfoId().toString(), coreUser); teacherOpenCourseMergeResourcesInfoService.validateIsTeacher(teacherOpenCourseMergeResourcesInfoQuery.getTeacherOpenCourseMergeResourcesInfoId().toString(), coreUser);
teacherOpenCourseMergeResourcesInfoQuery.setUserId(null); teacherOpenCourseMergeResourcesInfoQuery.setUserId(null);
teacherOpenCourseMergeResourcesInfoQuery.setOrgId(null); teacherOpenCourseMergeResourcesInfoQuery.setOrgId(null);
@ -135,7 +137,7 @@ public class TeacherOpenCourseMergeResourcesInfoController{
if (StringUtils.isBlank(msg)) { if (StringUtils.isBlank(msg)) {
return JsonResult.success(); return JsonResult.success();
} else { } else {
return JsonResult.failMessage("更新失败,"+msg); return JsonResult.failMessage("更新失败," + msg);
} }
} }
} }
@ -151,6 +153,7 @@ public class TeacherOpenCourseMergeResourcesInfoController{
/** /**
* 更改资源状态，上架下架啥删除. * 更改资源状态，上架下架啥删除.
* 删除也可以单独调用 {@link #deleteDo} * 删除也可以单独调用 {@link #deleteDo}
*
* @param ids * @param ids
* @param status * @param status
* @param coreUser * @param coreUser
@ -181,10 +184,10 @@ public class TeacherOpenCourseMergeResourcesInfoController{
* @Date: 2022/12/12 0:41 * @Date: 2022/12/12 0:41
*/ */
@PostMapping(API + "/batchAdd.do") @PostMapping(API + "/batchAdd.do")
public JsonResult batchAdd(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, @SCoreUser CoreUser coreUser){ public JsonResult batchAdd(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return JsonResult.failMessage("请登录后再操作"); return JsonResult.failMessage("请登录后再操作");
}else{ } else {
List<TeacherOpenCourseMergeResourcesInfoQuery> updateList = new ArrayList(); List<TeacherOpenCourseMergeResourcesInfoQuery> updateList = new ArrayList();
teacherOpenCourseMergeResourcesInfoQuery.setUserId(coreUser.getId()); teacherOpenCourseMergeResourcesInfoQuery.setUserId(coreUser.getId());
teacherOpenCourseMergeResourcesInfoQuery.setOrgId(coreUser.getOrgId()); teacherOpenCourseMergeResourcesInfoQuery.setOrgId(coreUser.getOrgId());
@ -192,7 +195,7 @@ public class TeacherOpenCourseMergeResourcesInfoController{
String resourcesInfoFiles = teacherOpenCourseMergeResourcesInfoQuery.getResourcesInfoFiles(); String resourcesInfoFiles = teacherOpenCourseMergeResourcesInfoQuery.getResourcesInfoFiles();
if (StrUtil.isNotBlank(resourcesInfoFiles)) { if (StrUtil.isNotBlank(resourcesInfoFiles)) {
String resourcesInfoNames = teacherOpenCourseMergeResourcesInfoQuery.getResourcesInfoName(); String resourcesInfoNames = teacherOpenCourseMergeResourcesInfoQuery.getResourcesInfoName();
for (int i = 0;i< resourcesInfoFiles.split(",").length;i++){ for (int i = 0; i < resourcesInfoFiles.split(",").length; i++) {
TeacherOpenCourseMergeResourcesInfoQuery cloneQuery = teacherOpenCourseMergeResourcesInfoQuery.clone(); TeacherOpenCourseMergeResourcesInfoQuery cloneQuery = teacherOpenCourseMergeResourcesInfoQuery.clone();
cloneQuery.setResourcesInfoFiles(resourcesInfoFiles.split(",")[i]); cloneQuery.setResourcesInfoFiles(resourcesInfoFiles.split(",")[i]);
cloneQuery.setResourcesInfoContent(resourcesInfoFiles.split(",")[i]); cloneQuery.setResourcesInfoContent(resourcesInfoFiles.split(",")[i]);
@ -207,7 +210,7 @@ public class TeacherOpenCourseMergeResourcesInfoController{
if (StringUtils.isBlank(msg)) { if (StringUtils.isBlank(msg)) {
return JsonResult.success(); return JsonResult.success();
} else { } else {
return JsonResult.failMessage("新增失败,"+msg); return JsonResult.failMessage("新增失败," + msg);
} }
} }
} }
@ -219,7 +222,7 @@ public class TeacherOpenCourseMergeResourcesInfoController{
@GetMapping(MODEL + "/index.do") @GetMapping(MODEL + "/index.do")
@Function("teacherOpenCourseMergeResourcesInfo.query") @Function("teacherOpenCourseMergeResourcesInfo.query")
public ModelAndView index() { public ModelAndView index() {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeResourcesInfo/index.html") ; ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeResourcesInfo/index.html");
view.addObject("search", TeacherOpenCourseMergeResourcesInfoQuery.class.getName()); view.addObject("search", TeacherOpenCourseMergeResourcesInfoQuery.class.getName());
return view; return view;
} }
@ -237,10 +240,10 @@ public class TeacherOpenCourseMergeResourcesInfoController{
@Function("teacherOpenCourseMergeResourcesInfo.add") @Function("teacherOpenCourseMergeResourcesInfo.add")
public ModelAndView add(Long teacherOpenCourseMergeResourcesInfoId) { public ModelAndView add(Long teacherOpenCourseMergeResourcesInfoId) {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeResourcesInfo/add.html"); ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeResourcesInfo/add.html");
if(null != teacherOpenCourseMergeResourcesInfoId){ if (null != teacherOpenCourseMergeResourcesInfoId) {
TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoService.queryById(teacherOpenCourseMergeResourcesInfoId); TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoService.queryById(teacherOpenCourseMergeResourcesInfoId);
view.addObject("teacherOpenCourseMergeResourcesInfo", teacherOpenCourseMergeResourcesInfo); view.addObject("teacherOpenCourseMergeResourcesInfo", teacherOpenCourseMergeResourcesInfo);
}else { } else {
view.addObject("teacherOpenCourseMergeResourcesInfo", new TeacherOpenCourseMergeResourcesInfo()); view.addObject("teacherOpenCourseMergeResourcesInfo", new TeacherOpenCourseMergeResourcesInfo());
} }
return view; return view;
@ -250,7 +253,7 @@ public class TeacherOpenCourseMergeResourcesInfoController{
@PostMapping(MODEL + "/list.json") @PostMapping(MODEL + "/list.json")
@Function("teacherOpenCourseMergeResourcesInfo.query") @Function("teacherOpenCourseMergeResourcesInfo.query")
public JsonResult<PageQuery> list(TeacherOpenCourseMergeResourcesInfoQuery condition){ public JsonResult<PageQuery> list(TeacherOpenCourseMergeResourcesInfoQuery condition) {
PageQuery page = condition.getPageQuery(); PageQuery page = condition.getPageQuery();
teacherOpenCourseMergeResourcesInfoService.queryByCondition(page); teacherOpenCourseMergeResourcesInfoService.queryByCondition(page);
return JsonResult.success(page); return JsonResult.success(page);
@ -258,27 +261,27 @@ public class TeacherOpenCourseMergeResourcesInfoController{
@PostMapping(MODEL + "/addAll.json") @PostMapping(MODEL + "/addAll.json")
@Function("teacherOpenCourseMergeResourcesInfo.add") @Function("teacherOpenCourseMergeResourcesInfo.add")
public JsonResult addAll(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery,@SCoreUser CoreUser coreUser){ public JsonResult addAll(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return JsonResult.failMessage("请登录后再操作"); return JsonResult.failMessage("请登录后再操作");
}else{ } else {
teacherOpenCourseMergeResourcesInfoQuery.setUserId(coreUser.getId()); teacherOpenCourseMergeResourcesInfoQuery.setUserId(coreUser.getId());
teacherOpenCourseMergeResourcesInfoQuery.setOrgId(coreUser.getOrgId()); teacherOpenCourseMergeResourcesInfoQuery.setOrgId(coreUser.getOrgId());
String msg = teacherOpenCourseMergeResourcesInfoService.addAll(teacherOpenCourseMergeResourcesInfoQuery); String msg = teacherOpenCourseMergeResourcesInfoService.addAll(teacherOpenCourseMergeResourcesInfoQuery);
if (StringUtils.isBlank(msg)) { if (StringUtils.isBlank(msg)) {
return JsonResult.success(); return JsonResult.success();
} else { } else {
return JsonResult.failMessage("新增失败,"+msg); return JsonResult.failMessage("新增失败," + msg);
} }
} }
} }
@PostMapping(MODEL + "/add.json") @PostMapping(MODEL + "/add.json")
@Function("teacherOpenCourseMergeResourcesInfo.add") @Function("teacherOpenCourseMergeResourcesInfo.add")
public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, BindingResult result,@SCoreUser CoreUser coreUser){ public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, BindingResult result, @SCoreUser CoreUser coreUser) {
if(result.hasErrors()){ if (result.hasErrors()) {
return JsonResult.failMessage(result); return JsonResult.failMessage(result);
}else{ } else {
teacherOpenCourseMergeResourcesInfoQuery.setUserId(coreUser.getId()); teacherOpenCourseMergeResourcesInfoQuery.setUserId(coreUser.getId());
teacherOpenCourseMergeResourcesInfoQuery.setOrgId(coreUser.getOrgId()); teacherOpenCourseMergeResourcesInfoQuery.setOrgId(coreUser.getOrgId());
return teacherOpenCourseMergeResourcesInfoService.add(teacherOpenCourseMergeResourcesInfoQuery); return teacherOpenCourseMergeResourcesInfoService.add(teacherOpenCourseMergeResourcesInfoQuery);
@ -288,16 +291,16 @@ public class TeacherOpenCourseMergeResourcesInfoController{
@PostMapping(MODEL + "/edit.json") @PostMapping(MODEL + "/edit.json")
@Function("teacherOpenCourseMergeResourcesInfo.edit") @Function("teacherOpenCourseMergeResourcesInfo.edit")
public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, BindingResult result) { public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, BindingResult result) {
if(result.hasErrors()){ if (result.hasErrors()) {
return JsonResult.failMessage(result); return JsonResult.failMessage(result);
}else { } else {
teacherOpenCourseMergeResourcesInfoQuery.setUserId(null); teacherOpenCourseMergeResourcesInfoQuery.setUserId(null);
teacherOpenCourseMergeResourcesInfoQuery.setOrgId(null); teacherOpenCourseMergeResourcesInfoQuery.setOrgId(null);
String msg = teacherOpenCourseMergeResourcesInfoService.edit(teacherOpenCourseMergeResourcesInfoQuery); String msg = teacherOpenCourseMergeResourcesInfoService.edit(teacherOpenCourseMergeResourcesInfoQuery);
if (StringUtils.isBlank(msg)) { if (StringUtils.isBlank(msg)) {
return JsonResult.success(); return JsonResult.success();
} else { } else {
return JsonResult.failMessage("更新失败,"+msg); return JsonResult.failMessage("更新失败," + msg);
} }
} }
} }
@ -305,21 +308,22 @@ public class TeacherOpenCourseMergeResourcesInfoController{
@GetMapping(MODEL + "/view.json") @GetMapping(MODEL + "/view.json")
@Function("teacherOpenCourseMergeResourcesInfo.query") @Function("teacherOpenCourseMergeResourcesInfo.query")
public JsonResult<TeacherOpenCourseMergeResourcesInfo>queryInfo(Long teacherOpenCourseMergeResourcesInfoId) { public JsonResult<TeacherOpenCourseMergeResourcesInfo> queryInfo(Long teacherOpenCourseMergeResourcesInfoId) {
TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoService.queryById( teacherOpenCourseMergeResourcesInfoId); TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoService.queryById(teacherOpenCourseMergeResourcesInfoId);
return JsonResult.success(teacherOpenCourseMergeResourcesInfo); return JsonResult.success(teacherOpenCourseMergeResourcesInfo);
} }
@GetMapping(MODEL + "/getValues.json") @GetMapping(MODEL + "/getValues.json")
@Function("teacherOpenCourseMergeResourcesInfo.query") @Function("teacherOpenCourseMergeResourcesInfo.query")
public JsonResult<List<TeacherOpenCourseMergeResourcesInfo>>getValues(TeacherOpenCourseMergeResourcesInfoQuery param) { public JsonResult<List<TeacherOpenCourseMergeResourcesInfo>> getValues(TeacherOpenCourseMergeResourcesInfoQuery param) {
List<TeacherOpenCourseMergeResourcesInfo>list = teacherOpenCourseMergeResourcesInfoService.getValuesByQuery(param); List<TeacherOpenCourseMergeResourcesInfo> list = teacherOpenCourseMergeResourcesInfoService.getValuesByQuery(param);
return JsonResult.success(list); return JsonResult.success(list);
} }
/** /**
* 教师端-不能调用这个方法， 没有判断教师身份 * 教师端-不能调用这个方法， 没有判断教师身份
*
* @param ids * @param ids
* @return * @return
*/ */
@ -334,23 +338,23 @@ public class TeacherOpenCourseMergeResourcesInfoController{
//下载模板信息 //下载模板信息
@GetMapping(MODEL + "/downloadTemplate.json") @GetMapping(MODEL + "/downloadTemplate.json")
public void download(HttpServletRequest request,HttpServletResponse response,@SCoreUser CoreUser coreUser) { public void download(HttpServletRequest request, HttpServletResponse response, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return; return;
} }
XSSFWorkbook workbook = null; XSSFWorkbook workbook = null;
InputStream is = null; InputStream is = null;
try { try {
//TODO 改导入模板名字 //TODO 改导入模板名字
is = new FileInputStream(GetFile.p + File.separator +"filesystem"+ File.separator +"template"+ File.separator+ "导入模板.xlsx"); is = new FileInputStream(GetFile.p + File.separator + "filesystem" + File.separator + "template" + File.separator + "导入模板.xlsx");
workbook = new XSSFWorkbook(is); workbook = new XSSFWorkbook(is);
try { try {
if(null != is){ if (null != is) {
is.close(); is.close();
} }
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -359,16 +363,16 @@ public class TeacherOpenCourseMergeResourcesInfoController{
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
//这后面可以设置导出Excel的名称，此例中名为template.xls //这后面可以设置导出Excel的名称，此例中名为template.xls
String fileName = ToolUtils.web2fileName(request,"teacherOpenCourseMergeResourcesInfoTemplate(" + TimeTool.getNowTime("YMD") + ").xlsx"); String fileName = ToolUtils.web2fileName(request, "teacherOpenCourseMergeResourcesInfoTemplate(" + TimeTool.getNowTime("YMD") + ").xlsx");
response.setHeader("Content-disposition", "attachment;filename="+fileName); response.setHeader("Content-disposition", "attachment;filename=" + fileName);
//刷新缓冲 //刷新缓冲
response.flushBuffer(); response.flushBuffer();
//workbook将Excel写入到response的输出流中，供页面下载 //workbook将Excel写入到response的输出流中，供页面下载
workbook.write(response.getOutputStream()); workbook.write(response.getOutputStream());
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
try { try {
@ -378,20 +382,21 @@ public class TeacherOpenCourseMergeResourcesInfoController{
if (null != response && null != response.getOutputStream()) { if (null != response && null != response.getOutputStream()) {
response.getOutputStream().close(); response.getOutputStream().close();
} }
} catch (Exception e) { } } catch (Exception e) {
}
} }
} }
//导入模板信息 //导入模板信息
@PostMapping(MODEL + "/importTemplate.json") @PostMapping(MODEL + "/importTemplate.json")
@Function("teacherOpenCourseMergeResourcesInfo.importTemplate") @Function("teacherOpenCourseMergeResourcesInfo.importTemplate")
public JsonResult importTemplate(@RFile List<FileEntity> fileEntityList,@SCoreUser CoreUser coreUser) { public JsonResult importTemplate(@RFile List<FileEntity> fileEntityList, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return JsonResult.failMessage("请登录后再操作"); return JsonResult.failMessage("请登录后再操作");
} }
List<Long>list=new ArrayList<>(); List<Long> list = new ArrayList<>();
JsonResult jsonResult = teacherOpenCourseMergeResourcesInfoService.importTemplate(fileEntityList,list,coreUser); JsonResult jsonResult = teacherOpenCourseMergeResourcesInfoService.importTemplate(fileEntityList, list, coreUser);
if(list.size()>0){ if (list.size() > 0) {
teacherOpenCourseMergeResourcesInfoService.deleteByList(list); teacherOpenCourseMergeResourcesInfoService.deleteByList(list);
} }
return jsonResult; return jsonResult;
@ -400,8 +405,8 @@ public class TeacherOpenCourseMergeResourcesInfoController{
//导出信息 //导出信息
@GetMapping(MODEL + "/excel/export.json") @GetMapping(MODEL + "/excel/export.json")
@Function("teacherOpenCourseMergeResourcesInfo.exportDocument") @Function("teacherOpenCourseMergeResourcesInfo.exportDocument")
public void export(HttpServletRequest request,HttpServletResponse response,TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery,@SCoreUser CoreUser coreUser) { public void export(HttpServletRequest request, HttpServletResponse response, TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, @SCoreUser CoreUser coreUser) {
if(null == coreUser){ if (null == coreUser) {
return; return;
} }
HSSFWorkbook workbook = null; HSSFWorkbook workbook = null;
@ -466,7 +471,7 @@ public class TeacherOpenCourseMergeResourcesInfoController{
//设置表格特定的列宽度 //设置表格特定的列宽度
if (null != widthMap.get(headerCode[i])) { if (null != widthMap.get(headerCode[i])) {
String width = widthMap.get(headerCode[i]).toString().split("\\.")[0]; String width = widthMap.get(headerCode[i]).toString().split("\\.")[0];
Integer w = Integer.parseInt(width) > header[i].length()*3?Integer.parseInt(width):header[i].length()*3; Integer w = Integer.parseInt(width) > header[i].length() * 3 ? Integer.parseInt(width) : header[i].length() * 3;
sheet.setColumnWidth(i, w * 190); sheet.setColumnWidth(i, w * 190);
} }
@ -487,7 +492,7 @@ public class TeacherOpenCourseMergeResourcesInfoController{
for (int i = 0; i < mapList.size(); i++) { for (int i = 0; i < mapList.size(); i++) {
HSSFRow row = sheet.createRow(i + 1); HSSFRow row = sheet.createRow(i + 1);
row.setHeight((short) (50*10)); row.setHeight((short) (50 * 10));
Map<String, Object> map = mapList.get(i); Map<String, Object> map = mapList.get(i);
for (int j = 0; j < headerCode.length; j++) { for (int j = 0; j < headerCode.length; j++) {
@ -504,16 +509,16 @@ public class TeacherOpenCourseMergeResourcesInfoController{
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
//这后面可以设置导出Excel的名称，此例中名为student.xls //这后面可以设置导出Excel的名称，此例中名为student.xls
String fileName = ToolUtils.web2fileName(request,"teacherOpenCourseMergeResourcesInfo(" + TimeTool.getNowTime("YMD") + ").xls"); String fileName = ToolUtils.web2fileName(request, "teacherOpenCourseMergeResourcesInfo(" + TimeTool.getNowTime("YMD") + ").xls");
response.setHeader("Content-disposition", "attachment;filename="+fileName); response.setHeader("Content-disposition", "attachment;filename=" + fileName);
//刷新缓冲 //刷新缓冲
response.flushBuffer(); response.flushBuffer();
//workbook将Excel写入到response的输出流中，供页面下载 //workbook将Excel写入到response的输出流中，供页面下载
workbook.write(response.getOutputStream()); workbook.write(response.getOutputStream());
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
try { try {
@ -523,14 +528,16 @@ public class TeacherOpenCourseMergeResourcesInfoController{
if (null != response && null != response.getOutputStream()) { if (null != response && null != response.getOutputStream()) {
response.getOutputStream().close(); response.getOutputStream().close();
} }
} catch (Exception e) { } } catch (Exception e) {
}
} }
} }
/** /**
* 教师端-导入资源操作，逻辑拆分 * 教师端-导入资源操作，逻辑拆分
* * <p>
* 从系统资源库拉取到教师开课的资源中。 * 从系统资源库拉取到教师开课的资源中。
*
* @param resourcesInfoIds 资源信息ID集合 * @param resourcesInfoIds 资源信息ID集合
* @param teacherOpenCourseId 开课ID * @param teacherOpenCourseId 开课ID
* @return * @return
@ -564,10 +571,10 @@ public class TeacherOpenCourseMergeResourcesInfoController{
* 只传左元素，表示：拖动元素 在 左元素的左侧； * 只传左元素，表示：拖动元素 在 左元素的左侧；
* 只传右元素，表示：拖动元素 在 右元素的右侧； * 只传右元素，表示：拖动元素 在 右元素的右侧；
* 左右元素都传，则拖动元素放置在两个元素的中间。 * 左右元素都传，则拖动元素放置在两个元素的中间。
* * <p>
* 左侧（上） ==> 右侧（下） * 左侧（上） ==> 右侧（下）
* 小数值 ==> 大数值 * 小数值 ==> 大数值
* * <p>
* 数值越小，越靠前 * 数值越小，越靠前
* *
* @param id 拖动元素的ID * @param id 拖动元素的ID

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

@ -189,6 +189,7 @@ public class TeacherOpenCourseMergeStudentController{
return JsonResult.failMessage("请登录后再操作"); return JsonResult.failMessage("请登录后再操作");
}else{ }else{
teacherOpenCourseMergeStudentQuery.setOrgId(coreUser.getOrgId()); teacherOpenCourseMergeStudentQuery.setOrgId(coreUser.getOrgId());
teacherOpenCourseMergeStudentQuery.setUserId(coreUser.getId());
if(null == teacherOpenCourseMergeStudentQuery.getTeacherOpenCourseSchoolClassMergeStudentStatus()){ if(null == teacherOpenCourseMergeStudentQuery.getTeacherOpenCourseSchoolClassMergeStudentStatus()){
teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentStatus(1); teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentStatus(1);
} }

13
web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md
Unescape Escape View File

@ -420,3 +420,16 @@ randomStudentList
@if(!isEmpty(studentSnOrName)){ @if(!isEmpty(studentSnOrName)){
and (tb.student_sn like #'%'+studentSnOrName+'%'# or tb.student_name like #'%'+studentSnOrName+'%'#) and (tb.student_sn like #'%'+studentSnOrName+'%'# or tb.student_name like #'%'+studentSnOrName+'%'#)
@} @}
getStudentClassIdList
===
* 获取开课关联学生里面的班级ids
select distinct class_id
from student s
left join teacher_open_course_merge_student tocms on s.student_id = tocms.student_id
where student_status = 1
and tocms.teacher_open_course_school_class_merge_student_status = 1
and teacher_open_course_id = #teacherOpenCourseId#

Write Preview
Loading…
Cancel
Save